harfbuzzjs 0.3.1 → 0.3.3

package/config-override-subset.h

@@ -2,3 +2,4 @@
 #undef HB_NO_OT_FONT_CFF
 #undef HB_NO_SUBSET_CFF
 #undef HB_NO_SUBSET_LAYOUT
+#undef HB_NO_VAR

package/examples/hb-subset.example.node.js

@@ -1,13 +1,17 @@
 // Based on https://github.com/harfbuzz/harfbuzzjs/issues/9#issuecomment-507874962
 // Which was based on https://github.com/harfbuzz/harfbuzzjs/issues/9#issuecomment-507622485
-const fs = require('fs');
-const readFileAsync = require('util').promisify(fs.readFile);
-const writeFileAsync = require('util').promisify(fs.writeFile);
+const { readFile, writeFile } = require('fs').promises;
+const { join, extname, basename } = require('path');
+const { performance } = require('node:perf_hooks');
+
+const SUBSET_TEXT = 'abc';
 
 (async () => {
-    const { instance: { exports } } = await WebAssembly.instantiate(await readFileAsync(__dirname + '/../hb-subset.wasm'));
-    const fontBlob = await readFileAsync(__dirname + '/Roboto-Black.ttf');
+    const { instance: { exports } } = await WebAssembly.instantiate(await readFile(join(__dirname, '../hb-subset.wasm')));
+    const fileName = 'Roboto-Black.ttf';
+    const fontBlob = await readFile(join(__dirname, '/', fileName));
 
+    const t = performance.now();
     const heapu8 = new Uint8Array(exports.memory.buffer);
     const fontBuffer = exports.malloc(fontBlob.byteLength);
     heapu8.set(new Uint8Array(fontBlob), fontBuffer);
@@ -20,9 +24,9 @@ const writeFileAsync = require('util').promisify(fs.writeFile);
     /* Add your glyph indices here and subset */
     const input = exports.hb_subset_input_create_or_fail();
     const unicode_set = exports.hb_subset_input_unicode_set(input);
-    exports.hb_set_add(unicode_set, 'a'.charCodeAt(0));
-    exports.hb_set_add(unicode_set, 'b'.charCodeAt(0));
-    exports.hb_set_add(unicode_set, 'c'.charCodeAt(0));
+    for (const text of SUBSET_TEXT) {
+        exports.hb_set_add(unicode_set, text.codePointAt(0));
+    }
 
     // exports.hb_subset_input_set_drop_hints(input, true);
     const subset = exports.hb_subset_or_fail(face, input);
@@ -31,16 +35,31 @@ const writeFileAsync = require('util').promisify(fs.writeFile);
     exports.hb_subset_input_destroy(input);
 
     /* Get result blob */
-    const result = exports.hb_face_reference_blob(subset);
+    const resultBlob = exports.hb_face_reference_blob(subset);
 
-    const data = exports.hb_blob_get_data(result, 0);
-    const subsetFontBlob = heapu8.subarray(data, data + exports.hb_blob_get_length(result));
+    const offset = exports.hb_blob_get_data(resultBlob, 0);
+    const subsetByteLength = exports.hb_blob_get_length(resultBlob);
+    if (subsetByteLength === 0) {
+        exports.hb_blob_destroy(resultBlob);
+        exports.hb_face_destroy(subset);
+        exports.hb_face_destroy(face);
+        exports.free(fontBuffer);
+        throw new Error(
+            'Failed to create subset font, maybe the input file is corrupted?'
+        );
+    }
+    
+    // Output font data(Uint8Array)
+    const subsetFontBlob = heapu8.subarray(offset, offset + exports.hb_blob_get_length(resultBlob));
+    console.info('✨ Subset done in', performance.now() - t, 'ms');
 
-    await writeFileAsync(__dirname + '/Roboto-Black.subset.ttf', subsetFontBlob);
-    console.log(`Wrote subset to: ${__dirname}/Roboto-Black.subset.ttf`);
+    const extName = extname(fileName).toLowerCase();
+    const fontName = basename(fileName, extName);
+    await writeFile(join(__dirname, '/', `${fontName}.subset${extName}`), subsetFontBlob);    
+    console.info(`Wrote subset to: ${__dirname}/${fontName}.subset${extName}`);
 
     /* Clean up */
-    exports.hb_blob_destroy(result);
+    exports.hb_blob_destroy(resultBlob);
     exports.hb_face_destroy(subset);
     exports.hb_face_destroy(face);
     exports.free(fontBuffer);

package/hb-subset.symbols

@@ -18,11 +18,15 @@ _hb_subset_input_destroy
 _hb_subset_input_get_flags
 _hb_subset_input_get_user_data
 _hb_subset_input_glyph_set
+_hb_subset_input_pin_axis_location
+_hb_subset_input_pin_axis_to_default
 _hb_subset_input_reference
 _hb_subset_input_set
 _hb_subset_input_set_flags
 _hb_subset_input_set_user_data
 _hb_subset_input_unicode_set
+_hb_subset_input_keep_everything
 _hb_subset_or_fail
+_hb_subset_preprocess
 _malloc
 _free

package/hbjs.js

@@ -142,7 +142,7 @@ function hbjs(instance) {
         var unicodeSetPtr = exports.hb_set_create();
         exports.hb_face_collect_unicodes(ptr, unicodeSetPtr);
         var result = typedArrayFromSet(unicodeSetPtr, Uint32Array);
-        exports.hb_set_destroy(ptr);
+        exports.hb_set_destroy(unicodeSetPtr);
         return result;
       },
       /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "harfbuzzjs",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Minimal version of HarfBuzz for JavaScript use",
   "main": "index.js",
   "scripts": {

package/.github/workflows/build.yml

@@ -1,45 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-env:
-  EM_VERSION: 3.1.16
-  EM_CACHE_FOLDER: 'emsdk-cache'
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: Setup cache
-        id: cache-system-libraries
-        uses: actions/cache@v3
-        with:
-          path: ${{env.EM_CACHE_FOLDER}}
-          key: ${{env.EM_VERSION}}-${{runner.os}}
-      - name: Setup Emscripten
-        uses: mymindstorm/setup-emsdk@v11
-        with:
-          version: ${{env.EM_VERSION}}
-          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
-      - name: Build hb.wasm
-        run: ./build.sh
-      - name: Build hb-subset.wasm
-        run: ./build-subset.sh
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-      - name: Test hb.wasm
-        run: node examples/hbjs.example.node.js
-      - name: Test hb-subset.wasm
-        run: node examples/hb-subset.example.node.js

package/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "harfbuzz"]
-	path = harfbuzz
-	url = https://github.com/harfbuzz/harfbuzz.git

package/wapm.toml

@@ -1,8 +0,0 @@
-[package]
-name = "ebraminio/harfbuzz"
-version = "0.0.2"
-description = "HarfBuzz text shaping engine"
-
-[[module]]
-name = "harfbuzz"
-source = "hb.wasm"