Fix missing regex errors and fix double space bug

Author: bbqsrc

Cargo.toml

@@ -116,7 +116,7 @@ lto = true
 opt-level = 3
 panic = "abort"
 split-debuginfo = "packed"
-strip = "symbols"
+strip = false # "symbols"
 incremental = true
 rpath = true
 

Justfile

@@ -16,7 +16,8 @@ build-lib target="":
 
 build target="":
     @echo "Building for target: {{target}}"
-    {{env_vars}} cargo build -p divvun-runtime-cli --features divvun-runtime/all-mods --release {{ if target != "" { "--target" } else { "" } }} {{ target }}
+    {{env_vars}} cargo build -p divvun-runtime-cli --features divvun-runtime/all-mods,ffi --release {{ if target != "" { "--target" } else { "" } }} {{ target }}
+    strip -x -S ./target/{{ if target != "" { target + "/" } else { "" } }}release/divvun-runtime
 
 # Install built binary
 install target="": (build target)

bindings/deno/mod.ts

@@ -1,6 +1,38 @@
-import * as path from "jsr:@std/path";
+const BRAND = Symbol("divvun-runtime")
 
-let libPath: string | null = null;
+let libPath: string | null = await findLib();
+
+export function getLibPath(): string | null {
+  return libPath;
+}
+
+export async function findLib(): Promise<string | null> {
+  const name = "divvun-runtime"
+  let pathEnv 
+  try {
+    pathEnv = Deno.env.get("PATH") ?? "";
+  } catch (e) {
+    pathEnv = "";
+  }
+  const paths = pathEnv.split(Deno.build.os === "windows" ? ";" : ":");
+
+  const exts = Deno.build.os === "windows"
+    ? (Deno.env.get("PATHEXT")?.split(";") ?? [".EXE", ".CMD", ".BAT"])
+    : [""];
+
+  for (const dir of paths) {
+    for (const ext of exts) {
+      const full = `${dir}/${name}${ext}`;
+      try {
+        const info = await Deno.stat(full);
+        if (info.isFile) return full;
+      } catch {
+        // ignore ENOENT
+      }
+    }
+  }
+  return null;
+}
 
 export function setLibPath(newPath: string) {
   libPath = newPath;
@@ -11,24 +43,11 @@ let dylib: Deno.DynamicLibrary<Record<string, Deno.ForeignFunction>>;
 const RustSliceT = { "struct": ["pointer", "usize"] } as const;
 
 function loadDylib() {
-  let libSuffix = "";
-
-  switch (Deno.build.os) {
-    case "windows":
-      libSuffix = "dll";
-      break;
-    case "darwin":
-      libSuffix = "dylib";
-      break;
-    default:
-      libSuffix = "so";
-      break;
+  if (libPath == null) {
+    throw new Error("Could not find divvun-runtime library. Please set the path using setLibPath().");
   }
 
-  const libName = `libdivvun_runtime.${libSuffix}`;
-  const fullLibPath = libPath ? path.join(libPath, libName) : libName;
-
-  dylib = Deno.dlopen(fullLibPath, {
+  dylib = Deno.dlopen(libPath, {
     DRT_Bundle_fromBundle: {
       parameters: [RustSliceT, "function"],
       result: "pointer",
@@ -93,7 +112,7 @@ export class Bundle {
         errCallback.pointer,
       ) as Deno.PointerValue<Bundle>;
 
-      return new Bundle(bundleRawPtr);
+      return new Bundle(bundleRawPtr, BRAND);
     } catch (e) {
       throw e;
     }
@@ -112,13 +131,16 @@ export class Bundle {
         errCallback.pointer,
       ) as Deno.PointerValue<Bundle>;
 
-      return new Bundle(bundleRawPtr);
+      return new Bundle(bundleRawPtr, BRAND);
     } catch (e) {
       throw e;
     }
   }
 
-  private constructor(ptr: Deno.PointerValue) {
+  private constructor(ptr: Deno.PointerValue, brand: symbol) {
+    if (brand !== BRAND) {
+      throw new TypeError("Bundle must be constructed via fromPath or fromBundle");
+    }
     this.#ptr = ptr;
   }
 
@@ -145,7 +167,7 @@ export class Bundle {
           errCallback.pointer,
         ) as Deno.PointerValue<PipelineHandle>;
 
-      return new PipelineHandle(pipeRawPtr);
+      return new PipelineHandle(pipeRawPtr, BRAND);
     } catch (e) {
       throw e;
     }
@@ -157,7 +179,11 @@ class PipelineResponse {
   #ptr: Deno.PointerValue;
   #len: number;
 
-  constructor(buf: Uint8Array) {
+  constructor(buf: Uint8Array, brand: symbol) {
+    if (brand !== BRAND) {
+      throw new TypeError("PipelineResponse cannot be constructed directly");
+    }
+
     this.#buf = buf;
 
     const ptr = Deno.UnsafePointer.of(buf);
@@ -220,7 +246,11 @@ class PipelineResponse {
 export class PipelineHandle {
   #ptr: Deno.PointerValue;
 
-  constructor(ptr: Deno.PointerValue) {
+  constructor(ptr: Deno.PointerValue, brand: symbol) {
+    if (brand !== BRAND) {
+      throw new TypeError("PipelineHandle cannot be constructed directly");
+    }
+
     this.#ptr = ptr;
   }
 
@@ -244,7 +274,7 @@ export class PipelineHandle {
         rsInput,
         errCallback.pointer,
       ) as Uint8Array;
-      return new PipelineResponse(outputSlice);
+      return new PipelineResponse(outputSlice, BRAND);
     } catch (e) {
       throw e;
     }

build.rs

@@ -10,6 +10,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         println!("cargo:rustc-link-lib=icui18n");
     } else if target_os == "macos" {
         println!("cargo:rustc-link-lib=icucore");
+        // println!("cargo:rustc-link-arg=-Wl,-export_dynamic");
+        println!("cargo:rustc-link-arg=-Wl,-all_load");
     } else if target_os == "linux" {
         println!("cargo:rustc-link-lib=icuuc");
         println!("cargo:rustc-link-lib=icuio");

cli/Cargo.toml

@@ -9,7 +9,8 @@ license = "GPL-3.0"
 name = "divvun-runtime"
 path = "src/main.rs"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+ffi = ["divvun-runtime/ffi"]
 
 [dependencies]
 divvun-runtime = { default-features = false, path = ".." }

cli/build.rs

@@ -5,6 +5,24 @@ fn main() {
         //
     } else if target_os == "macos" {
         println!("cargo:rustc-link-lib=icucore");
+        // println!("cargo:rustc-link-arg=-Wl,-all_load");
+        // println!("cargo:rustc-link-arg=-Wl,-export_dynamic");
+        // println!("cargo:rustc-link-arg=-Wl,-exported_symbol,_DRT_Bundle_fromBundle");
+        // println!("cargo:rustc-link-arg=-Wl,-exported_symbol,_DRT_Bundle_create");
+        const EXPORT: &[&str] = &[
+            "_DRT_Bundle_fromBundle",
+            "_DRT_Bundle_drop",
+            "_DRT_Bundle_fromPath",
+            "_DRT_Bundle_create",
+            "_DRT_PipelineHandle_drop",
+            "_DRT_Vec_drop",
+            "_DRT_PipelineHandle_forward",
+            "_DRT_Bundle_runPipeline",
+        ];
+
+        for exp in EXPORT {
+            println!("cargo:rustc-link-arg=-Wl,-exported_symbol,{exp}");
+        }
     } else if target_os == "linux" {
         println!("cargo:rustc-link-lib=icuuc");
         println!("cargo:rustc-link-lib=icuio");

cli/src/cli.rs

@@ -22,6 +22,7 @@ pub enum Command {
     List(ListArgs),
     #[command(alias = "play")]
     Playground(PlaygroundArgs),
+    Test(TestArgs),
     #[command(flatten)]
     Debug(DebugArgs),
 }
@@ -108,3 +109,13 @@ pub struct PlaygroundArgs {
     /// Path to open in playground. Defaults to current directory.
     pub path: Option<PathBuf>,
 }
+
+#[derive(Parser, Debug)]
+pub struct TestArgs {
+    /// Test files to run
+    pub files: Vec<PathBuf>,
+
+    /// Arguments to pass to the test script (after --)
+    #[clap(last = true)]
+    pub script_args: Vec<String>,
+}

cli/src/command/mod.rs

@@ -4,4 +4,5 @@ pub mod list;
 pub mod playground;
 pub mod run;
 pub mod sync;
+pub mod test;
 pub mod utils;

cli/src/command/playground.rs

@@ -32,16 +32,15 @@ fn find_playground_binary() -> anyhow::Result<PathBuf> {
 
     #[cfg(target_os = "macos")]
     {
-        let app_path = PathBuf::from("/Applications/Divvun Runtime Playground.app/Contents/MacOS/divvun-rt-playground");
+        let app_path = PathBuf::from(
+            "/Applications/Divvun Runtime Playground.app/Contents/MacOS/divvun-rt-playground",
+        );
         if app_path.exists() {
             return Ok(app_path);
         }
     }
 
-    if let Ok(output) = Command::new("which")
-        .arg("divvun-rt-playground")
-        .output()
-    {
+    if let Ok(output) = Command::new("which").arg("divvun-rt-playground").output() {
         if output.status.success() {
             let path_str = String::from_utf8_lossy(&output.stdout).trim().to_string();
             if !path_str.is_empty() {

cli/src/command/test.rs

@@ -0,0 +1,49 @@
+use std::io::Write;
+use std::process::Command;
+
+use crate::{cli::TestArgs, shell::Shell};
+
+const DENO_MOD_TS: &str = include_str!("../../../bindings/deno/mod.ts");
+
+pub async fn test(_shell: &mut Shell, args: TestArgs) -> anyhow::Result<()> {
+    let exe_path = std::env::current_exe()?;
+
+    let preload_script = format!(
+        "{}\n\nsetLibPath(\"{}\");\n(globalThis as any)[\"Bundle\"] = Bundle;\n",
+        DENO_MOD_TS,
+        exe_path.display()
+    );
+
+    let temp_dir = tempfile::tempdir()?;
+    let preload_path = temp_dir.path().join("preload.ts");
+    let mut preload_file = std::fs::File::create(&preload_path)?;
+    preload_file.write_all(preload_script.as_bytes())?;
+    preload_file.flush()?;
+    drop(preload_file);
+
+    let mut cmd = Command::new("deno");
+    cmd.arg("test")
+        .arg("--allow-ffi")
+        .arg("--no-check")
+        .arg("--preload")
+        .arg(&preload_path);
+
+    for file in &args.files {
+        cmd.arg(file);
+    }
+
+    if !args.script_args.is_empty() {
+        cmd.arg("--");
+        for arg in &args.script_args {
+            cmd.arg(arg);
+        }
+    }
+
+    let status = cmd.status()?;
+
+    if !status.success() {
+        std::process::exit(status.code().unwrap_or(1));
+    }
+
+    Ok(())
+}