harfbuzzjs 0.3.0 → 0.3.2

package/build-subset.sh

@@ -18,5 +18,4 @@ em++ \
 	-s EXPORTED_FUNCTIONS=@hb-subset.symbols \
 	-s INITIAL_MEMORY=65MB \
 	-o hb-subset.wasm \
-	harfbuzz/src/harfbuzz.cc \
-	harfbuzz/src/hb-subset*.cc
+	harfbuzz/src/harfbuzz-subset.cc

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/config-override.h

@@ -5,3 +5,4 @@
 #undef HB_NO_BUFFER_SERIALIZE
 #undef HB_NO_VAR
 #undef HB_NO_OT_FONT_GLYPH_NAMES
+#undef HB_NO_FACE_COLLECT_UNICODES

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/examples/hbjs.example.js

@@ -24,11 +24,13 @@ function example(hb, fontBlob, text) {
     };
   });
 
+  var unicodes = face.collectUnicodes()
+
   buffer.destroy();
   font.destroy();
   face.destroy();
   blob.destroy();
-  return { shape: result, glyphs: glyphs };
+  return { shape: result, glyphs: glyphs, unicodes: unicodes };
 }
 
 // Should be replaced with something more reliable

package/harfbuzz.ts

@@ -1,6 +1,7 @@
 type Pointer = number;
 
 const HB_MEMORY_MODE_WRITABLE: number = 2;
+const HB_SET_VALUE_INVALID: Pointer = -1;
 
 class HarfBuzzExports {
   readonly heapu8: Uint8Array;
@@ -20,6 +21,16 @@ class HarfBuzzExports {
   readonly hb_font_create: (facePtr: Pointer) => Pointer
   readonly hb_font_set_scale: (fontPtr: Pointer, xScale: number, yScale: number) => void
   readonly hb_font_destroy: (ptr: Pointer) => void
+  readonly hb_face_collect_unicodes: (facePtr: Pointer, setPtr: Pointer) => void
+  readonly hb_set_create: () => Pointer
+  readonly hb_set_destroy: (setPtr: Pointer) => void
+  readonly hb_set_get_population: (setPtr: Pointer) => number
+  readonly hb_set_next_many: (
+    setPtr: Pointer,
+    greaterThanUnicodePtr: Pointer,
+    outputU32ArrayPtr: Pointer,
+    size: number,
+  ) => number
   readonly hb_buffer_create: () => Pointer
   readonly hb_buffer_add_utf8: (bufferPtr: Pointer, stringPtr: Pointer, stringLength: number, itemOffset: number, itemLength: number) => void
   readonly hb_buffer_guess_segment_properties: (bufferPtr: Pointer) => void
@@ -44,6 +55,11 @@ class HarfBuzzExports {
     this.hb_face_create = exports.hb_face_create;
     this.hb_face_get_upem = exports.hb_face_get_upem;
     this.hb_face_destroy = exports.hb_face_destroy;
+    this.hb_face_collect_unicodes = exports.hb_face_collect_unicodes;
+    this.hb_set_create = exports.hb_set_create;
+    this.hb_set_destroy = exports.hb_set_destroy;
+    this.hb_set_get_population = exports.hb_set_get_population;
+    this.hb_set_next_many = exports.hb_set_next_many;
     this.hb_font_create = exports.hb_font_create;
     this.hb_font_set_scale = exports.hb_font_set_scale;
     this.hb_font_destroy = exports.hb_font_destroy;
@@ -92,6 +108,28 @@ export class HarfBuzzBlob {
   }
 }
 
+function typedArrayFromSet<T extends 'u8' | 'u32' | 'i32'>(setPtr: Pointer, arrayType: T) {
+  const heap = hb[`heap${arrayType}`];
+  const bytesPerElment = heap.BYTES_PER_ELEMENT;
+  const setCount = hb.hb_set_get_population(setPtr);
+  const arrayPtr = hb.malloc(
+    setCount * bytesPerElment,
+  );
+  const arrayOffset = arrayPtr / bytesPerElment;
+  const array = heap.subarray(
+    arrayOffset,
+    arrayOffset + setCount,
+  ) as typeof hb[`heap${T}`];
+  heap.set(array, arrayOffset);
+  hb.hb_set_next_many(
+    setPtr,
+    HB_SET_VALUE_INVALID,
+    arrayPtr,
+    setCount,
+  );
+  return array;
+}
+
 export class HarfBuzzFace {
   readonly ptr: Pointer;
 
@@ -103,6 +141,14 @@ export class HarfBuzzFace {
     return hb.hb_face_get_upem(this.ptr);
   }
 
+  collectUnicodes() {
+    const unicodeSetPtr = hb.hb_set_create();
+    hb.hb_face_collect_unicodes(this.ptr, unicodeSetPtr);
+    const result = typedArrayFromSet(unicodeSetPtr, 'u32');
+    hb.hb_set_destroy(unicodeSetPtr);
+    return result;
+  }
+
   destroy() {
     hb.hb_face_destroy(this.ptr);
   }

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

@@ -9,6 +9,7 @@ function hbjs(instance) {
   var utf8Decoder = new TextDecoder("utf8");
 
   var HB_MEMORY_MODE_WRITABLE = 2;
+  var HB_SET_VALUE_INVALID = -1;
 
   function hb_tag(s) {
     return (
@@ -54,6 +55,42 @@ function hbjs(instance) {
     };
   }
 
+  /**
+   * Return the typed array of HarfBuzz set contents.
+   * @template {typeof Uint8Array | typeof Uint32Array | typeof Int32Array | typeof Float32Array} T
+   * @param {number} setPtr Pointer of set
+   * @param {T} arrayClass Typed array class
+   * @returns {InstanceType<T>} Typed array instance
+   */
+  function typedArrayFromSet(setPtr, arrayClass) {
+    let heap = heapu8;
+    if (arrayClass === Uint32Array) {
+      heap = heapu32;
+    } else if (arrayClass === Int32Array) {
+      heap = heapi32;
+    } else if (arrayClass === Float32Array) {
+      heap = heapf32;
+    }
+    const bytesPerElment = arrayClass.BYTES_PER_ELEMENT;
+    const setCount = exports.hb_set_get_population(setPtr);
+    const arrayPtr = exports.malloc(
+      setCount * bytesPerElment,
+    );
+    const arrayOffset = arrayPtr / bytesPerElment;
+    const array = heap.subarray(
+      arrayOffset,
+      arrayOffset + setCount,
+    );
+    heap.set(array, arrayOffset);
+    exports.hb_set_next_many(
+      setPtr,
+      HB_SET_VALUE_INVALID,
+      arrayPtr,
+      setCount,
+    );
+    return array;
+  }
+
   /**
   * Create an object representing a Harfbuzz face.
   * @param {object} blob An object returned from `createBlob`.
@@ -98,6 +135,16 @@ function hbjs(instance) {
         exports.free(axis);
         return result;
       },
+      /**
+       * Return unicodes the face supports
+       */
+      collectUnicodes: function() {
+        var unicodeSetPtr = exports.hb_set_create();
+        exports.hb_face_collect_unicodes(ptr, unicodeSetPtr);
+        var result = typedArrayFromSet(unicodeSetPtr, Uint32Array);
+        exports.hb_set_destroy(ptr);
+        return result;
+      },
       /**
        * Free the object.
        */

package/hbjs.symbols

@@ -16,6 +16,7 @@ _hb_buffer_set_flags
 _hb_buffer_set_language
 _hb_buffer_set_script
 _hb_face_create
+_hb_face_collect_unicodes
 _hb_face_destroy
 _hb_face_get_upem
 _hb_face_reference_table
@@ -28,6 +29,10 @@ _hb_glyph_info_get_glyph_flags
 _hb_language_from_string
 _hb_ot_var_get_axis_infos
 _hb_script_from_string
+_hb_set_create
+_hb_set_destroy
+_hb_set_get_population
+_hb_set_next_many
 _hb_shape
 _hbjs_glyph_svg
 _hbjs_shape_with_trace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "harfbuzzjs",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "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"