otb-ttc-bundle 1.7.3 → 1.7.5

package/lib/arg-parser.d.ts

@@ -15,6 +15,6 @@ export declare class ArgParser implements CliArgSource {
     private handleOption;
     private handleArgument;
 }
-export declare function displayHelp(): void;
-export declare function displayVersion(): void;
+export declare function displayHelp(): Promise<void>;
+export declare function displayVersion(): Promise<void>;
 //# sourceMappingURL=arg-parser.d.ts.map

package/lib/arg-parser.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayVersion = exports.displayHelp = exports.ArgParser = void 0;
+exports.ArgParser = void 0;
+exports.displayHelp = displayHelp;
+exports.displayVersion = displayVersion;
 const cli_help_shower_1 = require("@ot-builder/cli-help-shower");
 const cli_shared_1 = require("@ot-builder/cli-shared");
 const package_version_1 = require("./package-version");
@@ -76,9 +78,9 @@ class ArgParser {
     }
 }
 exports.ArgParser = ArgParser;
-function displayHelp() {
+async function displayHelp() {
     new cli_help_shower_1.CliHelpShower()
-        .message(`otb-ttc-bundle: TTC bundler, version ${package_version_1.packageVersion}`)
+        .message(`otb-ttc-bundle: TTC bundler, version ${await (0, package_version_1.getPackageVersion)()}`)
         .message(cli_help_shower_1.Style.Rule)
         .message(`Usage:`)
         .withIndent(cli_help_shower_1.Style.Bullet, s => {
@@ -122,9 +124,7 @@ function displayHelp() {
         });
     });
 }
-exports.displayHelp = displayHelp;
-function displayVersion() {
-    console.log(package_version_1.packageVersion);
+async function displayVersion() {
+    console.log(await (0, package_version_1.getPackageVersion)());
 }
-exports.displayVersion = displayVersion;
 //# sourceMappingURL=arg-parser.js.map

package/lib/glyph-sharing/create-ttc.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { FontIo } from "ot-builder";
 export declare function createTtcSlices(input: Buffer[], sharing: null | number[][]): FontIo.TableSliceCollection[];
 //# sourceMappingURL=create-ttc.d.ts.map

package/lib/glyph-sharing/create-ttc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createTtcSlices = void 0;
+exports.createTtcSlices = createTtcSlices;
 const ot_builder_1 = require("ot-builder");
 const sparse_glyf_data_processor_1 = require("./sparse-glyf-data-processor");
 const sparse_gvar_data_processor_1 = require("./sparse-gvar-data-processor");
@@ -14,7 +14,6 @@ function createTtcSlices(input, sharing) {
     }
     return fonts;
 }
-exports.createTtcSlices = createTtcSlices;
 function convertSfntToCustom(sfnt) {
     const ds = { version: sfnt.version, tables: new Map() };
     for (const [tag, table] of sfnt.tables)

package/lib/glyph-sharing/glyph-class.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decideGlyphClass = exports.GlyphClass = void 0;
+exports.GlyphClass = void 0;
+exports.decideGlyphClass = decideGlyphClass;
 const ot_builder_1 = require("ot-builder");
 var GlyphClass;
 (function (GlyphClass) {
@@ -30,5 +31,4 @@ function decideGlyphClass(glyph, gid, commonWidth, commonHeight) {
         gk |= GlyphClass.CommonHeight;
     return gk;
 }
-exports.decideGlyphClass = decideGlyphClass;
 //# sourceMappingURL=glyph-class.js.map

package/lib/glyph-sharing/sparse-common.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export type GlyphData = {
     hash: string;
     buffer: Buffer;
@@ -11,5 +10,5 @@ export type DataBlockBuildResults = {
     saGidMaps: Map<string, number>[];
 };
 export declare function buildDataBlock(shared: GlyphSharingMap[]): DataBlockBuildResults;
-export declare function buildOffsetIndex(offsets: number[], validateAlign: boolean): Buffer;
+export declare function buildOffsetIndex(offsets: number[], validateAlign: boolean): Buffer<ArrayBuffer>;
 //# sourceMappingURL=sparse-common.d.ts.map

package/lib/glyph-sharing/sparse-common.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildOffsetIndex = exports.buildDataBlock = exports.pushGlyphs = void 0;
+exports.pushGlyphs = pushGlyphs;
+exports.buildDataBlock = buildDataBlock;
+exports.buildOffsetIndex = buildOffsetIndex;
 function pushGlyphs(sink, fid, gds, sharing) {
     const sh = sharing[fid];
     if (gds.length !== sh.length)
@@ -11,7 +13,6 @@ function pushGlyphs(sink, fid, gds, sharing) {
         sink[sh[gid]].set(gds[gid].hash, gds[gid].buffer);
     }
 }
-exports.pushGlyphs = pushGlyphs;
 function allocateGid(shared) {
     let saGid = 0;
     const saGidMaps = [];
@@ -45,7 +46,6 @@ function buildDataBlock(shared) {
     }
     return { dataBlock: dataBlock, offsets: offsets, saGidMaps };
 }
-exports.buildDataBlock = buildDataBlock;
 function buildOffsetIndex(offsets, validateAlign) {
     const buf = Buffer.alloc(offsets.length * 4);
     for (let j = 0; j < offsets.length; j++) {
@@ -55,5 +55,4 @@ function buildOffsetIndex(offsets, validateAlign) {
     }
     return buf;
 }
-exports.buildOffsetIndex = buildOffsetIndex;
 //# sourceMappingURL=sparse-common.js.map

package/lib/glyph-sharing/sparse-glyf-data-processor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sparseShareGlyfData = void 0;
+exports.sparseShareGlyfData = sparseShareGlyfData;
 const Crypto = require("crypto");
 const sparse_common_1 = require("./sparse-common");
 const IndexToLocFormatOffset = 50;
@@ -24,7 +24,6 @@ function sparseShareGlyfData(fonts, sharing) {
         task.head.data.writeUInt16BE(1, IndexToLocFormatOffset);
     }
 }
-exports.sparseShareGlyfData = sparseShareGlyfData;
 function taskToLocaBuf(entry, sharing, db) {
     const sh = sharing[entry.fontID];
     const entryOffsets = [];

package/lib/glyph-sharing/sparse-gvar-data-processor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sparseShareGvarData = void 0;
+exports.sparseShareGvarData = sparseShareGvarData;
 const Crypto = require("crypto");
 const sparse_common_1 = require("./sparse-common");
 // Layout:                             Viewed from font 1        Viewed font font 2
@@ -57,7 +57,6 @@ function sparseShareGvarData(fonts, sharing) {
         start += gvarInitialSize(task);
     }
 }
-exports.sparseShareGvarData = sparseShareGvarData;
 function taskToLocaBuf(task, sharing, db, deltaOffsetOfRest) {
     const sh = sharing[task.fontID];
     const entryOffsets = [];

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cliMain = void 0;
+exports.cliMain = cliMain;
 const Fs = require("fs");
 const cli_shared_1 = require("@ot-builder/cli-shared");
 const ot_builder_1 = require("ot-builder");
@@ -12,9 +12,9 @@ async function cliMain(argv) {
     for (const arg of argv.slice(2))
         args.arg(arg);
     if (args.displayHelp)
-        return (0, arg_parser_1.displayHelp)();
+        return await (0, arg_parser_1.displayHelp)();
     if (args.displayVersion)
-        return (0, arg_parser_1.displayVersion)();
+        return await (0, arg_parser_1.displayVersion)();
     if (!args.inputs || !args.inputs.length) {
         throw new Error("Please specify at least one input font. Exit.");
     }
@@ -28,7 +28,6 @@ async function cliMain(argv) {
         await glyphSharingMerging(args);
     }
 }
-exports.cliMain = cliMain;
 async function simpleMerging(args) {
     const sfntList = [];
     for (const input of args.inputs) {

package/lib/package-version.d.ts

@@ -1,2 +1,2 @@
-export declare const packageVersion: string;
+export declare function getPackageVersion(): Promise<string>;
 //# sourceMappingURL=package-version.d.ts.map

package/lib/package-version.js

@@ -1,8 +1,11 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-var-requires */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.packageVersion = void 0;
-const pJson = require("../package.json");
-exports.packageVersion = pJson.version;
+exports.getPackageVersion = getPackageVersion;
+const fs = require("fs");
+const path = require("path");
+async function getPackageVersion() {
+    const moduleDir = path.join(__dirname, "..");
+    const json = JSON.parse(await fs.promises.readFile(path.join(moduleDir, "package.json"), "utf-8"));
+    return json.version;
+}
 //# sourceMappingURL=package-version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "otb-ttc-bundle",
-  "version": "1.7.3",
+  "version": "1.7.5",
   "bin": {
     "otb-ttc-bundle": "./bin/otb-ttc-bundle"
   },
@@ -26,13 +26,13 @@
     "access": "public"
   },
   "dependencies": {
-    "tslib": "^2.0.0",
-    "ot-builder": "1.7.3",
-    "@ot-builder/cli-help-shower": "1.7.3",
-    "@ot-builder/cli-shared": "1.7.3"
+    "tslib": "^2.8.1",
+    "ot-builder": "1.7.5",
+    "@ot-builder/cli-help-shower": "1.7.5",
+    "@ot-builder/cli-shared": "1.7.5"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.5",
-    "jest": "^29.6.2"
+    "@types/jest": "^29.5.14",
+    "jest": "^29.7.0"
   }
 }