@flowscripter/template-bun-rust-library 1.1.5 → 1.1.7

package/Cargo.lock

@@ -4,7 +4,7 @@ version = 4
 
 [[package]]
 name = "flowscripter_template_bun_rust_library"
-version = "1.1.5"
+version = "1.1.7"
 dependencies = [
  "flowscripter_template_rust_library",
 ]

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flowscripter_template_bun_rust_library"
-version = "1.1.5"
+version = "1.1.7"
 edition = "2021"
 description = "Project template for a Rust library with Bun FFI bindings."
 homepage = "https://github.com/flowscripter"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowscripter/template-bun-rust-library",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Project template for a Rust library with Bun FFI bindings",
   "keywords": [
     "bun",
@@ -29,7 +29,7 @@
   "peerDependencies": {
     "typescript": "^6.0.3"
   },
-  "ffiLibBaseUri": "https://github.com/flowscripter/template-bun-rust-library/releases/download/v1.1.5",
+  "ffiLibBaseUri": "https://github.com/flowscripter/template-bun-rust-library/releases/download/v1.1.7",
   "typedocOptions": {
     "readme": "none",
     "exclude": [

package/src/lib-path.ts

@@ -4,12 +4,24 @@ import path from "node:path";
 import { mkdir } from "node:fs/promises";
 import packageJson from "../package.json";
 
-export async function getLibPath(libName: string) {
-  let fullLibName = libName + "." + suffix;
+export function buildLocalLibName(libName: string, libSuffix: string): string {
+  const base = `${libName}.${libSuffix}`;
+  return libSuffix === "dll" ? base : `lib${base}`;
+}
 
-  if (suffix !== "dll") {
-    fullLibName = "lib" + fullLibName;
-  }
+export function buildRemoteLibName(libName: string, libSuffix: string, arch: string): string {
+  if (libSuffix === "so") return `${arch}.${libSuffix}`;
+  if (libSuffix === "dll") return `${libName}.${arch}.${libSuffix}`;
+  return buildLocalLibName(libName, libSuffix);
+}
+
+export function buildRemoteUrl(baseUri: string, remoteLibName: string): string {
+  const base = baseUri.endsWith("/") ? baseUri : baseUri + "/";
+  return new URL(remoteLibName, base).href;
+}
+
+export async function getLibPath(libName: string) {
+  const fullLibName = buildLocalLibName(libName, suffix);
 
   // look in release build location
   const builtLibPath = path.join("target", "release", fullLibName);
@@ -40,11 +52,8 @@ export async function getLibPath(libName: string) {
 
   console.debug(`packageJson.ffiLibBaseUri: ${packageJson.ffiLibBaseUri}`);
 
-  // look in release download location
-  const base = packageJson.ffiLibBaseUri.endsWith("/")
-    ? packageJson.ffiLibBaseUri
-    : packageJson.ffiLibBaseUri + "/";
-  const remotePath = new URL(fullLibName, base).href;
+  const remoteLibName = buildRemoteLibName(libName, suffix, process.arch);
+  const remotePath = buildRemoteUrl(packageJson.ffiLibBaseUri, remoteLibName);
 
   console.debug(`remotePath: ${remotePath}`);
 

package/tests/lib_path_test.ts

@@ -0,0 +1,69 @@
+import { describe, expect, test } from "bun:test";
+import { buildLocalLibName, buildRemoteLibName, buildRemoteUrl } from "../src/lib-path.ts";
+
+describe("buildLocalLibName", () => {
+  test("Linux .so gets lib prefix", () => {
+    expect(buildLocalLibName("foo", "so")).toBe("libfoo.so");
+  });
+
+  test("macOS .dylib gets lib prefix", () => {
+    expect(buildLocalLibName("foo", "dylib")).toBe("libfoo.dylib");
+  });
+
+  test("Windows .dll has no lib prefix", () => {
+    expect(buildLocalLibName("foo", "dll")).toBe("foo.dll");
+  });
+});
+
+describe("buildRemoteLibName", () => {
+  test("Linux x64", () => {
+    expect(buildRemoteLibName("foo", "so", "x64")).toBe("x64.so");
+  });
+
+  test("Linux arm64", () => {
+    expect(buildRemoteLibName("foo", "so", "arm64")).toBe("arm64.so");
+  });
+
+  test("macOS uses local naming (no arch suffix)", () => {
+    expect(buildRemoteLibName("foo", "dylib", "arm64")).toBe("libfoo.dylib");
+    expect(buildRemoteLibName("foo", "dylib", "x64")).toBe("libfoo.dylib");
+  });
+
+  test("Windows x64", () => {
+    expect(buildRemoteLibName("foo", "dll", "x64")).toBe("foo.x64.dll");
+  });
+
+  test("Windows arm64", () => {
+    expect(buildRemoteLibName("foo", "dll", "arm64")).toBe("foo.arm64.dll");
+  });
+});
+
+describe("buildRemoteUrl", () => {
+  test("base without trailing slash", () => {
+    expect(buildRemoteUrl("https://example.com/releases/v1.0", "x64.so")).toBe(
+      "https://example.com/releases/v1.0/x64.so",
+    );
+  });
+
+  test("base with trailing slash", () => {
+    expect(buildRemoteUrl("https://example.com/releases/v1.0/", "x64.so")).toBe(
+      "https://example.com/releases/v1.0/x64.so",
+    );
+  });
+
+  test("does not corrupt https:// into https:/", () => {
+    const url = buildRemoteUrl("https://github.com/org/repo/releases/download/v1.0", "x64.so");
+    expect(url).toBe("https://github.com/org/repo/releases/download/v1.0/x64.so");
+    expect(url.startsWith("https://")).toBe(true);
+  });
+
+  test("real-world example matches expected release asset URL", () => {
+    const url = buildRemoteUrl(
+      "https://github.com/flowscripter/template-bun-rust-library/releases/download/v1.1.5",
+      "x64.so",
+    );
+    expect(url).toBe(
+      "https://github.com/flowscripter/template-bun-rust-library/releases/download/v1.1.5/x64.so",
+    );
+  });
+});