@takumi-rs/wasm 1.0.0-beta.2 → 1.0.0-beta.20

package/README.md

@@ -4,4 +4,4 @@ Takumi is a **image rendering engine** written in Rust and this package provides
 
 Please refer to the [WebAssembly (In Browser)](https://takumi.kane.tw/docs/integrations/wasm-web) page in our official documentation for more details.
 
-If you are looking for Node.js bindings, take a look at the [@takumi-rs/core](https://npmjs.com/package/@takumi-rs/core) package.
+If you are looking for Node.js bindings, take a look at the [@takumi-rs/core](https://npmjs.com/package/@takumi-rs/core) package.

package/bundlers/node.mjs

@@ -1,13 +1,7 @@
 import { readFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { fileURLToPath } from "node:url";
 import { initSync } from "../pkg/takumi_wasm";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const wasmPath = join(__dirname, "../pkg/takumi_wasm_bg.wasm");
-const wasmBytes = readFileSync(wasmPath);
+const wasmBytes = readFileSync(new URL("../pkg/takumi_wasm_bg.wasm", import.meta.url));
 
 initSync({ module: wasmBytes });
 

package/bundlers/vite.d.ts

@@ -0,0 +1,3 @@
+declare const module: string;
+
+export default module;

package/bundlers/vite.mjs

@@ -0,0 +1,29 @@
+import url from "../pkg/takumi_wasm_bg.wasm?url";
+
+async function processUrl() {
+  if (typeof process !== "undefined" && process.versions?.node != null) {
+    const { readFile } = await import("node:fs/promises");
+
+    if (!url.startsWith("/")) {
+      return readFile(new URL(url, import.meta.url));
+    }
+
+    for (const candidate of [`../client${url}`, `../../client${url}`]) {
+      try {
+        return await readFile(new URL(candidate, import.meta.url));
+      } catch (error) {
+        if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
+          continue;
+        }
+
+        throw error;
+      }
+    }
+
+    throw new Error(`Unable to locate Takumi WASM asset for SSR: ${url}`);
+  }
+
+  return fetch(new URL(url, import.meta.url)).then((response) => response.arrayBuffer());
+}
+
+export default processUrl();

package/bundlers/workerd.js

@@ -0,0 +1,3 @@
+import module from "../pkg/takumi_wasm_bg.wasm";
+
+export default module;

package/package.json

@@ -1,43 +1,30 @@
 {
   "name": "@takumi-rs/wasm",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.20",
   "keywords": [
-    "image",
-    "rendering",
     "css",
-    "react",
+    "image",
     "jsx",
+    "react",
+    "rendering",
     "webassembly"
   ],
-  "scripts": {
-    "build": "wasm-pack build --no-pack --release --out-dir pkg --target web && bun run scripts/merge-dts.ts && bun build pkg/takumi_wasm.js --define import.meta.url=undefined --format cjs --outfile pkg/takumi_wasm.cjs",
-    "build:debug": "wasm-pack build --no-pack --dev --out-dir pkg --target web && bun run scripts/merge-dts.ts && bun build pkg/takumi_wasm.js --define import.meta.url=undefined --format cjs --outfile pkg/takumi_wasm.cjs",
-    "prepublishOnly": "jq '.dependencies[\"@takumi-rs/helpers\"] = .version' package.json > tmp.json && mv tmp.json package.json"
-  },
+  "license": "(MIT OR Apache-2.0)",
   "author": {
-    "email": "me@kane.tw",
     "name": "Kane Wang",
+    "email": "me@kane.tw",
     "url": "https://kane.tw"
   },
   "repository": {
     "url": "git+https://github.com/kane50613/takumi.git"
   },
-  "dependencies": {
-    "@takumi-rs/helpers": "1.0.0-beta.2"
-  },
-  "readme": "README.md",
-  "license": "(MIT OR Apache-2.0)",
-  "devDependencies": {
-    "@types/bun": "catalog:",
-    "typescript": "catalog:"
-  },
+  "files": [
+    "README.md",
+    "pkg/takumi*",
+    "bundlers/*"
+  ],
   "exports": {
     ".": {
-      "node": {
-        "types": "./bundlers/node.d.ts",
-        "import": "./bundlers/node.mjs",
-        "require": "./bundlers/node.cjs"
-      },
       "types": "./pkg/takumi_wasm.d.ts",
       "import": "./pkg/takumi_wasm.js",
       "require": "./pkg/takumi_wasm.cjs",
@@ -54,18 +41,38 @@
       "import": "./bundlers/node.mjs",
       "require": "./bundlers/node.cjs"
     },
+    "./auto": {
+      "types": "./pkg/takumi_wasm.d.ts",
+      "workerd": "./bundlers/workerd.js",
+      "unwasm": "./bundlers/next.mjs",
+      "module": "./bundlers/vite.mjs",
+      "node": "./bundlers/node.mjs",
+      "default": "./bundlers/vite.mjs"
+    },
     "./takumi_wasm_bg.wasm": {
       "types": "./pkg/takumi_wasm_bg.wasm.d.ts",
       "default": "./pkg/takumi_wasm_bg.wasm"
     },
     "./next": {
       "types": "./bundlers/next.d.ts",
-      "default": "./bundlers/next.js"
+      "default": "./bundlers/next.mjs"
+    },
+    "./vite": {
+      "types": "./bundlers/vite.d.ts",
+      "default": "./bundlers/vite.mjs"
     }
   },
-  "files": [
-    "README.md",
-    "pkg/takumi*",
-    "bundlers/*"
-  ]
+  "scripts": {
+    "build": "wasm-pack build --no-pack --release --out-dir pkg --target web && bun run scripts/merge-dts.ts && bun build pkg/takumi_wasm.js --define import.meta.url=undefined --format cjs --outfile pkg/takumi_wasm.cjs",
+    "build:debug": "wasm-pack build --no-pack --dev --out-dir pkg --target web && bun run scripts/merge-dts.ts && bun build pkg/takumi_wasm.js --define import.meta.url=undefined --format cjs --outfile pkg/takumi_wasm.cjs",
+    "prepublishOnly": "jq '.dependencies[\"@takumi-rs/helpers\"] = .version' package.json > tmp.json && mv tmp.json package.json"
+  },
+  "dependencies": {
+    "@takumi-rs/helpers": "1.0.0-beta.20"
+  },
+  "devDependencies": {
+    "@types/bun": "catalog:",
+    "typescript": "catalog:"
+  },
+  "readme": "README.md"
 }

package/pkg/takumi_wasm.d.ts

@@ -1,12 +1,6 @@
 import type { Node } from "@takumi-rs/helpers";
 
-export {
-  ContainerNode,
-  ImageNode,
-  Node,
-  NodeMetadata,
-  TextNode,
-} from "@takumi-rs/helpers";
+export { ContainerNode, ImageNode, Node, NodeMetadata, TextNode } from "@takumi-rs/helpers";
 
 export type ByteBuf = Uint8Array | ArrayBuffer | Buffer;
 
@@ -119,7 +113,7 @@ export type FontDetails = {
   name?: string;
   data: ByteBuf;
   weight?: number;
-  style?: "normal" | "italic" | "oblique";
+  style?: "normal" | "italic" | "oblique" | `oblique ${number}deg` | (string & {});
 };
 
 export type ImageSource = {
@@ -148,6 +142,11 @@ export type ConstructRendererOptions = {
    * The fonts being used.
    */
   fonts?: Font[];
+  /**
+   * Whether to load the default fonts.
+   * If `fonts` are provided, this will be `false` by default.
+   */
+  loadDefaultFonts?: boolean;
 };
 
 export type MeasuredTextRun = {