@ot-builder/cli-proc 1.5.5 → 1.6.0

package/CHANGELOG.json

@@ -2,7 +2,64 @@
   "name": "@ot-builder/cli-proc",
   "entries": [
     {
-      "date": "Sat, 03 Dec 2022 01:08:18 GMT",
+      "date": "Sat, 21 Jan 2023 01:08:43 GMT",
+      "tag": "@ot-builder/cli-proc_v1.6.0",
+      "version": "1.6.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "otbbuilder-dev@users.noreply.github.com",
+            "package": "@ot-builder/cli-proc",
+            "commit": "e80cd99ac2e97a339ecbe083e3c9a2c10a6b12d7",
+            "comment": "GC: add functionality to cleanup inaccessible lookups"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/io-bin-font to v1.6.0",
+            "commit": "e80cd99ac2e97a339ecbe083e3c9a2c10a6b12d7"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/primitive to v1.6.0",
+            "commit": "e80cd99ac2e97a339ecbe083e3c9a2c10a6b12d7"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/common-impl to v1.6.0",
+            "commit": "e80cd99ac2e97a339ecbe083e3c9a2c10a6b12d7"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/rectify to v1.6.0",
+            "commit": "e80cd99ac2e97a339ecbe083e3c9a2c10a6b12d7"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/trace to v1.6.0",
+            "commit": "e80cd99ac2e97a339ecbe083e3c9a2c10a6b12d7"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/prelude to v1.6.0",
+            "commit": "e80cd99ac2e97a339ecbe083e3c9a2c10a6b12d7"
+          },
+          {
+            "author": "beachball",
+            "package": "@ot-builder/cli-proc",
+            "comment": "Bump @ot-builder/ot to v1.6.0",
+            "commit": "e80cd99ac2e97a339ecbe083e3c9a2c10a6b12d7"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 03 Dec 2022 01:09:39 GMT",
       "tag": "@ot-builder/cli-proc_v1.5.5",
       "version": "1.5.5",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,27 @@
 # Change Log - @ot-builder/cli-proc
 
-This log was last generated on Sat, 03 Dec 2022 01:08:18 GMT and should not be manually modified.
+This log was last generated on Sat, 21 Jan 2023 01:08:43 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 1.6.0
+
+Sat, 21 Jan 2023 01:08:43 GMT
+
+### Minor changes
+
+- GC: add functionality to cleanup inaccessible lookups (otbbuilder-dev@users.noreply.github.com)
+- Bump @ot-builder/io-bin-font to v1.6.0
+- Bump @ot-builder/primitive to v1.6.0
+- Bump @ot-builder/common-impl to v1.6.0
+- Bump @ot-builder/rectify to v1.6.0
+- Bump @ot-builder/trace to v1.6.0
+- Bump @ot-builder/prelude to v1.6.0
+- Bump @ot-builder/ot to v1.6.0
+
 ## 1.5.5
 
-Sat, 03 Dec 2022 01:08:18 GMT
+Sat, 03 Dec 2022 01:09:39 GMT
 
 ### Patches
 

package/lib/procs/gc.js

@@ -1,12 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gcFont = void 0;
+const ImpLib = require("@ot-builder/common-impl");
 const Rectify = require("@ot-builder/rectify");
 const initial_visible_glyphs_1 = require("../support/initial-visible-glyphs");
+const index_1 = require("./merge-consolidate/index");
 function gcFont(font, gsf) {
+    if (font.gsub)
+        cleanupInaccessibleLookups(font.gsub);
+    if (font.gpos)
+        cleanupInaccessibleLookups(font.gpos);
     const { glyphs, rectifier } = (0, initial_visible_glyphs_1.createSubsetRectifier)(font, { has: () => true });
     font.glyphs = gsf.createStoreFromList(glyphs);
     Rectify.inPlaceRectifyFontGlyphReferences(rectifier, font);
+    if (font.gpos)
+        font.gpos = (0, index_1.consolidateGsubGpos)(font.fvar, font.gpos);
+    if (font.gsub)
+        font.gsub = (0, index_1.consolidateGsubGpos)(font.fvar, font.gsub);
 }
 exports.gcFont = gcFont;
+function cleanupInaccessibleLookups(table) {
+    const keptFeatures = new Set();
+    for (const script of table.scripts.values()) {
+        if (script.defaultLanguage)
+            collectAccessibleFeatures(script.defaultLanguage, keptFeatures);
+        for (const lang of script.languages.values())
+            collectAccessibleFeatures(lang, keptFeatures);
+    }
+    const keptLookups = new Set();
+    for (const feature of table.features) {
+        if (!keptFeatures.has(feature))
+            emptyFeature(feature);
+        else
+            for (const lookup of feature.lookups)
+                keptLookups.add(lookup);
+    }
+    if (table.featureVariations) {
+        for (const fv of table.featureVariations) {
+            for (const [from, to] of fv.substitutions) {
+                if (!keptFeatures.has(from))
+                    emptyFeature(to);
+                else
+                    for (const lookup of to.lookups)
+                        keptLookups.add(lookup);
+            }
+        }
+    }
+    ImpLib.ArrayHelper.inPlaceShrinkArray(keptLookups, table.lookups);
+}
+function collectAccessibleFeatures(lang, sink) {
+    if (lang.requiredFeature)
+        sink.add(lang.requiredFeature);
+    for (const feature of lang.features)
+        sink.add(feature);
+}
+function emptyFeature(f) {
+    f.lookups = [];
+    f.params = null;
+}
 //# sourceMappingURL=gc.js.map

package/lib/procs/merge-consolidate/index.d.ts

@@ -1,7 +1,9 @@
 import * as Ot from "@ot-builder/ot";
+import { Data } from "@ot-builder/prelude";
 export type MergeOptions = {
     preferOverride?: boolean;
 };
 export declare function mergeFonts<GS extends Ot.GlyphStore, GS2 extends Ot.GlyphStore>(basis: Ot.Font<GS>, override: Ot.Font<GS2>, gsf: Ot.GlyphStoreFactory<GS>, opt?: MergeOptions): void;
 export declare function consolidateFont<GS extends Ot.GlyphStore>(font: Ot.Font<GS>): void;
+export declare function consolidateGsubGpos<L>(fvar: Data.Maybe<Ot.Fvar.Table>, preferred: Ot.GsubGpos.TableT<L>): Ot.GsubGpos.TableT<L>;
 //# sourceMappingURL=index.d.ts.map

package/lib/procs/merge-consolidate/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.consolidateFont = exports.mergeFonts = void 0;
+exports.consolidateGsubGpos = exports.consolidateFont = exports.mergeFonts = void 0;
 const ImpLib = require("@ot-builder/common-impl");
 const Ot = require("@ot-builder/ot");
 const Rectify = require("@ot-builder/rectify");
@@ -83,4 +83,5 @@ function consolidateGsubGpos(fvar, preferred) {
     const merger = new gsub_gpos_merger_1.GsubGposMerger(ImpLib.Order.fromList("Dimensions", fvar ? fvar.axes.map(a => a.dim) : []), preferred, { scripts: new Map(), features: [], lookups: [], featureVariations: [] });
     return merger.resolve();
 }
+exports.consolidateGsubGpos = consolidateGsubGpos;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ot-builder/cli-proc",
-  "version": "1.5.5",
+  "version": "1.6.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -24,13 +24,13 @@
   },
   "dependencies": {
     "tslib": "^2.0.0",
-    "@ot-builder/io-bin-font": "1.5.5",
-    "@ot-builder/primitive": "1.5.5",
-    "@ot-builder/common-impl": "1.5.5",
-    "@ot-builder/rectify": "1.5.5",
-    "@ot-builder/trace": "1.5.5",
-    "@ot-builder/prelude": "1.5.5",
-    "@ot-builder/ot": "1.5.5"
+    "@ot-builder/io-bin-font": "1.6.0",
+    "@ot-builder/primitive": "1.6.0",
+    "@ot-builder/common-impl": "1.6.0",
+    "@ot-builder/rectify": "1.6.0",
+    "@ot-builder/trace": "1.6.0",
+    "@ot-builder/prelude": "1.6.0",
+    "@ot-builder/ot": "1.6.0"
   },
   "devDependencies": {
     "@types/jest": "^26.0.23",