feat: migrate to wasm components

Cargo.toml

@@ -10,12 +10,16 @@ license = "MIT OR Apache-2.0"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
+[package.metadata.component]
+package = "alibaba:fontkit"
+
 [dependencies]
+wit-bindgen-rt = "0.24.0"
 ab_glyph_rasterizer = { version = "0.1.5", optional = true }
 arc-swap = "1.6.0"
 brotli-decompressor = { version = "2.3.2", optional = true }
 byteorder = { version = "1.4.3", optional = true }
-dashmap = { version = "5.3.4", optional = true }
+dashmap = "5.3.4"
 flate2 = { version = "1.0.22", optional = true }
 log = "0.4.17"
 ordered-float = "3.9.1"
@@ -41,16 +45,8 @@ unicode-script = { version = "0.5.4", optional = true }
 # wit-bindgen-rust = { git = "https://github.com/bytecodealliance/wit-bindgen", tag = "v0.2.0", optional = true }
 woff2 = { git = "https://github.com/zimond/woff2-rs", rev = "0e25872", optional = true, version = "0.3.0" }
 
-[target.'cfg(not(all(target_os = "unknown", target_arch = "wasm32")))'.dependencies]
-walkdir = "2.3.1"
-
-[target.'cfg(all(target_os = "unknown", target_arch = "wasm32"))'.dependencies]
-wasm-bindgen = "0.2.79"
-js-sys = "0.3.56"
-console_error_panic_hook = "0.1.7"
-
 [features]
-default = ["woff", "woff2", "metrics", "ras", "dashmap"]
+default = ["woff", "woff2", "metrics", "ras"]
 woff = ["byteorder", "flate2"]
 metrics = [
     "unicode-bidi",
@@ -66,6 +62,3 @@ ras = [
 ]
 optimize_stroke_broken = []
 # wit = ["wit-bindgen-rust", "dashmap"]
-
-[build-dependencies]
-cfg_aliases = "0.1.1"

examples/node.mjs

@@ -2,14 +2,17 @@ import { homedir } from 'os';
 import { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
-import { FontKitIndex } from '../node.js';
+import { fontkitInterface as fi } from '../pkg/fontkit.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-const fontkit = new FontKitIndex();
-await fontkit.initiate();
+const fontkit = new fi.FontKit();
+fontkit.addSearchPath(__dirname + '/OpenSans-Italic.ttf');
 fontkit.addSearchPath(homedir() + '/Library/Fonts');
 
-const font = fontkit.font('Open Sans');
+const font = fontkit.query({ family: 'Open Sans' });
 
-fontkit.free();
+// eslint-disable-next-line no-console
+console.log(font.hasGlyph('c'));
+// eslint-disable-next-line no-console
+console.log(fontkit.fontsInfo());

index.js

@@ -0,0 +1,7 @@
+import { fontkitInterface } from './pkg/fontkit.js';
+
+export const Font = fontkitInterface.Font;
+export const FontKit = fontkitInterface.FontKit;
+export const TextMetrics = fontkitInterface.TextMetrics;
+export const numberWidthToStr = fontkitInterface.numberWidthToStr;
+export const strWidthToNumber = fontkitInterface.strWidthToNumber;

package.json

@@ -1,15 +1,15 @@
 {
   "name": "fontkit-rs",
-  "version": "0.0.7-beta.1",
+  "version": "0.0.9-beta.3",
   "description": "Toolkit used to load, match, measure, and render texts",
-  "main": "pkg/bundler/index.js",
+  "main": "index.js",
   "directories": {
     "example": "examples",
     "test": "tests"
   },
   "files": [
     "pkg/**/*",
-    "node.js",
+    "index.js",
     "Readme.md"
   ],
   "author": "Zimon Dai <[email protected]>",
@@ -66,6 +66,7 @@
   },
   "type": "module",
   "dependencies": {
+    "@bytecodealliance/preview2-shim": "^0.16.1",
     "walkdir": "^0.4.1"
   }
 }