ot-builder-cli 1.7.4 → 1.7.6

package/lib/create-grammar.d.ts

@@ -1,3 +1,3 @@
 import { Grammar } from "./command";
-export declare function createGrammar(): Grammar;
+export declare function createGrammar(): Promise<Grammar>;
 //# sourceMappingURL=create-grammar.d.ts.map

package/lib/create-grammar.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGrammar = createGrammar;
+const package_version_1 = require("./package-version");
 const consolidate_1 = require("./syntax/actions/consolidate");
 const drop_1 = require("./syntax/actions/drop");
 const gc_1 = require("./syntax/actions/gc");
@@ -28,7 +29,7 @@ const cliActionJoiner = {
     }
 };
 // Grammar Creator
-function createGrammar() {
+async function createGrammar() {
     const element = new alternate_1.AlternateSyntax([
         intro_1.IntroSyntax,
         save_1.SaveSyntax,
@@ -43,7 +44,8 @@ function createGrammar() {
         set_optimize_level_1.SetOptimizationLevelSyntax,
         set_recalc_os2_avg_char_width_1.SetRecalcOs2AvgCharWidthSyntax
     ]);
-    const start = new start_1.StartSyntax(new alternate_1.AlternateSyntax([
+    const appVersion = await (0, package_version_1.getPackageVersion)();
+    const start = new start_1.StartSyntax(appVersion, new alternate_1.AlternateSyntax([
         help_1.HelpSyntax,
         version_1.VersionSyntax,
         new main_command_1.MainCommandSyntax(new possessive_repeat_1.PossessiveRepeatSyntax(cliActionJoiner, element))

package/lib/index.js

@@ -6,7 +6,7 @@ const create_grammar_1 = require("./create-grammar");
 const state_1 = require("./state");
 async function cliMain(argv) {
     const parse = (0, argv_parser_1.StartParseArgv)(argv, 2);
-    const syntax = (0, create_grammar_1.createGrammar)();
+    const syntax = await (0, create_grammar_1.createGrammar)();
     const prAction = syntax.start.handle(parse, syntax);
     if (!prAction.progress.isEof()) {
         console.error("! Unrecognizable argument/option. Stop.");

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/lib/sub-parsers/unicode-ranges/generated.js

@@ -1,36 +1,36 @@
 "use strict";
 /* AutoGenerated Code, changes may be overwritten
-* INPUT GRAMMAR:
-* ---
-* import { RangeDecl } from "./datatypes";
-* ---
-* start       := __ rgs=Ranges __
-*                 .ranges = RangeDecl[] { return this.rgs.ranges }
-* Ranges      := car=Range Separator cdr=Ranges
-*                 .ranges = RangeDecl[] { return [this.car.codeRange, ...this.cdr.ranges] }
-*              | range=Range
-*                 .ranges = RangeDecl[] { return [this.range.codeRange] }
-* Range       := _ exclude='-'? _ start=CodePoint _ '..' _ end=CodePoint _
-*                 .codeRange = RangeDecl {
-*                     return {
-*                         isExclusion: !!this.exclude,
-*                         start: this.start.value,
-*                         end:this.end.value
-*                     }
-*                 }
-*              | _ exclude='-'? _ at=CodePoint _
-*                 .codeRange = RangeDecl {
-*                     return { isExclusion: !!this.exclude, start: this.at.value, end:this.at.value }
-*                 }
-* CodePoint   := Prefix? literal='[0-9A-Fa-f]+'
-*                 .value = number { return parseInt(this.literal, 16) }
-* Prefix      := 'U\+' | '0x' | '0X'
-* Separator   := _ '[,;]' __
-*              | ___
-* _           := '[ \t]*'
-* __          := '(?:[ \t]|(?:#[^\r\n]*)?[\r\n])*'
-* ___         := _ '(?:#[^\r\n]*)?[\r\n]' __
-*/
+ * INPUT GRAMMAR:
+ * ---
+ * import { RangeDecl } from "./datatypes";
+ * ---
+ * start       := __ rgs=Ranges __
+ *                 .ranges = RangeDecl[] { return this.rgs.ranges }
+ * Ranges      := car=Range Separator cdr=Ranges
+ *                 .ranges = RangeDecl[] { return [this.car.codeRange, ...this.cdr.ranges] }
+ *              | range=Range
+ *                 .ranges = RangeDecl[] { return [this.range.codeRange] }
+ * Range       := _ exclude='-'? _ start=CodePoint _ '..' _ end=CodePoint _
+ *                 .codeRange = RangeDecl {
+ *                     return {
+ *                         isExclusion: !!this.exclude,
+ *                         start: this.start.value,
+ *                         end:this.end.value
+ *                     }
+ *                 }
+ *              | _ exclude='-'? _ at=CodePoint _
+ *                 .codeRange = RangeDecl {
+ *                     return { isExclusion: !!this.exclude, start: this.at.value, end:this.at.value }
+ *                 }
+ * CodePoint   := Prefix? literal='[0-9A-Fa-f]+'
+ *                 .value = number { return parseInt(this.literal, 16) }
+ * Prefix      := 'U\+' | '0x' | '0X'
+ * Separator   := _ '[,;]' __
+ *              | ___
+ * _           := '[ \t]*'
+ * __          := '(?:[ \t]|(?:#[^\r\n]*)?[\r\n])*'
+ * ___         := _ '(?:#[^\r\n]*)?[\r\n]' __
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
@@ -157,10 +157,10 @@ class Parser {
             return this.run($$dpth, () => {
                 let $scope$rgs;
                 let $$res = null;
-                if (true
-                    && this.match__($$dpth + 1, $$cr) !== null
-                    && ($scope$rgs = this.matchRanges($$dpth + 1, $$cr)) !== null
-                    && this.match__($$dpth + 1, $$cr) !== null) {
+                if (true &&
+                    this.match__($$dpth + 1, $$cr) !== null &&
+                    ($scope$rgs = this.matchRanges($$dpth + 1, $$cr)) !== null &&
+                    this.match__($$dpth + 1, $$cr) !== null) {
                     $$res = new start($scope$rgs);
                 }
                 return $$res;
@@ -171,7 +171,7 @@ class Parser {
         return this.memoise(() => {
             return this.choice([
                 () => this.matchRanges_1($$dpth + 1, $$cr),
-                () => this.matchRanges_2($$dpth + 1, $$cr),
+                () => this.matchRanges_2($$dpth + 1, $$cr)
             ]);
         }, this.$scope$Ranges$memo);
     }
@@ -180,10 +180,10 @@ class Parser {
             let $scope$car;
             let $scope$cdr;
             let $$res = null;
-            if (true
-                && ($scope$car = this.matchRange($$dpth + 1, $$cr)) !== null
-                && this.matchSeparator($$dpth + 1, $$cr) !== null
-                && ($scope$cdr = this.matchRanges($$dpth + 1, $$cr)) !== null) {
+            if (true &&
+                ($scope$car = this.matchRange($$dpth + 1, $$cr)) !== null &&
+                this.matchSeparator($$dpth + 1, $$cr) !== null &&
+                ($scope$cdr = this.matchRanges($$dpth + 1, $$cr)) !== null) {
                 $$res = new Ranges_1($scope$car, $scope$cdr);
             }
             return $$res;
@@ -193,8 +193,7 @@ class Parser {
         return this.run($$dpth, () => {
             let $scope$range;
             let $$res = null;
-            if (true
-                && ($scope$range = this.matchRange($$dpth + 1, $$cr)) !== null) {
+            if (true && ($scope$range = this.matchRange($$dpth + 1, $$cr)) !== null) {
                 $$res = new Ranges_2($scope$range);
             }
             return $$res;
@@ -204,7 +203,7 @@ class Parser {
         return this.memoise(() => {
             return this.choice([
                 () => this.matchRange_1($$dpth + 1, $$cr),
-                () => this.matchRange_2($$dpth + 1, $$cr),
+                () => this.matchRange_2($$dpth + 1, $$cr)
             ]);
         }, this.$scope$Range$memo);
     }
@@ -214,16 +213,17 @@ class Parser {
             let $scope$start;
             let $scope$end;
             let $$res = null;
-            if (true
-                && this.match_($$dpth + 1, $$cr) !== null
-                && (($scope$exclude = this.regexAccept(String.raw `(?:-)`, $$dpth + 1, $$cr)) || true)
-                && this.match_($$dpth + 1, $$cr) !== null
-                && ($scope$start = this.matchCodePoint($$dpth + 1, $$cr)) !== null
-                && this.match_($$dpth + 1, $$cr) !== null
-                && this.regexAccept(String.raw `(?:..)`, $$dpth + 1, $$cr) !== null
-                && this.match_($$dpth + 1, $$cr) !== null
-                && ($scope$end = this.matchCodePoint($$dpth + 1, $$cr)) !== null
-                && this.match_($$dpth + 1, $$cr) !== null) {
+            if (true &&
+                this.match_($$dpth + 1, $$cr) !== null &&
+                (($scope$exclude = this.regexAccept(String.raw `(?:-)`, $$dpth + 1, $$cr)) ||
+                    true) &&
+                this.match_($$dpth + 1, $$cr) !== null &&
+                ($scope$start = this.matchCodePoint($$dpth + 1, $$cr)) !== null &&
+                this.match_($$dpth + 1, $$cr) !== null &&
+                this.regexAccept(String.raw `(?:..)`, $$dpth + 1, $$cr) !== null &&
+                this.match_($$dpth + 1, $$cr) !== null &&
+                ($scope$end = this.matchCodePoint($$dpth + 1, $$cr)) !== null &&
+                this.match_($$dpth + 1, $$cr) !== null) {
                 $$res = new Range_1($scope$exclude, $scope$start, $scope$end);
             }
             return $$res;
@@ -234,12 +234,13 @@ class Parser {
             let $scope$exclude;
             let $scope$at;
             let $$res = null;
-            if (true
-                && this.match_($$dpth + 1, $$cr) !== null
-                && (($scope$exclude = this.regexAccept(String.raw `(?:-)`, $$dpth + 1, $$cr)) || true)
-                && this.match_($$dpth + 1, $$cr) !== null
-                && ($scope$at = this.matchCodePoint($$dpth + 1, $$cr)) !== null
-                && this.match_($$dpth + 1, $$cr) !== null) {
+            if (true &&
+                this.match_($$dpth + 1, $$cr) !== null &&
+                (($scope$exclude = this.regexAccept(String.raw `(?:-)`, $$dpth + 1, $$cr)) ||
+                    true) &&
+                this.match_($$dpth + 1, $$cr) !== null &&
+                ($scope$at = this.matchCodePoint($$dpth + 1, $$cr)) !== null &&
+                this.match_($$dpth + 1, $$cr) !== null) {
                 $$res = new Range_2($scope$exclude, $scope$at);
             }
             return $$res;
@@ -250,9 +251,9 @@ class Parser {
             return this.run($$dpth, () => {
                 let $scope$literal;
                 let $$res = null;
-                if (true
-                    && ((this.matchPrefix($$dpth + 1, $$cr)) || true)
-                    && ($scope$literal = this.regexAccept(String.raw `(?:[0-9A-Fa-f]+)`, $$dpth + 1, $$cr)) !== null) {
+                if (true &&
+                    (this.matchPrefix($$dpth + 1, $$cr) || true) &&
+                    ($scope$literal = this.regexAccept(String.raw `(?:[0-9A-Fa-f]+)`, $$dpth + 1, $$cr)) !== null) {
                     $$res = new CodePoint($scope$literal);
                 }
                 return $$res;
@@ -264,7 +265,7 @@ class Parser {
             return this.choice([
                 () => this.matchPrefix_1($$dpth + 1, $$cr),
                 () => this.matchPrefix_2($$dpth + 1, $$cr),
-                () => this.matchPrefix_3($$dpth + 1, $$cr),
+                () => this.matchPrefix_3($$dpth + 1, $$cr)
             ]);
         }, this.$scope$Prefix$memo);
     }
@@ -281,18 +282,18 @@ class Parser {
         return this.memoise(() => {
             return this.choice([
                 () => this.matchSeparator_1($$dpth + 1, $$cr),
-                () => this.matchSeparator_2($$dpth + 1, $$cr),
+                () => this.matchSeparator_2($$dpth + 1, $$cr)
             ]);
         }, this.$scope$Separator$memo);
     }
     matchSeparator_1($$dpth, $$cr) {
         return this.run($$dpth, () => {
             let $$res = null;
-            if (true
-                && this.match_($$dpth + 1, $$cr) !== null
-                && this.regexAccept(String.raw `(?:[,;])`, $$dpth + 1, $$cr) !== null
-                && this.match__($$dpth + 1, $$cr) !== null) {
-                $$res = { kind: ASTKinds.Separator_1, };
+            if (true &&
+                this.match_($$dpth + 1, $$cr) !== null &&
+                this.regexAccept(String.raw `(?:[,;])`, $$dpth + 1, $$cr) !== null &&
+                this.match__($$dpth + 1, $$cr) !== null) {
+                $$res = { kind: ASTKinds.Separator_1 };
             }
             return $$res;
         });
@@ -314,11 +315,12 @@ class Parser {
         return this.memoise(() => {
             return this.run($$dpth, () => {
                 let $$res = null;
-                if (true
-                    && this.match_($$dpth + 1, $$cr) !== null
-                    && this.regexAccept(String.raw `(?:(?:#[^\r\n]*)?[\r\n])`, $$dpth + 1, $$cr) !== null
-                    && this.match__($$dpth + 1, $$cr) !== null) {
-                    $$res = { kind: ASTKinds.___, };
+                if (true &&
+                    this.match_($$dpth + 1, $$cr) !== null &&
+                    this.regexAccept(String.raw `(?:(?:#[^\r\n]*)?[\r\n])`, $$dpth + 1, $$cr) !==
+                        null &&
+                    this.match__($$dpth + 1, $$cr) !== null) {
+                    $$res = { kind: ASTKinds.___ };
                 }
                 return $$res;
             });
@@ -391,7 +393,7 @@ class Parser {
                     // We substring from 3 to len - 1 to strip off the
                     // non-capture group syntax added as a WebKit workaround
                     literal: match.substring(3, match.length - 1),
-                    negated: this.negating,
+                    negated: this.negating
                 });
             }
             return res;
@@ -411,7 +413,7 @@ class Parser {
             this.pos = {
                 overallPos: reg.lastIndex,
                 line: this.pos.line + lineJmp,
-                offset: lind === -1 ? this.pos.offset + res[0].length : (res[0].length - lind - 1)
+                offset: lind === -1 ? this.pos.offset + res[0].length : res[0].length - lind - 1
             };
             return res[0];
         }
@@ -456,7 +458,7 @@ class SyntaxErr {
         this.expmatches = [...expmatches];
     }
     toString() {
-        return `Syntax Error at line ${this.pos.line}:${this.pos.offset}. Expected one of ${this.expmatches.map(x => x.kind === "EOF" ? " EOF" : ` ${x.negated ? 'not ' : ''}'${x.literal}'`)}`;
+        return `Syntax Error at line ${this.pos.line}:${this.pos.offset}. Expected one of ${this.expmatches.map(x => (x.kind === "EOF" ? " EOF" : ` ${x.negated ? "not " : ""}'${x.literal}'`))}`;
     }
 }
 exports.SyntaxErr = SyntaxErr;

package/lib/syntax/composite/start.d.ts

@@ -2,8 +2,9 @@ import { CliHelpShower } from "@ot-builder/cli-help-shower";
 import { ParseState } from "../../argv-parser";
 import { Grammar, Syntax } from "../../command";
 export declare class StartSyntax<T> implements Syntax<T> {
+    private readonly appVersion;
     private readonly body;
-    constructor(body: Syntax<T>);
+    constructor(appVersion: string, body: Syntax<T>);
     handle(st0: ParseState, grammar: Grammar): import("../../argv-parser").ParseResult<T>;
     displayHelp(shower: CliHelpShower): void;
 }

package/lib/syntax/composite/start.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartSyntax = void 0;
 const cli_help_shower_1 = require("@ot-builder/cli-help-shower");
-const package_version_1 = require("../../package-version");
 class StartSyntax {
-    constructor(body) {
+    constructor(appVersion, body) {
+        this.appVersion = appVersion;
         this.body = body;
     }
     handle(st0, grammar) {
@@ -13,7 +13,7 @@ class StartSyntax {
     displayHelp(shower) {
         shower
             .message()
-            .message('ot-builder CLI utility program "otb-cli",', "version", package_version_1.packageVersion)
+            .message('ot-builder CLI utility program "otb-cli",', "version", this.appVersion)
             .message(cli_help_shower_1.Style.Rule)
             .message(`Usage :`);
         this.body.displayHelp(shower);

package/lib/syntax/document/version.js

@@ -9,7 +9,7 @@ exports.VersionSyntax = {
         if (!st.isOption("--version", "-v"))
             return (0, argv_parser_1.ParseResult)(st, null);
         return (0, argv_parser_1.ParseResult)(st.next(), async (state) => {
-            console.log(package_version_1.packageVersion);
+            console.log(await (0, package_version_1.getPackageVersion)());
         });
     },
     displayHelp(shower) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ot-builder-cli",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "bin": {
     "otb-cli": "./bin/otb-cli"
   },
@@ -26,13 +26,13 @@
     "access": "public"
   },
   "dependencies": {
-    "tslib": "^2.6.3",
-    "ot-builder": "1.7.4",
-    "@ot-builder/cli-help-shower": "1.7.4",
-    "@ot-builder/cli-shared": "1.7.4"
+    "tslib": "^2.8.1",
+    "ot-builder": "1.7.6",
+    "@ot-builder/cli-help-shower": "1.7.5",
+    "@ot-builder/cli-shared": "1.7.6"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
     "jest": "^29.7.0"
   }
 }