Skip to content

fix(js): use FixedArray at the JS FFI boundary #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hackwaly wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(js): use FixedArray at the JS FFI boundary #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/core/fs_storage.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ extern "js" fn fs_write_string(path : String, content : String) -> Unit =
#| }

///|
extern "js" fn fs_readdir(path : String) -> Array[String] =
extern "js" fn fs_readdir_ffi(path : String) -> FixedArray[String] =
#| (path) => {
#| try {
#| const fs = require("node:fs");
Expand All @@ -86,6 +86,10 @@ extern "js" fn fs_readdir(path : String) -> Array[String] =
#| }
#| }

fn fs_readdir(path : String) -> Array[String] {
Array::from_fixed_array(fs_readdir_ffi(path))
}

///|
extern "js" fn fs_is_file(path : String) -> Bool =
#| (path) => {
Expand Down
12 changes: 10 additions & 2 deletions src/core/git_loader.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ extern "js" fn node_read_file_safe(path : String) -> Bytes? =
#| }

///|
extern "js" fn node_readdir_safe(path : String) -> Array[String] =
extern "js" fn node_readdir_safe_ffi(path : String) -> FixedArray[String] =
#| (path) => {
#| try {
#| const fs = require("node:fs");
Expand All @@ -249,6 +249,10 @@ extern "js" fn node_readdir_safe(path : String) -> Array[String] =
#| }
#| }

fn node_readdir_safe(path : String) -> Array[String] {
Array::from_fixed_array(node_readdir_safe_ffi(path))
}

///|
extern "js" fn node_is_dir(path : String) -> Bool =
#| (path) => {
Expand All @@ -268,7 +272,7 @@ extern "js" fn node_is_file(path : String) -> Bool =
#| }

///|
extern "js" fn scan_readdir(path : String) -> Array[String] =
extern "js" fn scan_readdir_ffi(path : String) -> FixedArray[String] =
#| (path) => {
#| try {
#| const fs = require("node:fs");
Expand All @@ -278,6 +282,10 @@ extern "js" fn scan_readdir(path : String) -> Array[String] =
#| }
#| }

fn scan_readdir(path : String) -> Array[String] {
Array::from_fixed_array(scan_readdir_ffi(path))
}

///|
/// Scan files in a directory recursively, skipping common non-source dirs.
pub fn scan_files(root : String, limit~ : Int = 200) -> Array[String] {
Expand Down
11 changes: 9 additions & 2 deletions src/core/idb_git_fs.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ extern "js" fn idb_fs_has(prefix : String, key : String) -> Bool =
#| })()

///|
extern "js" fn idb_fs_list(
extern "js" fn idb_fs_list_ffi(
prefix : String,
dir : String,
) -> Array[String] =
) -> FixedArray[String] =
#| (() => {
#| return (prefix, dir) => {
#| const cache = globalThis.__idb_fs_cache || {};
Expand All @@ -84,6 +84,13 @@ extern "js" fn idb_fs_list(
#| };
#| })()

fn idb_fs_list(
prefix : String,
dir : String,
) -> Array[String] {
Array::from_fixed_array(idb_fs_list_ffi(prefix, dir))
}

///|
extern "js" fn idb_fs_is_dir(prefix : String, path : String) -> Bool =
#| (() => {
Expand Down
6 changes: 5 additions & 1 deletion src/core/r2_storage.mbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extern "js" fn r2_put(bucket_name : String, key : String, value : String) -> Uni
#| })()

///|
extern "js" fn r2_list(bucket_name : String, prefix : String) -> Array[String] =
extern "js" fn r2_list_ffi(bucket_name : String, prefix : String) -> FixedArray[String] =
#| (() => {
#| return (bucket_name, prefix) => {
#| const cache = globalThis.__r2_cache || {};
Expand All @@ -64,6 +64,10 @@ extern "js" fn r2_list(bucket_name : String, prefix : String) -> Array[String] =
#| };
#| })()

fn r2_list(bucket_name : String, prefix : String) -> Array[String] {
Array::from_fixed_array(r2_list_ffi(bucket_name, prefix))
}

///|
extern "js" fn r2_has(bucket_name : String, key : String) -> Bool =
#| (() => {
Expand Down