node-llama-cpp 3.1.1 → 3.3.0

package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.js

@@ -1,4 +1,5 @@
-export async function findCharacterRemovalCountToFitChatHistoryInContext({ compressChatHistory, chatHistory, tokensCountToFit, tokenizer, chatWrapper, initialCharactersRemovalCount = 0, estimatedCharactersPerToken = 5, maxDecompressionAttempts = 2 }) {
+const maxSequentialUnhelpfulIterations = 100;
+export async function findCharacterRemovalCountToFitChatHistoryInContext({ compressChatHistory, chatHistory, tokensCountToFit, tokenizer, chatWrapper, initialCharactersRemovalCount = 0, estimatedCharactersPerToken = 5, maxDecompressionAttempts = 2, failedCompressionErrorMessage = "Failed to compress chat history. Consider increasing the context size." }) {
     let currentEstimatedCharactersPerToken = estimatedCharactersPerToken;
     function getTokensCountForChatHistory(chatHistory) {
         const { contextText } = chatWrapper.generateContextState({ chatHistory });
@@ -24,6 +25,8 @@ export async function findCharacterRemovalCountToFitChatHistoryInContext({ compr
     }
     let latestCompressionAttempt = await getResultForCharacterRemovalCount(initialCharactersRemovalCount);
     const firstCompressionAttempt = latestCompressionAttempt;
+    let latestCompressionAttemptTokensCount = latestCompressionAttempt.tokensCount;
+    let sameTokensCountRepetitions = 0;
     if (latestCompressionAttempt.tokensCount === tokensCountToFit ||
         (latestCompressionAttempt.tokensCount < tokensCountToFit && latestCompressionAttempt.characterRemovalCount === 0))
         return {
@@ -63,6 +66,16 @@ export async function findCharacterRemovalCountToFitChatHistoryInContext({ compr
             latestCompressionAttempt.tokensCount <= tokensCountToFit &&
             latestCompressionAttempt.characterRemovalCount < bestCompressionAttempt.characterRemovalCount))
             bestCompressionAttempt = latestCompressionAttempt;
+        if (latestCompressionAttempt.tokensCount === latestCompressionAttemptTokensCount)
+            sameTokensCountRepetitions++;
+        else {
+            latestCompressionAttemptTokensCount = latestCompressionAttempt.tokensCount;
+            sameTokensCountRepetitions = 0;
+        }
+        if (decompressionAttempts === 0 &&
+            compressionAttempts >= maxSequentialUnhelpfulIterations &&
+            sameTokensCountRepetitions >= maxSequentialUnhelpfulIterations)
+            throw new Error(failedCompressionErrorMessage);
     }
     return {
         removedCharactersCount: bestCompressionAttempt.characterRemovalCount,

package/dist/utils/findCharacterRemovalCountToFitChatHistoryInContext.js.map

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

package/dist/utils/gbnfJson/GbnfGrammarGenerator.d.ts

@@ -1,6 +1,11 @@
 export declare class GbnfGrammarGenerator {
     rules: Map<string, string | null>;
+    ruleContentToRuleName: Map<string, string>;
+    literalValueRuleNames: Map<string | number, string>;
     private ruleId;
+    private valueRuleId;
     generateRuleName(): string;
+    generateRuleNameForLiteralValue(value: string | number): string;
     generateGbnfFile(rootGrammar: string): string;
+    getProposedLiteralValueRuleNameLength(): number;
 }

package/dist/utils/gbnfJson/GbnfGrammarGenerator.js

@@ -1,11 +1,23 @@
 export class GbnfGrammarGenerator {
     rules = new Map();
+    ruleContentToRuleName = new Map();
+    literalValueRuleNames = new Map();
     ruleId = 0;
+    valueRuleId = 0;
     generateRuleName() {
         const ruleId = this.ruleId;
         this.ruleId++;
         return `rule${ruleId}`;
     }
+    generateRuleNameForLiteralValue(value) {
+        const existingRuleName = this.literalValueRuleNames.get(value);
+        if (existingRuleName != null)
+            return existingRuleName;
+        const ruleName = `val${this.valueRuleId}`;
+        this.valueRuleId++;
+        this.literalValueRuleNames.set(value, ruleName);
+        return ruleName;
+    }
     generateGbnfFile(rootGrammar) {
         const rules = [{
                 name: "root",
@@ -23,5 +35,8 @@ export class GbnfGrammarGenerator {
         const gbnf = ruleStrings.join("\n");
         return gbnf;
     }
+    getProposedLiteralValueRuleNameLength() {
+        return `val${this.valueRuleId}`.length;
+    }
 }
 //# sourceMappingURL=GbnfGrammarGenerator.js.map

package/dist/utils/gbnfJson/GbnfGrammarGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfGrammarGenerator.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfGrammarGenerator.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAoB;IACtB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IACxC,MAAM,GAAW,CAAC,CAAC;IAEpB,gBAAgB;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,OAAO,OAAO,MAAM,EAAE,CAAC;IAC3B,CAAC;IAEM,gBAAgB,CAAC,WAAmB;QACvC,MAAM,KAAK,GAAsC,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,WAAW;aACvB,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAI,OAAO,IAAI,IAAI;gBACf,SAAS;YAEb,KAAK,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,QAAQ;gBACd,OAAO;aACV,CAAC,CAAC;QACP,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
+{"version":3,"file":"GbnfGrammarGenerator.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfGrammarGenerator.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,oBAAoB;IACtB,KAAK,GAAG,IAAI,GAAG,EAAyB,CAAC;IACzC,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAC;IAClD,qBAAqB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAC1D,MAAM,GAAW,CAAC,CAAC;IACnB,WAAW,GAAW,CAAC,CAAC;IAEzB,gBAAgB;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,EAAE,CAAC;QAEd,OAAO,OAAO,MAAM,EAAE,CAAC;IAC3B,CAAC;IAEM,+BAA+B,CAAC,KAAsB;QACzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC/D,IAAI,gBAAgB,IAAI,IAAI;YACxB,OAAO,gBAAgB,CAAC;QAE5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAEhD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEM,gBAAgB,CAAC,WAAmB;QACvC,MAAM,KAAK,GAAsC,CAAC;gBAC9C,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,WAAW;aACvB,CAAC,CAAC;QAEH,KAAK,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAI,OAAO,IAAI,IAAI;gBACf,SAAS;YAEb,KAAK,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,QAAQ;gBACd,OAAO;aACV,CAAC,CAAC;QACP,CAAC;QAED,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,GAAG,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEpC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,qCAAqC;QACxC,OAAO,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;IAC3C,CAAC;CACJ"}

package/dist/utils/gbnfJson/GbnfTerminal.d.ts

@@ -1,7 +1,10 @@
 import { GbnfGrammarGenerator } from "./GbnfGrammarGenerator.js";
 export declare abstract class GbnfTerminal {
     private _ruleName;
+    /** To be used only by `getRuleName` */
+    protected generateRuleName(grammarGenerator: GbnfGrammarGenerator): string;
     protected getRuleName(grammarGenerator: GbnfGrammarGenerator): string;
     abstract getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
+    protected getGrammarFromResolve(grammarGenerator: GbnfGrammarGenerator): string;
     resolve(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/GbnfTerminal.js

@@ -1,16 +1,38 @@
 export class GbnfTerminal {
     _ruleName = null;
+    /** To be used only by `getRuleName` */
+    generateRuleName(grammarGenerator) {
+        return grammarGenerator.generateRuleName();
+    }
     getRuleName(grammarGenerator) {
         if (this._ruleName != null)
             return this._ruleName;
-        const ruleName = grammarGenerator.generateRuleName();
+        const ruleName = this.generateRuleName(grammarGenerator);
         this._ruleName = ruleName;
         return ruleName;
     }
+    getGrammarFromResolve(grammarGenerator) {
+        return this.getGrammar(grammarGenerator);
+    }
     resolve(grammarGenerator) {
+        if (this._ruleName != null)
+            return this._ruleName;
+        const grammar = this.getGrammarFromResolve(grammarGenerator);
+        const existingRuleName = grammarGenerator.ruleContentToRuleName.get(grammar);
+        if (existingRuleName != null) {
+            this._ruleName = existingRuleName;
+            return existingRuleName;
+        }
         const ruleName = this.getRuleName(grammarGenerator);
-        if (!grammarGenerator.rules.has(ruleName))
-            grammarGenerator.rules.set(ruleName, this.getGrammar(grammarGenerator));
+        if (grammar === ruleName) {
+            this._ruleName = ruleName;
+            return ruleName;
+        }
+        if (!grammarGenerator.rules.has(ruleName)) {
+            grammarGenerator.rules.set(ruleName, grammar);
+            grammarGenerator.ruleContentToRuleName.set(grammar, ruleName);
+        }
+        this._ruleName = ruleName;
         return ruleName;
     }
 }

package/dist/utils/gbnfJson/GbnfTerminal.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfTerminal.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfTerminal.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,YAAY;IACtB,SAAS,GAAkB,IAAI,CAAC;IAE9B,WAAW,CAAC,gBAAsC;QACxD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO,IAAI,CAAC,SAAS,CAAC;QAE1B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE1B,OAAO,QAAQ,CAAC;IACpB,CAAC;IAIM,OAAO,CAAC,gBAAsC;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpD,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;YACrC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAE5E,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}
+{"version":3,"file":"GbnfTerminal.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/GbnfTerminal.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,YAAY;IACtB,SAAS,GAAkB,IAAI,CAAC;IAExC,uCAAuC;IAC7B,gBAAgB,CAAC,gBAAsC;QAC7D,OAAO,gBAAgB,CAAC,gBAAgB,EAAE,CAAC;IAC/C,CAAC;IAES,WAAW,CAAC,gBAAsC;QACxD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO,IAAI,CAAC,SAAS,CAAC;QAE1B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;QACzD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAE1B,OAAO,QAAQ,CAAC;IACpB,CAAC;IAIS,qBAAqB,CAAC,gBAAsC;QAClE,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAC7C,CAAC;IAEM,OAAO,CAAC,gBAAsC;QACjD,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YACtB,OAAO,IAAI,CAAC,SAAS,CAAC;QAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;QAE7D,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7E,IAAI,gBAAgB,IAAI,IAAI,EAAE,CAAC;YAC3B,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC;YAClC,OAAO,gBAAgB,CAAC;QAC5B,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpD,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC1B,OAAO,QAAQ,CAAC;QACpB,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9C,gBAAgB,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}

package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.d.ts

@@ -1,5 +1,5 @@
 import { GbnfJsonSchema } from "./types.js";
-export declare function getGbnfGrammarForGbnfJsonSchema(schema: GbnfJsonSchema, { allowNewLines, scopePadSpaces }?: {
+export declare function getGbnfGrammarForGbnfJsonSchema(schema: Readonly<GbnfJsonSchema>, { allowNewLines, scopePadSpaces }?: {
     allowNewLines?: boolean;
     scopePadSpaces?: number;
 }): string;

package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"getGbnfGrammarForGbnfJsonSchema.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oCAAoC,EAAC,MAAM,iDAAiD,CAAC;AACrG,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAGjE,MAAM,UAAU,+BAA+B,CAAC,MAAsB,EAAE,EACpE,aAAa,GAAG,IAAI,EACpB,cAAc,GAAG,CAAC,KAIlB,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC,EAAC,aAAa,EAAE,cAAc,EAAC,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,oCAAoC,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAChG,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAE9D,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,WAAW,GAAG,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;AAChG,CAAC"}
+{"version":3,"file":"getGbnfGrammarForGbnfJsonSchema.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oCAAoC,EAAC,MAAM,iDAAiD,CAAC;AACrG,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAGjE,MAAM,UAAU,+BAA+B,CAAC,MAAgC,EAAE,EAC9E,aAAa,GAAG,IAAI,EACpB,cAAc,GAAG,CAAC,KAIlB,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAI,oBAAoB,EAAE,CAAC;IACpD,MAAM,UAAU,GAAG,IAAI,kBAAkB,CAAC,EAAC,aAAa,EAAE,cAAc,EAAC,CAAC,CAAC;IAC3E,MAAM,YAAY,GAAG,oCAAoC,CAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,CAAC,CAAC;IAChG,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IAE9D,OAAO,gBAAgB,CAAC,gBAAgB,CAAC,WAAW,GAAG,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;AAChG,CAAC"}

package/dist/utils/gbnfJson/terminals/GbnfAnyJson.d.ts

@@ -0,0 +1,9 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
+import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
+export declare class GbnfAnyJson extends GbnfTerminal {
+    readonly scopeState: GbnfJsonScopeState;
+    constructor(scopeState?: GbnfJsonScopeState);
+    getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
+    protected getRuleName(): string;
+}

package/dist/utils/gbnfJson/terminals/GbnfAnyJson.js

@@ -0,0 +1,53 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
+import { GbnfString } from "./GbnfString.js";
+import { GbnfOr } from "./GbnfOr.js";
+import { GbnfNumber } from "./GbnfNumber.js";
+import { GbnfBoolean } from "./GbnfBoolean.js";
+import { GbnfNull } from "./GbnfNull.js";
+import { GbnfArray } from "./GbnfArray.js";
+import { reservedRuleNames } from "./gbnfConsts.js";
+import { GbnfObjectMap } from "./GbnfObjectMap.js";
+export class GbnfAnyJson extends GbnfTerminal {
+    scopeState;
+    constructor(scopeState = new GbnfJsonScopeState()) {
+        super();
+        this.scopeState = scopeState;
+    }
+    getGrammar(grammarGenerator) {
+        const subAnyJsonScopeItem = this.scopeState.settings.allowNewLines
+            ? new GbnfAnyJson(new GbnfJsonScopeState({
+                allowNewLines: false,
+                scopePadSpaces: this.scopeState.settings.scopePadSpaces
+            }, this.scopeState.currentNestingScope))
+            : new GbnfSubAnyJson(this.scopeState);
+        return new GbnfOr([
+            new GbnfString(),
+            new GbnfNumber({ allowFractional: true }),
+            new GbnfBoolean(),
+            new GbnfNull(),
+            new GbnfArray({
+                items: subAnyJsonScopeItem,
+                scopeState: this.scopeState
+            }),
+            new GbnfObjectMap({
+                fields: [],
+                additionalProperties: subAnyJsonScopeItem,
+                scopeState: this.scopeState
+            })
+        ]).getGrammar(grammarGenerator);
+    }
+    getRuleName() {
+        return reservedRuleNames.anyJson({
+            allowNewLines: this.scopeState.settings.allowNewLines,
+            scopeSpaces: this.scopeState.settings.scopePadSpaces,
+            nestingScope: this.scopeState.currentNestingScope
+        });
+    }
+}
+class GbnfSubAnyJson extends GbnfAnyJson {
+    getGrammar() {
+        return this.getRuleName();
+    }
+}
+//# sourceMappingURL=GbnfAnyJson.js.map

package/dist/utils/gbnfJson/terminals/GbnfAnyJson.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GbnfAnyJson.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfAnyJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAGjD,MAAM,OAAO,WAAY,SAAQ,YAAY;IACzB,UAAU,CAAqB;IAE/C,YAAmB,aAAiC,IAAI,kBAAkB,EAAE;QACxE,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa;YAC9D,CAAC,CAAC,IAAI,WAAW,CACb,IAAI,kBAAkB,CAAC;gBACnB,aAAa,EAAE,KAAK;gBACpB,cAAc,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc;aAC1D,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAC1C;YACD,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE1C,OAAO,IAAI,MAAM,CAAC;YACd,IAAI,UAAU,EAAE;YAChB,IAAI,UAAU,CAAC,EAAC,eAAe,EAAE,IAAI,EAAC,CAAC;YACvC,IAAI,WAAW,EAAE;YACjB,IAAI,QAAQ,EAAE;YACd,IAAI,SAAS,CAAC;gBACV,KAAK,EAAE,mBAAmB;gBAC1B,UAAU,EAAE,IAAI,CAAC,UAAU;aAC9B,CAAC;YACF,IAAI,aAAa,CAAC;gBACd,MAAM,EAAE,EAAE;gBACV,oBAAoB,EAAE,mBAAmB;gBACzC,UAAU,EAAE,IAAI,CAAC,UAAU;aAC9B,CAAC;SACL,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,OAAO,CAAC;YAC7B,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa;YACrD,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc;YACpD,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;SACpD,CAAC,CAAC;IACP,CAAC;CACJ;AAED,MAAM,cAAe,SAAQ,WAAW;IACpB,UAAU;QACtB,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9B,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfArray.d.ts

@@ -2,8 +2,17 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
 import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
 export declare class GbnfArray extends GbnfTerminal {
-    readonly items: GbnfTerminal;
+    readonly items?: GbnfTerminal;
+    readonly prefixItems?: GbnfTerminal[];
+    readonly minItems: number;
+    readonly maxItems?: number;
     readonly scopeState: GbnfJsonScopeState;
-    constructor(items: GbnfTerminal, scopeState?: GbnfJsonScopeState);
+    constructor({ items, prefixItems, minItems, maxItems, scopeState }: {
+        items?: GbnfTerminal;
+        prefixItems?: GbnfTerminal[];
+        minItems?: number;
+        maxItems?: number;
+        scopeState: GbnfJsonScopeState;
+    });
     getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfArray.js

@@ -2,31 +2,80 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
 import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
 import { GbnfWhitespace } from "./GbnfWhitespace.js";
 import { GbnfGrammar } from "./GbnfGrammar.js";
-import { GbnfOr } from "./GbnfOr.js";
+import { GbnfRepetition } from "./GbnfRepetition.js";
+import { GbnfCommaWhitespace } from "./GbnfCommaWhitespace.js";
+import { GbnfAnyJson } from "./GbnfAnyJson.js";
 export class GbnfArray extends GbnfTerminal {
     items;
+    prefixItems;
+    minItems;
+    maxItems;
     scopeState;
-    constructor(items, scopeState = new GbnfJsonScopeState()) {
+    constructor({ items, prefixItems, minItems = 0, maxItems, scopeState = new GbnfJsonScopeState() }) {
         super();
         this.items = items;
+        this.prefixItems = prefixItems;
+        this.minItems = Math.floor(minItems);
+        this.maxItems = maxItems == null ? undefined : Math.floor(maxItems);
         this.scopeState = scopeState;
+        if (this.prefixItems != null && this.minItems < this.prefixItems.length)
+            this.minItems = this.prefixItems.length;
+        else if (this.minItems < 0)
+            this.minItems = 0;
+        if (this.maxItems != null && this.maxItems < this.minItems)
+            this.maxItems = this.minItems;
+        else if (this.maxItems != null && this.maxItems < 0)
+            this.maxItems = 0;
     }
     getGrammar(grammarGenerator) {
-        const getWhitespaceRuleName = (newScope, newLine) => (newScope
-            ? new GbnfWhitespace(this.scopeState.getForNewScope(), { newLine }).resolve(grammarGenerator)
-            : new GbnfWhitespace(this.scopeState, { newLine }).resolve(grammarGenerator));
-        const itemsGrammarRuleName = this.items.resolve(grammarGenerator);
+        const getWhitespaceRule = (newScope, newLine) => (newScope
+            ? new GbnfWhitespace(this.scopeState.getForNewScope(), { newLine })
+            : new GbnfWhitespace(this.scopeState, { newLine }));
+        const getWhitespaceRuleName = (newScope, newLine) => (getWhitespaceRule(newScope, newLine).resolve(grammarGenerator));
+        const getCommaWhitespaceRule = (newScope, newLine) => (newScope
+            ? new GbnfCommaWhitespace(this.scopeState.getForNewScope(), { newLine })
+            : new GbnfCommaWhitespace(this.scopeState, { newLine }));
+        const getCommaWhitespaceRuleName = (newScope, newLine) => (getCommaWhitespaceRule(newScope, newLine).resolve(grammarGenerator));
+        const arrayItemsGrammar = [];
+        if (this.prefixItems != null && this.prefixItems.length > 0) {
+            for (const item of this.prefixItems) {
+                if (arrayItemsGrammar.length > 0)
+                    arrayItemsGrammar.push(getCommaWhitespaceRuleName(true, "before"));
+                arrayItemsGrammar.push(item.resolve(grammarGenerator));
+            }
+            if (this.minItems > this.prefixItems.length || this.maxItems == null || this.maxItems > this.prefixItems.length) {
+                const restMinRepetitions = this.minItems - this.prefixItems.length;
+                const restMaxRepetitions = this.maxItems == null
+                    ? undefined
+                    : this.maxItems - this.prefixItems.length;
+                if (arrayItemsGrammar.length > 0)
+                    arrayItemsGrammar.push(new GbnfRepetition({
+                        value: new GbnfGrammar([
+                            getCommaWhitespaceRuleName(true, "before"),
+                            (this.items ?? new GbnfAnyJson()).resolve(grammarGenerator)
+                        ], true),
+                        minRepetitions: restMinRepetitions,
+                        maxRepetitions: restMaxRepetitions
+                    }).getGrammar(grammarGenerator));
+                else
+                    arrayItemsGrammar.push(new GbnfRepetition({
+                        value: this.items ?? new GbnfAnyJson(),
+                        separator: getCommaWhitespaceRule(true, "before"),
+                        minRepetitions: restMinRepetitions,
+                        maxRepetitions: restMaxRepetitions
+                    }).getGrammar(grammarGenerator));
+            }
+        }
+        else
+            arrayItemsGrammar.push(new GbnfRepetition({
+                value: this.items ?? new GbnfAnyJson(),
+                separator: getCommaWhitespaceRule(true, "before"),
+                minRepetitions: this.minItems,
+                maxRepetitions: this.maxItems
+            }).getGrammar(grammarGenerator));
         return new GbnfGrammar([
             '"["', getWhitespaceRuleName(true, "before"),
-            new GbnfOr([
-                new GbnfGrammar([
-                    "(", itemsGrammarRuleName, ")",
-                    "(", '","', getWhitespaceRuleName(true, "before"), itemsGrammarRuleName, ")*"
-                ]),
-                new GbnfGrammar([
-                    "(", itemsGrammarRuleName, ")?"
-                ])
-            ]).getGrammar(grammarGenerator),
+            new GbnfGrammar(arrayItemsGrammar).getGrammar(),
             getWhitespaceRuleName(false, "before"), '"]"'
         ]).getGrammar();
     }

package/dist/utils/gbnfJson/terminals/GbnfArray.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfArray.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfArray.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,OAAO,SAAU,SAAQ,YAAY;IACvB,KAAK,CAAe;IACpB,UAAU,CAAqB;IAE/C,YAAmB,KAAmB,EAAE,aAAiC,IAAI,kBAAkB,EAAE;QAC7F,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,qBAAqB,GAAG,CAAC,QAAiB,EAAE,OAAmC,EAAE,EAAE,CAAC,CACtF,QAAQ;YACJ,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC3F,CAAC,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,OAAO,EAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CACjF,CAAC;QACF,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAElE,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC;YAC5C,IAAI,MAAM,CAAC;gBACP,IAAI,WAAW,CAAC;oBACZ,GAAG,EAAE,oBAAoB,EAAE,GAAG;oBAC9B,GAAG,EAAE,KAAK,EAAE,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,oBAAoB,EAAE,IAAI;iBAChF,CAAC;gBACF,IAAI,WAAW,CAAC;oBACZ,GAAG,EAAE,oBAAoB,EAAE,IAAI;iBAClC,CAAC;aACL,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAC/B,qBAAqB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,KAAK;SAChD,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ"}
+{"version":3,"file":"GbnfArray.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfArray.ts"],"names":[],"mappings":"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"}

package/dist/utils/gbnfJson/terminals/GbnfBoolean.d.ts

@@ -1,6 +1,7 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
-import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfBoolean extends GbnfTerminal {
-    getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
+    getGrammar(): string;
+    protected getGrammarFromResolve(): string;
+    private _getGrammar;
     protected getRuleName(): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfBoolean.js

@@ -1,13 +1,19 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
-import { GbnfOr } from "./GbnfOr.js";
-import { GbnfGrammar } from "./GbnfGrammar.js";
 import { reservedRuleNames } from "./gbnfConsts.js";
 export class GbnfBoolean extends GbnfTerminal {
-    getGrammar(grammarGenerator) {
-        return new GbnfOr([
-            new GbnfGrammar('"true"'),
-            new GbnfGrammar('"false"')
-        ]).getGrammar(grammarGenerator);
+    getGrammar() {
+        return this._getGrammar();
+    }
+    getGrammarFromResolve() {
+        return this._getGrammar(false);
+    }
+    _getGrammar(wrap = true) {
+        const values = ['"true"', '"false"'];
+        if (wrap)
+            return [
+                "(", values.join(" | "), ")"
+            ].join(" ");
+        return values.join(" | ");
     }
     getRuleName() {
         return reservedRuleNames.boolean;

package/dist/utils/gbnfJson/terminals/GbnfBoolean.js.map

@@ -1 +1 @@
-{"version":3,"file":"GbnfBoolean.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfBoolean.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,WAAY,SAAQ,YAAY;IAClC,UAAU,CAAC,gBAAsC;QACpD,OAAO,IAAI,MAAM,CAAC;YACd,IAAI,WAAW,CAAC,QAAQ,CAAC;YACzB,IAAI,WAAW,CAAC,SAAS,CAAC;SAC7B,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,OAAO,CAAC;IACrC,CAAC;CACJ"}
+{"version":3,"file":"GbnfBoolean.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfBoolean.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,WAAY,SAAQ,YAAY;IAClC,UAAU;QACb,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC9B,CAAC;IAEkB,qBAAqB;QACpC,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAEO,WAAW,CAAC,OAAgB,IAAI;QACpC,MAAM,MAAM,GAAa,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAE/C,IAAI,IAAI;YACJ,OAAO;gBACH,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG;aAC/B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEhB,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,OAAO,CAAC;IACrC,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.d.ts

@@ -0,0 +1,11 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfJsonScopeState } from "../utils/GbnfJsonScopeState.js";
+export declare class GbnfCommaWhitespace extends GbnfTerminal {
+    readonly scopeState: GbnfJsonScopeState;
+    readonly newLine: "before" | "after" | false;
+    constructor(scopeState: GbnfJsonScopeState, { newLine }?: {
+        newLine?: "before" | "after" | false;
+    });
+    getGrammar(): string;
+    protected getRuleName(): string;
+}

package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.js

@@ -0,0 +1,28 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammar } from "./GbnfGrammar.js";
+import { GbnfWhitespace } from "./GbnfWhitespace.js";
+import { reservedRuleNames } from "./gbnfConsts.js";
+export class GbnfCommaWhitespace extends GbnfTerminal {
+    scopeState;
+    newLine;
+    constructor(scopeState, { newLine = "before" } = {}) {
+        super();
+        this.scopeState = scopeState;
+        this.newLine = newLine;
+    }
+    getGrammar() {
+        return new GbnfGrammar([
+            '","', new GbnfWhitespace(this.scopeState, { newLine: this.newLine }).getGrammar()
+        ]).getGrammar();
+    }
+    getRuleName() {
+        return reservedRuleNames.commaWhitespace({
+            newLine: this.scopeState.settings.allowNewLines
+                ? this.newLine
+                : false,
+            scopeSpaces: this.scopeState.settings.scopePadSpaces,
+            nestingScope: this.scopeState.currentNestingScope
+        });
+    }
+}
+//# sourceMappingURL=GbnfCommaWhitespace.js.map

package/dist/utils/gbnfJson/terminals/GbnfCommaWhitespace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GbnfCommaWhitespace.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfCommaWhitespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,mBAAoB,SAAQ,YAAY;IACjC,UAAU,CAAqB;IAC/B,OAAO,CAA6B;IAEpD,YAAmB,UAA8B,EAAE,EAC/C,OAAO,GAAG,QAAQ,KAGlB,EAAE;QACF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,WAAW,CAAC;YACnB,KAAK,EAAE,IAAI,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAC,CAAC,CAAC,UAAU,EAAE;SACnF,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,eAAe,CAAC;YACrC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa;gBAC3C,CAAC,CAAC,IAAI,CAAC,OAAO;gBACd,CAAC,CAAC,KAAK;YACX,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc;YACpD,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;SACpD,CAAC,CAAC;IACP,CAAC;CACJ"}

package/dist/utils/gbnfJson/terminals/GbnfFormatString.d.ts

@@ -0,0 +1,11 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
+import { GbnfJsonFormatStringSchema } from "../types.js";
+export declare class GbnfFormatString extends GbnfTerminal {
+    readonly format: GbnfJsonFormatStringSchema["format"];
+    constructor(format: GbnfJsonFormatStringSchema["format"]);
+    getGrammar(grammarGenerator: GbnfGrammarGenerator): string;
+    protected getRuleName(): string;
+    private _getDateGrammar;
+    private _getTimeGrammar;
+}

package/dist/utils/gbnfJson/terminals/GbnfFormatString.js

@@ -0,0 +1,90 @@
+import { GbnfTerminal } from "../GbnfTerminal.js";
+import { reservedRuleNames } from "./gbnfConsts.js";
+import { GbnfGrammar } from "./GbnfGrammar.js";
+import { GbnfString } from "./GbnfString.js";
+export class GbnfFormatString extends GbnfTerminal {
+    format;
+    constructor(format) {
+        super();
+        this.format = format;
+    }
+    getGrammar(grammarGenerator) {
+        const quote = '"\\""';
+        if (this.format === "date")
+            return new GbnfGrammar([
+                quote,
+                this._getDateGrammar(),
+                quote
+            ]).getGrammar();
+        else if (this.format === "time") {
+            return new GbnfGrammar([
+                quote,
+                this._getTimeGrammar(),
+                quote
+            ]).getGrammar();
+        }
+        else if (this.format === "date-time")
+            return new GbnfGrammar([
+                quote,
+                this._getDateGrammar(),
+                '"T"',
+                this._getTimeGrammar(),
+                quote
+            ]).getGrammar();
+        return new GbnfString({
+            minLength: 0,
+            maxLength: 0
+        }).resolve(grammarGenerator);
+    }
+    getRuleName() {
+        return reservedRuleNames.formatString(this.format);
+    }
+    _getDateGrammar() {
+        return new GbnfGrammar([
+            "[0-9]{4}",
+            '"-"',
+            or([
+                '"0" [1-9]',
+                '"1" [012]'
+            ]),
+            '"-"',
+            or([
+                '"0" [1-9]',
+                "[12] [0-9]",
+                '"3" [01]'
+            ])
+        ]).getGrammar();
+    }
+    _getTimeGrammar() {
+        return new GbnfGrammar([
+            or([
+                "[01] [0-9]",
+                '"2" [0-3]'
+            ]),
+            '":"',
+            "[0-5] [0-9]",
+            '":"',
+            "[0-5] [0-9]",
+            '( "." [0-9]{3} )?',
+            or([
+                '"Z"',
+                new GbnfGrammar([
+                    or([
+                        '"+"',
+                        '"-"'
+                    ]),
+                    or([
+                        "[01] [0-9]",
+                        '"2" [0-3]'
+                    ]),
+                    '":"',
+                    "[0-5] [0-9]"
+                ]).getGrammar()
+            ])
+        ]).getGrammar();
+    }
+}
+function or(values) {
+    return "(" + values.join(" | ") + ")";
+}
+//# sourceMappingURL=GbnfFormatString.js.map

package/dist/utils/gbnfJson/terminals/GbnfFormatString.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GbnfFormatString.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfFormatString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAG3C,MAAM,OAAO,gBAAiB,SAAQ,YAAY;IAC9B,MAAM,CAAuC;IAE7D,YAAmB,MAA4C;QAC3D,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,MAAM,KAAK,GAAG,OAAO,CAAC;QACtB,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM;YACtB,OAAO,IAAI,WAAW,CAAC;gBACnB,KAAK;gBACL,IAAI,CAAC,eAAe,EAAE;gBACtB,KAAK;aACR,CAAC,CAAC,UAAU,EAAE,CAAC;aACf,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC9B,OAAO,IAAI,WAAW,CAAC;gBACnB,KAAK;gBACL,IAAI,CAAC,eAAe,EAAE;gBACtB,KAAK;aACR,CAAC,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC;aAAM,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW;YAClC,OAAO,IAAI,WAAW,CAAC;gBACnB,KAAK;gBACL,IAAI,CAAC,eAAe,EAAE;gBACtB,KAAK;gBACL,IAAI,CAAC,eAAe,EAAE;gBACtB,KAAK;aACR,CAAC,CAAC,UAAU,EAAE,CAAC;QAEpB,OAAO,IAAI,UAAU,CAAC;YAClB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;SACf,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACjC,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvD,CAAC;IAEO,eAAe;QACnB,OAAO,IAAI,WAAW,CAAC;YACnB,UAAU;YACV,KAAK;YACL,EAAE,CAAC;gBACC,WAAW;gBACX,WAAW;aACd,CAAC;YACF,KAAK;YACL,EAAE,CAAC;gBACC,WAAW;gBACX,YAAY;gBACZ,UAAU;aACb,CAAC;SACL,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAEO,eAAe;QACnB,OAAO,IAAI,WAAW,CAAC;YACnB,EAAE,CAAC;gBACC,YAAY;gBACZ,WAAW;aACd,CAAC;YACF,KAAK;YACL,aAAa;YACb,KAAK;YACL,aAAa;YACb,mBAAmB;YACnB,EAAE,CAAC;gBACC,KAAK;gBACL,IAAI,WAAW,CAAC;oBACZ,EAAE,CAAC;wBACC,KAAK;wBACL,KAAK;qBACR,CAAC;oBACF,EAAE,CAAC;wBACC,YAAY;wBACZ,WAAW;qBACd,CAAC;oBACF,KAAK;oBACL,aAAa;iBAChB,CAAC,CAAC,UAAU,EAAE;aAClB,CAAC;SACL,CAAC,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;CACJ;AAED,SAAS,EAAE,CAAC,MAAgB;IACxB,OAAO,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;AAC1C,CAAC"}

package/dist/utils/gbnfJson/terminals/GbnfGrammar.d.ts

@@ -1,6 +1,9 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfGrammar extends GbnfTerminal {
     readonly grammar: string | string[];
-    constructor(grammar: string | string[]);
+    readonly resolveToRawGrammar: boolean;
+    constructor(grammar: string | string[], resolveToRawGrammar?: boolean);
     getGrammar(): string;
+    resolve(grammarGenerator: GbnfGrammarGenerator): string;
 }

package/dist/utils/gbnfJson/terminals/GbnfGrammar.js

@@ -1,9 +1,11 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
 export class GbnfGrammar extends GbnfTerminal {
     grammar;
-    constructor(grammar) {
+    resolveToRawGrammar;
+    constructor(grammar, resolveToRawGrammar = false) {
         super();
         this.grammar = grammar;
+        this.resolveToRawGrammar = resolveToRawGrammar;
     }
     getGrammar() {
         if (this.grammar instanceof Array)
@@ -12,5 +14,10 @@ export class GbnfGrammar extends GbnfTerminal {
                 .join(" ");
         return this.grammar;
     }
+    resolve(grammarGenerator) {
+        if (this.resolveToRawGrammar)
+            return this.getGrammar();
+        return super.resolve(grammarGenerator);
+    }
 }
 //# sourceMappingURL=GbnfGrammar.js.map