node-llama-cpp 3.2.0 → 3.3.1

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

@@ -1,33 +1,43 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
 import { reservedRuleNames } from "./gbnfConsts.js";
+import { GbnfRepetition } from "./GbnfRepetition.js";
+import { GbnfInsideStringChar } from "./GbnfInsideStringChar.js";
 export class GbnfString extends GbnfTerminal {
-    getGrammar() {
+    minLength;
+    maxLength;
+    constructor({ minLength = 0, maxLength } = {}) {
+        super();
+        this.minLength = Math.floor(minLength ?? 0);
+        this.maxLength = maxLength == null ? undefined : Math.floor(maxLength);
+        if (this.minLength < 0)
+            this.minLength = 0;
+        if (this.maxLength != null && this.maxLength < this.minLength)
+            this.maxLength = this.minLength;
+    }
+    getGrammar(grammarGenerator) {
+        if (this.minLength == 0 && this.maxLength == null)
+            return [
+                '"\\""',
+                new GbnfInsideStringChar().resolve(grammarGenerator) + "*",
+                '"\\""'
+            ].join(" ");
+        else if (this.minLength == 0 && this.maxLength == 0)
+            return '"\\"\\""';
         return [
             '"\\""',
-            or([
-                negatedCharacterSet([
-                    '"',
-                    "\\\\",
-                    "\\x7F",
-                    "\\x00-\\x1F"
-                ]),
-                // escape sequences
-                '"\\\\" ' + or([
-                    '["\\\\/bfnrt]',
-                    '"u" [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F] [0-9a-fA-F]'
-                ])
-            ]) + "*",
+            new GbnfRepetition({
+                value: new GbnfInsideStringChar(),
+                minRepetitions: this.minLength,
+                maxRepetitions: this.maxLength
+            }).getGrammar(grammarGenerator),
             '"\\""'
         ].join(" ");
     }
     getRuleName() {
-        return reservedRuleNames.string;
+        return reservedRuleNames.string({
+            minLength: this.minLength,
+            maxLength: this.maxLength
+        });
     }
 }
-function negatedCharacterSet(characterDefinitions) {
-    return "[^" + characterDefinitions.join("") + "]";
-}
-function or(definitions) {
-    return "(" + definitions.join(" | ") + ")";
-}
 //# sourceMappingURL=GbnfString.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GbnfString.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAGlD,MAAM,OAAO,UAAW,SAAQ,YAAY;IACjC,UAAU;QACb,OAAO;YACH,OAAO;YACP,EAAE,CAAC;gBACC,mBAAmB,CAAC;oBAChB,GAAG;oBACH,MAAM;oBACN,OAAO;oBACP,aAAa;iBAChB,CAAC;gBAEF,mBAAmB;gBACnB,SAAS,GAAG,EAAE,CAAC;oBACX,eAAe;oBACf,qDAAqD;iBACxD,CAAC;aACL,CAAC,GAAG,GAAG;YACR,OAAO;SACV,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,MAAM,CAAC;IACpC,CAAC;CACJ;AAED,SAAS,mBAAmB,CAAC,oBAA8B;IACvD,OAAO,IAAI,GAAG,oBAAoB,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;AACtD,CAAC;AAED,SAAS,EAAE,CAAC,WAAqB;IAC7B,OAAO,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"GbnfString.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfString.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAG/D,MAAM,OAAO,UAAW,SAAQ,YAAY;IACxB,SAAS,CAAS;IAClB,SAAS,CAAU;IAEnC,YAAmB,EACf,SAAS,GAAG,CAAC,EACb,SAAS,KAIT,EAAE;QACF,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAEvE,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC;YAClB,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QAEvB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS;YACzD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACxC,CAAC;IAEM,UAAU,CAAC,gBAAsC;QACpD,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI;YAC7C,OAAO;gBACH,OAAO;gBACP,IAAI,oBAAoB,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,GAAG;gBAC1D,OAAO;aACV,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACX,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC;YAC/C,OAAO,UAAU,CAAC;QAEtB,OAAO;YACH,OAAO;YACP,IAAI,cAAc,CAAC;gBACf,KAAK,EAAE,IAAI,oBAAoB,EAAE;gBACjC,cAAc,EAAE,IAAI,CAAC,SAAS;gBAC9B,cAAc,EAAE,IAAI,CAAC,SAAS;aACjC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC;YAC/B,OAAO;SACV,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,MAAM,CAAC;YAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC5B,CAAC,CAAC;IACP,CAAC;CACJ"}

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

@@ -1,6 +1,8 @@
 import { GbnfTerminal } from "../GbnfTerminal.js";
+import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 export declare class GbnfStringValue extends GbnfTerminal {
     readonly value: string;
     constructor(value: string);
     getGrammar(): string;
+    protected generateRuleName(grammarGenerator: GbnfGrammarGenerator): string;
 }

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

@@ -10,14 +10,17 @@ export class GbnfStringValue extends GbnfTerminal {
             '"',
             '\\"',
             this.value
-                .replaceAll("\\", "\\\\")
-                .replaceAll("\t", "\\t")
-                .replaceAll("\r", "\\r")
-                .replaceAll("\n", "\\n")
+                .replaceAll("\\", "\\\\\\\\")
+                .replaceAll("\t", "\\\\t")
+                .replaceAll("\r", "\\\\r")
+                .replaceAll("\n", "\\\\n")
                 .replaceAll('"', "\\\\" + '\\"'),
             '\\"',
             '"'
         ].join("");
     }
+    generateRuleName(grammarGenerator) {
+        return grammarGenerator.generateRuleNameForLiteralValue(this.value);
+    }
 }
 //# sourceMappingURL=GbnfStringValue.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GbnfStringValue.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfStringValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGhD,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAC7B,KAAK,CAAS;IAE9B,YAAmB,KAAa;QAC5B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEe,UAAU;QACtB,OAAO;YACH,GAAG;YACH,KAAK;YACL,IAAI,CAAC,KAAK;iBACL,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;iBACxB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;iBACvB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;iBACvB,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC;iBACvB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;YACpC,KAAK;YACL,GAAG;SACN,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;CACJ"}
+{"version":3,"file":"GbnfStringValue.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfStringValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAIhD,MAAM,OAAO,eAAgB,SAAQ,YAAY;IAC7B,KAAK,CAAS;IAE9B,YAAmB,KAAa;QAC5B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAEe,UAAU;QACtB,OAAO;YACH,GAAG;YACH,KAAK;YACL,IAAI,CAAC,KAAK;iBACL,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC;iBAC5B,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;iBACzB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;iBACzB,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;iBACzB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;YACpC,KAAK;YACL,GAAG;SACN,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IAEkB,gBAAgB,CAAC,gBAAsC;QACtE,OAAO,gBAAgB,CAAC,+BAA+B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACxE,CAAC;CACJ"}

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

@@ -5,8 +5,9 @@ export declare class GbnfWhitespace extends GbnfTerminal {
     readonly newLine: "before" | "after" | false;
     constructor(scopeState: GbnfJsonScopeState, { newLine }?: {
         newLine?: "before" | "after" | false;
-        space?: boolean;
     });
     getGrammar(): string;
+    protected getGrammarFromResolve(): string;
+    private _getGrammar;
     protected getRuleName(): string;
 }

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

@@ -10,6 +10,12 @@ export class GbnfWhitespace extends GbnfTerminal {
         this.newLine = newLine;
     }
     getGrammar() {
+        return this._getGrammar();
+    }
+    getGrammarFromResolve() {
+        return this._getGrammar(false);
+    }
+    _getGrammar(wrap = true) {
         if (this.scopeState.settings.allowNewLines && this.newLine !== false) {
             const values = [
                 ...(this.newLine === "before"
@@ -19,8 +25,8 @@ export class GbnfWhitespace extends GbnfTerminal {
                     ? []
                     : [
                         or([
-                            new GbnfVerbatimText(" ".repeat(this.scopeState.currentNestingScope * this.scopeState.settings.scopePadSpaces)).getGrammar(),
-                            new GbnfVerbatimText("\t".repeat(this.scopeState.currentNestingScope)).getGrammar()
+                            verbatimTextRepetition(" ", this.scopeState.currentNestingScope * this.scopeState.settings.scopePadSpaces),
+                            verbatimTextRepetition("\t", this.scopeState.currentNestingScope)
                         ])
                     ]),
                 ...(this.newLine === "after"
@@ -30,19 +36,32 @@ export class GbnfWhitespace extends GbnfTerminal {
             return or([
                 values.join(" "),
                 "[ ]?"
-            ]);
+            ], wrap);
         }
         return "[ ]?";
     }
     getRuleName() {
         return reservedRuleNames.whitespace({
-            newLine: this.newLine,
+            newLine: this.scopeState.settings.allowNewLines
+                ? this.newLine
+                : false,
             scopeSpaces: this.scopeState.settings.scopePadSpaces,
             nestingScope: this.scopeState.currentNestingScope
         });
     }
 }
-function or(definitions) {
+function or(definitions, wrap = true) {
+    if (!wrap)
+        return definitions.join(" | ");
     return "(" + definitions.join(" | ") + ")";
 }
+function verbatimTextRepetition(text, count) {
+    const textRepetitionGrammar = new GbnfVerbatimText(text.repeat(count)).getGrammar();
+    if (count <= 1)
+        return textRepetitionGrammar;
+    const textRepetitionGrammarWithRepetition = new GbnfVerbatimText(text).getGrammar() + "{" + count + "}";
+    if (textRepetitionGrammarWithRepetition.length < textRepetitionGrammar.length)
+        return textRepetitionGrammarWithRepetition;
+    return textRepetitionGrammar;
+}
 //# sourceMappingURL=GbnfWhitespace.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GbnfWhitespace.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfWhitespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAEhD,OAAO,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAGvD,MAAM,OAAO,cAAe,SAAQ,YAAY;IAC5B,UAAU,CAAqB;IAC/B,OAAO,CAA6B;IAEpD,YAAmB,UAA8B,EAAE,EAC/C,OAAO,GAAG,QAAQ,KAIlB,EAAE;QACF,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAEM,UAAU;QACb,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YACnE,MAAM,MAAM,GAAG;gBACX,GAAG,CACC,IAAI,CAAC,OAAO,KAAK,QAAQ;oBACrB,CAAC,CAAC,CAAC,OAAO,CAAC;oBACX,CAAC,CAAC,EAAE,CACX;gBACD,GAAG,CACC,IAAI,CAAC,UAAU,CAAC,mBAAmB,KAAK,CAAC;oBACrC,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC;wBACE,EAAE,CAAC;4BACC,IAAI,gBAAgB,CAChB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,CAC5F,CAAC,UAAU,EAAE;4BACd,IAAI,gBAAgB,CAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,CACnD,CAAC,UAAU,EAAE;yBACjB,CAAC;qBACL,CACR;gBACD,GAAG,CACC,IAAI,CAAC,OAAO,KAAK,OAAO;oBACpB,CAAC,CAAC,CAAC,OAAO,CAAC;oBACX,CAAC,CAAC,EAAE,CACX;aACJ,CAAC;YAEF,OAAO,EAAE,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;gBAChB,MAAM;aACT,CAAC,CAAC;QACP,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAEkB,WAAW;QAC1B,OAAO,iBAAiB,CAAC,UAAU,CAAC;YAChC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc;YACpD,YAAY,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB;SACpD,CAAC,CAAC;IACP,CAAC;CACJ;AAED,SAAS,EAAE,CAAC,WAAqB;IAC7B,OAAO,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;AAC/C,CAAC"}
+{"version":3,"file":"GbnfWhitespace.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/GbnfWhitespace.ts"],"names":[],"mappings":"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"}

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

@@ -6,10 +6,25 @@ export declare const reservedRuleNames: {
         readonly fractional: "fractional-number-rule";
         readonly integer: "integer-number-rule";
     };
-    readonly string: "string-rule";
+    readonly stringChar: "string-char-rule";
+    readonly string: ({ minLength, maxLength }: {
+        minLength: number;
+        maxLength?: number;
+    }) => string;
+    readonly formatString: (format: string) => string;
     readonly whitespace: ({ newLine, nestingScope, scopeSpaces }: {
         newLine?: "before" | "after" | false;
         nestingScope: number;
         scopeSpaces: number;
     }) => string;
+    readonly commaWhitespace: ({ newLine, nestingScope, scopeSpaces }: {
+        newLine?: "before" | "after" | false;
+        nestingScope: number;
+        scopeSpaces: number;
+    }) => string;
+    readonly anyJson: ({ allowNewLines, nestingScope, scopeSpaces }: {
+        allowNewLines: boolean;
+        nestingScope: number;
+        scopeSpaces: number;
+    }) => string;
 };

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

@@ -6,7 +6,27 @@ export const reservedRuleNames = {
         fractional: "fractional-number-rule",
         integer: "integer-number-rule"
     },
-    string: "string-rule",
+    stringChar: "string-char-rule",
+    string({ minLength, maxLength }) {
+        if (minLength === 0 && maxLength == null)
+            return "string-rule";
+        else if (maxLength == null)
+            return [
+                "string-",
+                minLength,
+                "-rule"
+            ].join("");
+        return [
+            "string-",
+            minLength,
+            "-",
+            maxLength,
+            "-rule"
+        ].join("");
+    },
+    formatString(format) {
+        return "string-format-" + format + "-rule";
+    },
     whitespace({ newLine, nestingScope, scopeSpaces }) {
         if (!newLine)
             return "whitespace-no-new-lines-rule";
@@ -21,6 +41,32 @@ export const reservedRuleNames = {
             "-" + scopeSpaces,
             "-rule"
         ].join("");
+    },
+    commaWhitespace({ newLine, nestingScope, scopeSpaces }) {
+        if (!newLine)
+            return "comma-whitespace-no-new-lines-rule";
+        return [
+            "comma-whitespace-",
+            newLine === "before"
+                ? "b"
+                : newLine === "after"
+                    ? "a"
+                    : "n",
+            "-" + nestingScope,
+            "-" + scopeSpaces,
+            "-rule"
+        ].join("");
+    },
+    anyJson({ allowNewLines, nestingScope, scopeSpaces }) {
+        return [
+            "any-json-",
+            !allowNewLines
+                ? "s-"
+                : "",
+            nestingScope,
+            "-" + scopeSpaces,
+            "-rule"
+        ].join("");
     }
 };
 //# sourceMappingURL=gbnfConsts.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"gbnfConsts.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/gbnfConsts.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AACnC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,cAAc;IACvB,MAAM,EAAE;QACJ,UAAU,EAAE,wBAAwB;QACpC,OAAO,EAAE,qBAAqB;KACjC;IACD,MAAM,EAAE,aAAa;IACrB,UAAU,CAAC,EAAC,OAAO,EAAE,YAAY,EAAE,WAAW,EAE7C;QACG,IAAI,CAAC,OAAO;YACR,OAAO,8BAA8B,CAAC;QAE1C,OAAO;YACH,aAAa;YACb,OAAO,KAAK,QAAQ;gBAChB,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,OAAO,KAAK,OAAO;oBACjB,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,GAAG;YACb,GAAG,GAAG,YAAY;YAClB,GAAG,GAAG,WAAW;YACjB,OAAO;SACV,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;CACK,CAAC"}
+{"version":3,"file":"gbnfConsts.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/terminals/gbnfConsts.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AACnC,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC7B,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,cAAc;IACvB,MAAM,EAAE;QACJ,UAAU,EAAE,wBAAwB;QACpC,OAAO,EAAE,qBAAqB;KACjC;IACD,UAAU,EAAE,kBAAkB;IAC9B,MAAM,CAAC,EAAC,SAAS,EAAE,SAAS,EAA0C;QAClE,IAAI,SAAS,KAAK,CAAC,IAAI,SAAS,IAAI,IAAI;YACpC,OAAO,aAAa,CAAC;aACpB,IAAI,SAAS,IAAI,IAAI;YACtB,OAAO;gBACH,SAAS;gBACT,SAAS;gBACT,OAAO;aACV,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEf,OAAO;YACH,SAAS;YACT,SAAS;YACT,GAAG;YACH,SAAS;YACT,OAAO;SACV,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IACD,YAAY,CAAC,MAAc;QACvB,OAAO,gBAAgB,GAAG,MAAM,GAAG,OAAO,CAAC;IAC/C,CAAC;IACD,UAAU,CAAC,EAAC,OAAO,EAAE,YAAY,EAAE,WAAW,EAE7C;QACG,IAAI,CAAC,OAAO;YACR,OAAO,8BAA8B,CAAC;QAE1C,OAAO;YACH,aAAa;YACb,OAAO,KAAK,QAAQ;gBAChB,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,OAAO,KAAK,OAAO;oBACjB,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,GAAG;YACb,GAAG,GAAG,YAAY;YAClB,GAAG,GAAG,WAAW;YACjB,OAAO;SACV,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IACD,eAAe,CAAC,EAAC,OAAO,EAAE,YAAY,EAAE,WAAW,EAElD;QACG,IAAI,CAAC,OAAO;YACR,OAAO,oCAAoC,CAAC;QAEhD,OAAO;YACH,mBAAmB;YACnB,OAAO,KAAK,QAAQ;gBAChB,CAAC,CAAC,GAAG;gBACL,CAAC,CAAC,OAAO,KAAK,OAAO;oBACjB,CAAC,CAAC,GAAG;oBACL,CAAC,CAAC,GAAG;YACb,GAAG,GAAG,YAAY;YAClB,GAAG,GAAG,WAAW;YACjB,OAAO;SACV,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;IACD,OAAO,CAAC,EAAC,aAAa,EAAE,YAAY,EAAE,WAAW,EAEhD;QACG,OAAO;YACH,WAAW;YACX,CAAC,aAAa;gBACV,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,EAAE;YACR,YAAY;YACZ,GAAG,GAAG,WAAW;YACjB,OAAO;SACV,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,CAAC;CACK,CAAC"}

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

@@ -1,44 +1,191 @@
 export type GbnfJsonSchemaImmutableType = "string" | "number" | "integer" | "boolean" | "null";
-export type GbnfJsonSchema = GbnfJsonBasicSchema | GbnfJsonConstSchema | GbnfJsonEnumSchema | GbnfJsonOneOfSchema | GbnfJsonObjectSchema | GbnfJsonArraySchema;
+export type GbnfJsonSchema = GbnfJsonBasicSchema | GbnfJsonConstSchema | GbnfJsonEnumSchema | GbnfJsonOneOfSchema | GbnfJsonStringSchema | GbnfJsonObjectSchema | GbnfJsonArraySchema;
 export type GbnfJsonBasicSchema = {
-    type: GbnfJsonSchemaImmutableType | readonly GbnfJsonSchemaImmutableType[];
+    readonly type: GbnfJsonSchemaImmutableType | readonly GbnfJsonSchemaImmutableType[];
+    /**
+     * A description of what you expect the model to set this value to.
+     *
+     * Only passed to the model when using function calling, and has no effect when using JSON Schema grammar directly.
+     */
+    readonly description?: string;
 };
 export type GbnfJsonConstSchema = {
-    const: string | number | boolean | null;
+    readonly const: string | number | boolean | null;
+    /**
+     * A description of what you expect the model to set this value to.
+     *
+     * Only passed to the model when using function calling, and has no effect when using JSON Schema grammar directly.
+     */
+    readonly description?: string;
 };
 export type GbnfJsonEnumSchema = {
-    enum: readonly (string | number | boolean | null)[];
+    readonly enum: readonly (string | number | boolean | null)[];
+    /**
+     * A description of what you expect the model to set this value to.
+     *
+     * Only passed to the model when using function calling, and has no effect when using JSON Schema grammar directly.
+     */
+    readonly description?: string;
 };
 export type GbnfJsonOneOfSchema = {
-    oneOf: readonly GbnfJsonSchema[];
+    readonly oneOf: readonly GbnfJsonSchema[];
+    /**
+     * A description of what you expect the model to set this value to.
+     *
+     * Only passed to the model when using function calling, and has no effect when using JSON Schema grammar directly.
+     */
+    readonly description?: string;
+};
+export type GbnfJsonStringSchema = GbnfJsonBasicStringSchema | GbnfJsonFormatStringSchema;
+export type GbnfJsonBasicStringSchema = {
+    readonly type: "string";
+    /**
+     * When using `minLength` and/or `maxLength`,
+     * ensure to inform the model as part of the prompt what your expectations are regarding the length of the string.
+     * Not doing this may lead to hallucinations.
+     */
+    readonly minLength?: number;
+    /**
+     * When using `minLength` and/or `maxLength`,
+     * ensure to inform the model as part of the prompt what your expectations are regarding the length of the string.
+     * Not doing this may lead to hallucinations.
+     */
+    readonly maxLength?: number;
+    /**
+     * A description of what you expect the model to set this value to.
+     *
+     * Only passed to the model when using function calling, and has no effect when using JSON Schema grammar directly.
+     */
+    readonly description?: string;
+};
+export type GbnfJsonFormatStringSchema = {
+    readonly type: "string";
+    readonly format: "date-time" | "time" | "date";
+    /**
+     * A description of what you expect the model to set this value to.
+     *
+     * Only passed to the model when using function calling, and has no effect when using JSON Schema grammar directly.
+     */
+    readonly description?: string;
 };
 export type GbnfJsonObjectSchema<Keys extends string = string> = {
-    type: "object";
-    properties: Readonly<{
-        [key in Keys]: GbnfJsonSchema;
-    }>;
-    required?: readonly Keys[];
+    readonly type: "object";
+    readonly properties?: {
+        readonly [key in Keys]: GbnfJsonSchema;
+    };
+    /**
+     * Unlike the JSON Schema spec, `additionalProperties` defaults to `false` to avoid breaking existing code.
+     */
+    readonly additionalProperties?: boolean | GbnfJsonSchema;
+    /**
+     * Make sure you define `additionalProperties` for this to have any effect.
+     *
+     * When using `minProperties` and/or `maxProperties`,
+     * ensure to inform the model as part of the prompt what your expectations are regarding the number of keys in the object.
+     * Not doing this may lead to hallucinations.
+     */
+    readonly minProperties?: number;
+    /**
+     * Make sure you define `additionalProperties` for this to have any effect.
+     *
+     * When using `minProperties` and/or `maxProperties`,
+     * ensure to inform the model as part of the prompt what your expectations are regarding the number of keys in the object.
+     * Not doing this may lead to hallucinations.
+     */
+    readonly maxProperties?: number;
+    /**
+     * `required` is always set to all keys in `properties`, and setting it has no effect.
+     *
+     * This limitation is due to how the generation works, and may be fixed in the future.
+     *
+     * This key is part of the type to avoid breaking exiting code (though it was never actually used in the past),
+     * and will be removed in the future.
+     * @deprecated
+     */
+    readonly required?: readonly Keys[];
+    /**
+     * A description of what you expect the model to set this value to.
+     *
+     * Only passed to the model when using function calling, and has no effect when using JSON Schema grammar directly.
+     */
+    readonly description?: string;
 };
 export type GbnfJsonArraySchema = {
-    type: "array";
-    items: GbnfJsonSchema;
+    readonly type: "array";
+    readonly items?: GbnfJsonSchema;
+    readonly prefixItems?: readonly GbnfJsonSchema[];
+    /**
+     * When using `minItems` and/or `maxItems`,
+     * ensure to inform the model as part of the prompt what your expectations are regarding the length of the array.
+     * Not doing this may lead to hallucinations.
+     */
+    readonly minItems?: number;
+    /**
+     * When using `minItems` and/or `maxItems`,
+     * ensure to inform the model as part of the prompt what your expectations are regarding the length of the array.
+     * Not doing this may lead to hallucinations.
+     */
+    readonly maxItems?: number;
+    /**
+     * A description of what you expect the model to set this value to.
+     *
+     * Only passed to the model when using function calling, and has no effect when using JSON Schema grammar directly.
+     */
+    readonly description?: string;
 };
 /**
  * Converts a GBNF JSON schema to a TypeScript type
  */
 export type GbnfJsonSchemaToType<T> = GbnfJsonSchemaToTSType<T>;
-export type GbnfJsonSchemaToTSType<T> = GbnfJsonBasicSchema extends T ? undefined : undefined extends T ? undefined : T extends GbnfJsonBasicSchema ? GbnfJsonBasicSchemaToType<T["type"]> : T extends GbnfJsonConstSchema ? T["const"] : T extends GbnfJsonEnumSchema ? T["enum"][number] : T extends GbnfJsonOneOfSchema ? GbnfJsonSchemaToType<T["oneOf"][number]> : T extends GbnfJsonObjectSchema ? GbnfJsonObjectSchemaToType<T["properties"]> : T extends GbnfJsonArraySchema ? GbnfJsonSchemaToType<T["items"]>[] : undefined;
-type GbnfJsonBasicSchemaToType<T> = T extends GbnfJsonSchemaImmutableType ? ImmutableTypeToType<T> : T extends GbnfJsonSchemaImmutableType[] ? ImmutableTypeToType<T[number]> : never;
-type ImmutableTypeToType<T> = T extends "string" ? string : T extends "number" ? number : T extends "integer" ? number : T extends "boolean" ? boolean : T extends "null" ? null : never;
-type GbnfJsonObjectSchemaToType<Props> = {
-    [P in keyof Props]: GbnfJsonSchemaToType<Props[P]>;
+export type GbnfJsonSchemaToTSType<T> = Readonly<GbnfJsonBasicSchema> extends T ? undefined : undefined extends T ? undefined : T extends GbnfJsonBasicStringSchema ? GbnfJsonBasicStringSchemaToType<T> : T extends GbnfJsonFormatStringSchema ? string : T extends GbnfJsonBasicSchema ? GbnfJsonBasicSchemaToType<T["type"]> : T extends GbnfJsonConstSchema ? T["const"] : T extends GbnfJsonEnumSchema ? T["enum"][number] : T extends GbnfJsonOneOfSchema ? GbnfJsonSchemaToType<T["oneOf"][number]> : T extends GbnfJsonObjectSchema ? GbnfJsonObjectSchemaToType<T> : T extends GbnfJsonArraySchema ? ArrayTypeToType<T> : undefined;
+type GbnfJsonBasicStringSchemaToType<T extends GbnfJsonBasicStringSchema> = T["maxLength"] extends 0 ? "" : string;
+type GbnfJsonBasicSchemaToType<T extends GbnfJsonBasicSchema["type"]> = T extends GbnfJsonSchemaImmutableType ? ImmutableTypeToType<T> : T extends GbnfJsonSchemaImmutableType[] ? ImmutableTypeToType<T[number]> : never;
+type ImmutableTypeToType<T extends GbnfJsonSchemaImmutableType> = T extends "string" ? string : T extends "number" ? number : T extends "integer" ? number : T extends "boolean" ? boolean : T extends "null" ? null : never;
+type ArrayTypeToType<T extends GbnfJsonArraySchema, MinItems extends number = T["minItems"] extends number ? T["prefixItems"] extends readonly GbnfJsonSchema[] ? keyof T["prefixItems"] extends T["minItems"] ? T["prefixItems"]["length"] : T["minItems"] : T["minItems"] : T["prefixItems"] extends readonly GbnfJsonSchema[] ? T["prefixItems"]["length"] : 0> = T["prefixItems"] extends readonly GbnfJsonSchema[] ? (MinItems extends T["prefixItems"]["length"] ? (T["maxItems"] extends MinItems ? [
+    ...GbnfJsonOrderedArrayTypes<T["prefixItems"]>,
+    ...IndexRangeWithSkip<MinItems, T["prefixItems"]["length"], T["items"] extends GbnfJsonSchema ? GbnfJsonSchemaToType<T["items"]> : GbnfJsonAnyValue>
+] : [
+    ...GbnfJsonOrderedArrayTypes<T["prefixItems"]>,
+    ...(T["items"] extends GbnfJsonSchema ? GbnfJsonSchemaToType<T["items"]> : GbnfJsonAnyValue)[]
+]) : T["maxItems"] extends MinItems ? [
+    ...GbnfJsonOrderedArrayTypes<T["prefixItems"]>,
+    ...(T["items"] extends GbnfJsonSchema ? IndexRangeWithSkip<T["maxItems"], T["prefixItems"]["length"], GbnfJsonSchemaToType<T["items"]>> : IndexRangeWithSkip<T["maxItems"], T["prefixItems"]["length"], GbnfJsonAnyValue>)
+] : [
+    ...GbnfJsonOrderedArrayTypes<T["prefixItems"]>,
+    ...IndexRangeWithSkip<MinItems, T["prefixItems"]["length"], T["items"] extends GbnfJsonSchema ? GbnfJsonSchemaToType<T["items"]> : GbnfJsonAnyValue>,
+    ...(T["items"] extends GbnfJsonSchema ? GbnfJsonSchemaToType<T["items"]> : GbnfJsonAnyValue)[]
+]) : T["items"] extends GbnfJsonSchema ? (MinItems extends 0 ? GbnfJsonSchemaToType<T["items"]>[] : T["maxItems"] extends MinItems ? IndexRange<T["maxItems"], GbnfJsonSchemaToType<T["items"]>> : [
+    ...IndexRange<MinItems, GbnfJsonSchemaToType<T["items"]>>,
+    ...GbnfJsonSchemaToType<T["items"]>[]
+]) : (MinItems extends 0 ? GbnfJsonAnyValue[] : T["maxItems"] extends MinItems ? IndexRange<T["maxItems"], GbnfJsonAnyValue> : [
+    ...IndexRange<MinItems, GbnfJsonAnyValue>,
+    ...GbnfJsonAnyValue[]
+]);
+type GbnfJsonObjectSchemaToType<T extends GbnfJsonObjectSchema, Props extends Readonly<Record<string, GbnfJsonSchema>> | undefined = T["properties"], AdditionalProps extends true | false | GbnfJsonSchema | undefined = T["additionalProperties"], PropsMap = Props extends undefined ? {} : {
+    -readonly [P in keyof Props]: GbnfJsonSchemaToType<Props[P]>;
+}, Res = AdditionalProps extends undefined | false ? PropsMap : AdditionalProps extends true ? PropsMap & {
+    [key: string]: GbnfJsonAnyValue;
+} : AdditionalProps extends GbnfJsonSchema ? PropsMap & {
+    [key: string]: GbnfJsonSchemaToType<AdditionalProps>;
+} : PropsMap> = Res;
+type GbnfJsonAnyValue = string | number | boolean | null | GbnfJsonAnyValue[] | {
+    [key: string]: GbnfJsonAnyValue;
 };
 export declare function isGbnfJsonConstSchema(schema: GbnfJsonSchema): schema is GbnfJsonConstSchema;
 export declare function isGbnfJsonEnumSchema(schema: GbnfJsonSchema): schema is GbnfJsonEnumSchema;
 export declare function isGbnfJsonOneOfSchema(schema: GbnfJsonSchema): schema is GbnfJsonOneOfSchema;
+export declare function isGbnfJsonBasicStringSchema(schema: GbnfJsonSchema): schema is GbnfJsonBasicStringSchema;
+export declare function isGbnfJsonFormatStringSchema(schema: GbnfJsonSchema): schema is GbnfJsonFormatStringSchema;
 export declare function isGbnfJsonObjectSchema(schema: GbnfJsonSchema): schema is GbnfJsonObjectSchema;
 export declare function isGbnfJsonArraySchema(schema: GbnfJsonSchema): schema is GbnfJsonArraySchema;
 export declare function isGbnfJsonBasicSchemaIncludesType<T extends GbnfJsonSchemaImmutableType>(schema: GbnfJsonBasicSchema, type: T): schema is GbnfJsonBasicSchema & {
     type: T | (T | GbnfJsonSchemaImmutableType)[];
 };
+type IndexRange<Length extends number, FillType = number, Res = _IndexRange<[], Length, FillType>> = Res;
+type _IndexRange<Value extends FillType[], MaxLength extends number, FillType = number> = Value["length"] extends MaxLength ? Value : _IndexRange<[...Value, FillType], MaxLength, FillType>;
+type IndexRangeWithSkip<Length extends number, SkipFirst extends number, FillType, Res = _IndexRangeWithSkip<[], IndexRange<SkipFirst>, Length, FillType>> = Res;
+type _IndexRangeWithSkip<Value extends FillType[], ConditionValue extends number[], MaxLength extends number, FillType> = ConditionValue["length"] extends MaxLength ? Value : _IndexRangeWithSkip<[...Value, FillType], [...ConditionValue, ConditionValue["length"]], MaxLength, FillType>;
+type GbnfJsonOrderedArrayTypes<T extends readonly GbnfJsonSchema[]> = {
+    -readonly [P in keyof T]: GbnfJsonSchemaToType<T[P]>;
+};
 export {};

package/dist/utils/gbnfJson/types.js

@@ -7,6 +7,12 @@ export function isGbnfJsonEnumSchema(schema) {
 export function isGbnfJsonOneOfSchema(schema) {
     return schema.oneOf != null;
 }
+export function isGbnfJsonBasicStringSchema(schema) {
+    return schema.type === "string" && schema.format == null;
+}
+export function isGbnfJsonFormatStringSchema(schema) {
+    return schema.type === "string" && schema.format != null;
+}
 export function isGbnfJsonObjectSchema(schema) {
     return schema.type === "object";
 }

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/types.ts"],"names":[],"mappings":"AA4EA,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,KAAK,KAAK,SAAS,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAsB;IACvD,OAAQ,MAA6B,CAAC,IAAI,IAAI,IAAI,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,KAAK,IAAI,IAAI,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAsB;IACzD,OAAQ,MAA+B,CAAC,IAAI,KAAK,QAAQ,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,IAAI,KAAK,OAAO,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC7C,MAA2B,EAAE,IAAO;IAEpC,IAAI,MAAM,CAAC,IAAI,YAAY,KAAK;QAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEtC,OAAO,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;AAChC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/types.ts"],"names":[],"mappings":"AAoTA,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,KAAK,KAAK,SAAS,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAsB;IACvD,OAAQ,MAA6B,CAAC,IAAI,IAAI,IAAI,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,KAAK,IAAI,IAAI,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAAsB;IAC9D,OAAQ,MAAoC,CAAC,IAAI,KAAK,QAAQ,IAAK,MAAqC,CAAC,MAAM,IAAI,IAAI,CAAC;AAC5H,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,MAAsB;IAC/D,OAAQ,MAAqC,CAAC,IAAI,KAAK,QAAQ,IAAK,MAAqC,CAAC,MAAM,IAAI,IAAI,CAAC;AAC7H,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,MAAsB;IACzD,OAAQ,MAA+B,CAAC,IAAI,KAAK,QAAQ,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAsB;IACxD,OAAQ,MAA8B,CAAC,IAAI,KAAK,OAAO,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,iCAAiC,CAC7C,MAA2B,EAAE,IAAO;IAEpC,IAAI,MAAM,CAAC,IAAI,YAAY,KAAK;QAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEtC,OAAO,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;AAChC,CAAC"}

package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js

@@ -6,7 +6,10 @@ import { GbnfString } from "../terminals/GbnfString.js";
 import { GbnfNumber } from "../terminals/GbnfNumber.js";
 import { GbnfBoolean } from "../terminals/GbnfBoolean.js";
 import { GbnfNull } from "../terminals/GbnfNull.js";
-import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema } from "../types.js";
+import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema } from "../types.js";
+import { getConsoleLogPrefix } from "../../getConsoleLogPrefix.js";
+import { GbnfAnyJson } from "../terminals/GbnfAnyJson.js";
+import { GbnfFormatString } from "../terminals/GbnfFormatString.js";
 import { getGbnfJsonTerminalForLiteral } from "./getGbnfJsonTerminalForLiteral.js";
 import { GbnfJsonScopeState } from "./GbnfJsonScopeState.js";
 export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, scopeState = new GbnfJsonScopeState()) {
@@ -22,17 +25,66 @@ export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, s
         return new GbnfOr(schema.enum.map((item) => getGbnfJsonTerminalForLiteral(item)));
     }
     else if (isGbnfJsonObjectSchema(schema)) {
-        return new GbnfObjectMap(Object.entries(schema.properties).map(([propName, propSchema]) => {
-            return {
-                required: true,
-                key: new GbnfStringValue(propName),
-                value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator, scopeState.getForNewScope())
-            };
-        }), scopeState);
+        const propertiesEntries = Object.entries(schema.properties ?? {});
+        let maxProperties = schema.maxProperties;
+        if (schema.properties != null && maxProperties != null && maxProperties < propertiesEntries.length) {
+            console.warn(getConsoleLogPrefix(true, false), `maxProperties (${maxProperties}) must be greater than or equal to ` +
+                `properties object keys number (${propertiesEntries.length}). ` +
+                "Using properties object keys number as maxProperties.");
+            maxProperties = propertiesEntries.length;
+        }
+        return new GbnfObjectMap({
+            fields: propertiesEntries.map(([propName, propSchema]) => {
+                return {
+                    required: true,
+                    key: new GbnfStringValue(propName),
+                    value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator, scopeState.getForNewScope())
+                };
+            }),
+            additionalProperties: (schema.additionalProperties == null || schema.additionalProperties === false)
+                ? undefined
+                : schema.additionalProperties === true
+                    ? new GbnfAnyJson(scopeState.getForNewScope())
+                    : getGbnfJsonTerminalForGbnfJsonSchema(schema.additionalProperties, grammarGenerator, scopeState.getForNewScope()),
+            minProperties: schema.minProperties,
+            maxProperties,
+            scopeState
+        });
     }
     else if (isGbnfJsonArraySchema(schema)) {
-        return new GbnfArray(getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator, scopeState), scopeState);
+        let maxItems = schema.maxItems;
+        if (schema.prefixItems != null && maxItems != null && maxItems < schema.prefixItems.length) {
+            console.warn(getConsoleLogPrefix(true, false), `maxItems (${maxItems}) must be greater than or equal to prefixItems array length (${schema.prefixItems.length}). ` +
+                "Using prefixItems length as maxItems.");
+            maxItems = schema.prefixItems.length;
+        }
+        return new GbnfArray({
+            items: schema.items == null
+                ? undefined
+                : getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator, scopeState.getForNewScope()),
+            prefixItems: schema.prefixItems == null
+                ? undefined
+                : schema.prefixItems.map((item) => (getGbnfJsonTerminalForGbnfJsonSchema(item, grammarGenerator, scopeState.getForNewScope()))),
+            minItems: schema.minItems,
+            maxItems,
+            scopeState
+        });
     }
+    else if (isGbnfJsonBasicStringSchema(schema)) {
+        const minLength = Math.max(0, schema.minLength ?? 0);
+        let maxLength = schema.maxLength;
+        if (maxLength != null && maxLength < minLength) {
+            console.warn(getConsoleLogPrefix(true, false), `maxLength (${maxLength}) must be greater than or equal to minLength (${minLength}). ` +
+                "Using minLength as maxLength.");
+            maxLength = minLength;
+        }
+        return new GbnfString({
+            minLength,
+            maxLength
+        });
+    }
+    else if (isGbnfJsonFormatStringSchema(schema))
+        return new GbnfFormatString(schema.format);
     const terminals = [];
     if (isGbnfJsonBasicSchemaIncludesType(schema, "string"))
         terminals.push(new GbnfString());