ot-builder-cli 1.7.3 → 1.7.4

package/lib/argv-parser/index.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StartParseArgv = exports.ParseResult = void 0;
-const Chalk = require("chalk");
+exports.ParseResult = ParseResult;
+exports.StartParseArgv = StartParseArgv;
+const cli_help_shower_1 = require("@ot-builder/cli-help-shower");
 function ParseResult(progress, result) {
     return { progress, result };
 }
-exports.ParseResult = ParseResult;
 function StartParseArgv(argv, index = 0) {
     return new ParseArgvImpl(argv, index);
 }
-exports.StartParseArgv = StartParseArgv;
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 class ParseArgvImpl {
     constructor(argv, cp) {
@@ -25,7 +24,10 @@ class ParseArgvImpl {
         return this.eof;
     }
     isOption(...options) {
-        if (this.isEof())
+        return this.isOptionImpl(...options);
+    }
+    isOptionImpl(...options) {
+        if (this.eof)
             return false;
         const opt = this.argv[this.cp];
         if (opt[0] !== "-" && opt[0] !== "+")
@@ -44,7 +46,7 @@ class ParseArgvImpl {
         return this.option;
     }
     isArgument() {
-        return !this.isEof() && !this.isOption();
+        return !this.eof && !this.isOptionImpl();
     }
     expectArgument() {
         if (!this.isArgument())
@@ -69,7 +71,7 @@ class ParseArgvImpl {
                 s += " ";
             const segmentText = cp === 0 ? "node" : cp === 1 ? "otb-cli" : this.argv[cp];
             if (cp === this.cp)
-                s += Chalk.bold.red.underline(segmentText);
+                s += cli_help_shower_1.Style.ArgvParseError(segmentText);
             else
                 s += segmentText;
         }

package/lib/create-grammar.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createGrammar = void 0;
+exports.createGrammar = createGrammar;
 const consolidate_1 = require("./syntax/actions/consolidate");
 const drop_1 = require("./syntax/actions/drop");
 const gc_1 = require("./syntax/actions/gc");
@@ -50,5 +50,4 @@ function createGrammar() {
     ]));
     return { element, start };
 }
-exports.createGrammar = createGrammar;
 //# sourceMappingURL=create-grammar.js.map

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cliMain = void 0;
+exports.cliMain = cliMain;
 const argv_parser_1 = require("./argv-parser");
 const create_grammar_1 = require("./create-grammar");
 const state_1 = require("./state");
@@ -18,5 +18,4 @@ async function cliMain(argv) {
         await prAction.result(state);
     }
 }
-exports.cliMain = cliMain;
 //# sourceMappingURL=index.js.map

package/lib/sub-parsers/unicode-ranges/generated.js

@@ -32,7 +32,8 @@
 * ___         := _ '(?:#[^\r\n]*)?[\r\n]' __
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SyntaxErr = exports.parse = exports.Parser = exports.CodePoint = exports.Range_2 = exports.Range_1 = exports.Ranges_2 = exports.Ranges_1 = exports.start = exports.ASTKinds = void 0;
+exports.SyntaxErr = exports.Parser = exports.CodePoint = exports.Range_2 = exports.Range_1 = exports.Ranges_2 = exports.Ranges_1 = exports.start = exports.ASTKinds = void 0;
+exports.parse = parse;
 var ASTKinds;
 (function (ASTKinds) {
     ASTKinds[ASTKinds["start"] = 0] = "start";
@@ -449,7 +450,6 @@ function parse(s) {
     const p = new Parser(s);
     return p.parse();
 }
-exports.parse = parse;
 class SyntaxErr {
     constructor(pos, expmatches) {
         this.pos = pos;

package/lib/syntax/actions/intro.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadFontFromFile = exports.IntroSyntax = void 0;
+exports.IntroSyntax = void 0;
+exports.loadFontFromFile = loadFontFromFile;
 const Fs = require("fs");
 const Path = require("path");
 const cli_help_shower_1 = require("@ot-builder/cli-help-shower");
@@ -31,5 +32,4 @@ async function loadFontFromFile(path, gsf, cfg) {
     const bufFont = await Fs.promises.readFile(Path.resolve(path));
     return ot_builder_1.FontIo.readFont(ot_builder_1.FontIo.readSfntOtf(bufFont), gsf, cfg);
 }
-exports.loadFontFromFile = loadFontFromFile;
 //# sourceMappingURL=intro.js.map

package/lib/syntax/actions/merge.js

@@ -32,7 +32,7 @@ exports.MergeSyntax = {
             .indent("")
             .message("Merge the font on the stack top to the font below it.")
             .message(`In a typical use like:`, cli_help_shower_1.Style.Cmd `otb-cli`, cli_help_shower_1.Style.Arg `a.ttf`, cli_help_shower_1.Style.Arg `b.ttf`, cli_help_shower_1.Style.Option `--merge`, cli_help_shower_1.Style.Option `-o`, cli_help_shower_1.Style.Arg `ab.ttf`, `, metadata and naming will follow`, cli_help_shower_1.Style.Arg `a.ttf`, `while glyphs from`, cli_help_shower_1.Style.Arg `b.ttf`, `will be added to it.`)
-            .message(`When`, cli_help_shower_1.Style.Option(`--override`), `is provided, characters from`, cli_help_shower_1.Style.Arg `b.ttf`, `will be preferred; otherwise, characters from`, cli_help_shower_1.Style.Arg `a.ttf`, `will be preferred.`);
+            .message(`When`, cli_help_shower_1.Style.Option `--override`, `is provided, characters from`, cli_help_shower_1.Style.Arg `b.ttf`, `will be preferred; otherwise, characters from`, cli_help_shower_1.Style.Arg `a.ttf`, `will be preferred.`);
     }
 };
 //# sourceMappingURL=merge.js.map

package/lib/syntax/actions/save.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.saveFontToFile = exports.SaveSyntax = void 0;
+exports.SaveSyntax = void 0;
+exports.saveFontToFile = saveFontToFile;
 const Fs = require("fs");
 const Path = require("path");
 const cli_help_shower_1 = require("@ot-builder/cli-help-shower");
@@ -33,5 +34,4 @@ async function saveFontToFile(path, font, cfg) {
     const buf1 = ot_builder_1.FontIo.writeSfntOtf(ot_builder_1.FontIo.writeFont(font, cfg));
     await Fs.promises.writeFile(Path.resolve(path), buf1);
 }
-exports.saveFontToFile = saveFontToFile;
 //# sourceMappingURL=save.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ot-builder-cli",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "bin": {
     "otb-cli": "./bin/otb-cli"
   },
@@ -26,14 +26,13 @@
     "access": "public"
   },
   "dependencies": {
-    "tslib": "^2.0.0",
-    "chalk": "^4.1.1",
-    "ot-builder": "1.7.3",
-    "@ot-builder/cli-help-shower": "1.7.3",
-    "@ot-builder/cli-shared": "1.7.3"
+    "tslib": "^2.6.3",
+    "ot-builder": "1.7.4",
+    "@ot-builder/cli-help-shower": "1.7.4",
+    "@ot-builder/cli-shared": "1.7.4"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.5",
-    "jest": "^29.6.2"
+    "@types/jest": "^29.5.12",
+    "jest": "^29.7.0"
   }
 }