@turntrout/subfont 1.7.0 → 1.8.0

package/lib/collectFeatureGlyphIds.js

@@ -1,150 +1,136 @@
-const { toSfnt } = require('./sfntCache');
-
+"use strict";
+const sfntCache_1 = require("./sfntCache");
+const enqueueWasm = require("./wasmQueue");
 // GSUB feature tags that can produce alternate glyphs.  Used as the
 // fallback set when CSS doesn't specify which features are in use.
-// Keep in sync with fontVariantToOTTags in collectTextsByPage.js.
+// Keep in sync with fontVariantToOTTags in fontFeatureHelpers.ts.
 const GSUB_FEATURE_TAGS = new Set([
-  'aalt',
-  'afrc',
-  'c2pc',
-  'c2sc',
-  'calt',
-  'ccmp', // glyph composition/decomposition — needed for combining characters
-  'clig',
-  'dlig',
-  'dnom',
-  'frac',
-  'fwid',
-  'hist',
-  'hlig',
-  'jp04',
-  'jp78',
-  'jp83',
-  'jp90',
-  'liga',
-  'lnum',
-  'locl', // localized forms — language-specific glyph variants
-  'nalt',
-  'numr',
-  'onum',
-  'ordn',
-  'ornm',
-  'pcap',
-  'pnum',
-  'pwid',
-  'rclt', // required contextual alternates — needed for many scripts
-  'rlig', // required ligatures — mandatory for Arabic/Indic scripts
-  'ruby',
-  'salt',
-  'sinf',
-  'smcp',
-  'smpl',
-  'ss01',
-  'ss02',
-  'ss03',
-  'ss04',
-  'ss05',
-  'ss06',
-  'ss07',
-  'ss08',
-  'ss09',
-  'ss10',
-  'ss11',
-  'ss12',
-  'ss13',
-  'ss14',
-  'ss15',
-  'ss16',
-  'ss17',
-  'ss18',
-  'ss19',
-  'ss20',
-  'subs',
-  'sups',
-  'swsh',
-  'titl',
-  'tnum',
-  'trad',
-  'unic',
-  'zero',
+    'aalt',
+    'afrc',
+    'c2pc',
+    'c2sc',
+    'calt',
+    'ccmp', // glyph composition/decomposition — needed for combining characters
+    'clig',
+    'dlig',
+    'dnom',
+    'frac',
+    'fwid',
+    'hist',
+    'hlig',
+    'jp04',
+    'jp78',
+    'jp83',
+    'jp90',
+    'liga',
+    'lnum',
+    'locl', // localized forms — language-specific glyph variants
+    'nalt',
+    'numr',
+    'onum',
+    'ordn',
+    'ornm',
+    'pcap',
+    'pnum',
+    'pwid',
+    'rclt', // required contextual alternates — needed for many scripts
+    'rlig', // required ligatures — mandatory for Arabic/Indic scripts
+    'ruby',
+    'salt',
+    'sinf',
+    'smcp',
+    'smpl',
+    'ss01',
+    'ss02',
+    'ss03',
+    'ss04',
+    'ss05',
+    'ss06',
+    'ss07',
+    'ss08',
+    'ss09',
+    'ss10',
+    'ss11',
+    'ss12',
+    'ss13',
+    'ss14',
+    'ss15',
+    'ss16',
+    'ss17',
+    'ss18',
+    'ss19',
+    'ss20',
+    'subs',
+    'sups',
+    'swsh',
+    'titl',
+    'tnum',
+    'trad',
+    'unic',
+    'zero',
 ]);
-
-const enqueueWasm = require('./wasmQueue');
-
 async function collectFeatureGlyphIdsImpl(fontBuffer, text, cssFeatureTags) {
-  const harfbuzzJs = await require('harfbuzzjs');
-  const sfnt = await toSfnt(fontBuffer);
-
-  const blob = harfbuzzJs.createBlob(sfnt);
-  const face = harfbuzzJs.createFace(blob, 0);
-  const font = harfbuzzJs.createFont(face);
-
-  try {
-    const fontFeatures = new Set(face.getTableFeatureTags('GSUB'));
-
-    // When CSS specifies which features are used, only test those.
-    // Otherwise fall back to the full set of supported GSUB features.
-    const allowedTags =
-      cssFeatureTags && cssFeatureTags.length > 0
-        ? new Set(cssFeatureTags)
-        : GSUB_FEATURE_TAGS;
-
-    const featuresToTest = [...fontFeatures].filter((tag) =>
-      allowedTags.has(tag)
-    );
-
-    if (featuresToTest.length === 0) return [];
-
-    // Shape the full string once per feature: O(features) calls, not O(chars × features).
-    const uniqueChars = [...new Set(text)].filter((ch) => ch.trim() !== '');
-    if (uniqueChars.length === 0) return [];
-    const testText = uniqueChars.join('');
-
-    const baseBuf = harfbuzzJs.createBuffer();
-    let baseGids;
+    const harfbuzzJs = await require('harfbuzzjs');
+    const sfnt = await (0, sfntCache_1.toSfnt)(fontBuffer);
+    const blob = harfbuzzJs.createBlob(sfnt);
+    const face = harfbuzzJs.createFace(blob, 0);
+    const font = harfbuzzJs.createFont(face);
     try {
-      baseBuf.addText(testText);
-      baseBuf.guessSegmentProperties();
-      harfbuzzJs.shapeWithTrace(font, baseBuf, '', 10000, 0);
-      const baseGlyphs = baseBuf.json(font);
-      if (baseGlyphs.length === 0) return [];
-      baseGids = new Set(baseGlyphs.map((g) => g.g));
-    } finally {
-      baseBuf.destroy();
-    }
-
-    const altGlyphIds = new Set();
-
-    for (const feat of featuresToTest) {
-      const buf = harfbuzzJs.createBuffer();
-      try {
-        buf.addText(testText);
-        buf.guessSegmentProperties();
-        harfbuzzJs.shapeWithTrace(font, buf, `+${feat}`, 10000, 0);
-        const result = buf.json(font);
-
-        for (const glyph of result) {
-          if (!baseGids.has(glyph.g)) {
-            altGlyphIds.add(glyph.g);
-          }
+        const fontFeatures = new Set(face.getTableFeatureTags('GSUB'));
+        // When CSS specifies which features are used, only test those.
+        // Otherwise fall back to the full set of supported GSUB features.
+        const cssTagsArr = cssFeatureTags ? [...cssFeatureTags] : [];
+        const allowedTags = cssTagsArr.length > 0 ? new Set(cssTagsArr) : GSUB_FEATURE_TAGS;
+        const featuresToTest = [...fontFeatures].filter((tag) => allowedTags.has(tag));
+        if (featuresToTest.length === 0)
+            return [];
+        // Shape the full string once per feature: O(features) calls, not O(chars × features).
+        const uniqueChars = [...new Set(text)].filter((ch) => ch.trim() !== '');
+        if (uniqueChars.length === 0)
+            return [];
+        const testText = uniqueChars.join('');
+        const baseBuf = harfbuzzJs.createBuffer();
+        let baseGids;
+        try {
+            baseBuf.addText(testText);
+            baseBuf.guessSegmentProperties();
+            harfbuzzJs.shapeWithTrace(font, baseBuf, '', 10000, 0);
+            const baseGlyphs = baseBuf.json(font);
+            if (baseGlyphs.length === 0)
+                return [];
+            baseGids = new Set(baseGlyphs.map((g) => g.g));
+        }
+        finally {
+            baseBuf.destroy();
         }
-      } finally {
-        buf.destroy();
-      }
+        const altGlyphIds = new Set();
+        for (const feat of featuresToTest) {
+            const buf = harfbuzzJs.createBuffer();
+            try {
+                buf.addText(testText);
+                buf.guessSegmentProperties();
+                harfbuzzJs.shapeWithTrace(font, buf, `+${feat}`, 10000, 0);
+                const result = buf.json(font);
+                for (const glyph of result) {
+                    if (!baseGids.has(glyph.g)) {
+                        altGlyphIds.add(glyph.g);
+                    }
+                }
+            }
+            finally {
+                buf.destroy();
+            }
+        }
+        return [...altGlyphIds];
+    }
+    finally {
+        font.destroy();
+        face.destroy();
+        blob.destroy();
     }
-
-    return [...altGlyphIds];
-  } finally {
-    font.destroy();
-    face.destroy();
-    blob.destroy();
-  }
 }
-
 function collectFeatureGlyphIds(fontBuffer, text, cssFeatureTags) {
-  return enqueueWasm(() =>
-    collectFeatureGlyphIdsImpl(fontBuffer, text, cssFeatureTags)
-  );
+    return enqueueWasm(() => collectFeatureGlyphIdsImpl(fontBuffer, text, cssFeatureTags));
 }
-
 module.exports = collectFeatureGlyphIds;
+//# sourceMappingURL=collectFeatureGlyphIds.js.map

package/lib/collectFeatureGlyphIds.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"collectFeatureGlyphIds.js","sourceRoot":"","sources":["../src/collectFeatureGlyphIds.ts"],"names":[],"mappings":"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"}

package/lib/collectTextsByPage.d.ts

@@ -0,0 +1,41 @@
+import { findFontFamiliesWithFeatureSettings } from './fontFeatureHelpers';
+import type { Asset, AssetGraph, Relation } from 'assetgraph';
+interface FontFaceDeclaration {
+    'font-family'?: string;
+    'font-style'?: string;
+    'font-weight'?: string;
+    'font-stretch'?: string;
+    src?: string;
+    '-subfont-text'?: string;
+    relations: Relation[];
+    [descriptor: string]: string | Relation[] | undefined;
+}
+interface TextByPropsEntry {
+    text: string;
+    props: Record<string, string>;
+    htmlOrSvgAsset?: Asset;
+}
+interface AssetTextWithPropsEntry {
+    htmlOrSvgAsset: Asset;
+    textByProps: TextByPropsEntry[];
+    accumulatedFontFaceDeclarations: FontFaceDeclaration[];
+    fontFamiliesWithFeatureSettings: ReturnType<typeof findFontFamiliesWithFeatureSettings>;
+    featureTagsByFamily: Map<string, Set<string>>;
+    fontUsages: any[];
+}
+interface CollectTextsByPageOptions {
+    text?: string;
+    console?: Console | null;
+    dynamic?: boolean;
+    debug?: boolean;
+    concurrency?: number;
+    chromeArgs?: string[];
+}
+interface CollectTextsByPageResult {
+    htmlOrSvgAssetTextsWithProps: AssetTextWithPropsEntry[];
+    fontFaceDeclarationsByHtmlOrSvgAsset: Map<Asset, FontFaceDeclaration[]>;
+    subTimings: Record<string, number | undefined>;
+}
+declare function collectTextsByPage(assetGraph: AssetGraph, htmlOrSvgAssets: Asset[], { text, console, dynamic, debug, concurrency, chromeArgs, }?: CollectTextsByPageOptions): Promise<CollectTextsByPageResult>;
+export = collectTextsByPage;
+//# sourceMappingURL=collectTextsByPage.d.ts.map

package/lib/collectTextsByPage.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"collectTextsByPage.d.ts","sourceRoot":"","sources":["../src/collectTextsByPage.ts"],"names":[],"mappings":"AAyBA,OAAO,EACL,mCAAmC,EAEpC,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAe,MAAM,YAAY,CAAC;AAkC3E,UAAU,mBAAmB;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,EAAE,GAAG,SAAS,CAAC;CACvD;AAcD,UAAU,gBAAgB;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE9B,cAAc,CAAC,EAAE,KAAK,CAAC;CACxB;AAs1BD,UAAU,uBAAuB;IAC/B,cAAc,EAAE,KAAK,CAAC;IACtB,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAChC,+BAA+B,EAAE,mBAAmB,EAAE,CAAC;IACvD,+BAA+B,EAAE,UAAU,CACzC,OAAO,mCAAmC,CAC3C,CAAC;IACF,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAK9C,UAAU,EAAE,GAAG,EAAE,CAAC;CACnB;AAoMD,UAAU,yBAAyB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,UAAU,wBAAwB;IAChC,4BAA4B,EAAE,uBAAuB,EAAE,CAAC;IACxD,oCAAoC,EAAE,GAAG,CAAC,KAAK,EAAE,mBAAmB,EAAE,CAAC,CAAC;IACxE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAChD;AAED,iBAAe,kBAAkB,CAC/B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,KAAK,EAAE,EACxB,EACE,IAAI,EACJ,OAAO,EACP,OAAe,EACf,KAAa,EACb,WAAW,EACX,UAAe,GAChB,GAAE,yBAA8B,GAChC,OAAO,CAAC,wBAAwB,CAAC,CAsGnC;AAED,SAAS,kBAAkB,CAAC"}