node-llama-cpp 3.9.0 → 3.11.0

package/dist/utils/gbnfJson/types.js

@@ -19,6 +19,9 @@ export function isGbnfJsonObjectSchema(schema) {
 export function isGbnfJsonArraySchema(schema) {
     return schema.type === "array";
 }
+export function isGbnfJsonRefSchema(schema) {
+    return typeof schema.$ref === "string";
+}
 export function isGbnfJsonBasicSchemaIncludesType(schema, type) {
     if (schema.type instanceof Array)
         return schema.type.includes(type);

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/utils/gbnfJson/types.ts"],"names":[],"mappings":"AA8WA,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,mBAAmB,CAAC,MAAsB;IACtD,OAAO,OAAQ,MAA4B,CAAC,IAAI,KAAK,QAAQ,CAAC;AAClE,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/defsScope.d.ts

@@ -0,0 +1,7 @@
+import { MultiKeyMap } from "lifecycle-utils";
+import { GbnfJsonSchema } from "../types.js";
+export declare class DefScopeDefs {
+    defScopeDefs: MultiKeyMap<[string, GbnfJsonSchema], Record<string, GbnfJsonSchema>>;
+    registerDefs(scopeDefs: Record<string, GbnfJsonSchema>): void;
+}
+export declare function joinDefs(parent: Record<string, GbnfJsonSchema>, current?: Record<string, GbnfJsonSchema>): Record<string, GbnfJsonSchema>;

package/dist/utils/gbnfJson/utils/defsScope.js

@@ -0,0 +1,17 @@
+import { MultiKeyMap } from "lifecycle-utils";
+export class DefScopeDefs {
+    defScopeDefs = new MultiKeyMap();
+    registerDefs(scopeDefs) {
+        for (const [defName, def] of Object.entries(scopeDefs))
+            this.defScopeDefs.set([defName, def], scopeDefs);
+    }
+}
+export function joinDefs(parent, current) {
+    if (current == null || Object.keys(current).length === 0)
+        return parent;
+    return {
+        ...parent,
+        ...current
+    };
+}
+//# sourceMappingURL=defsScope.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"defsScope.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/defsScope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAG5C,MAAM,OAAO,YAAY;IACd,YAAY,GAA0E,IAAI,WAAW,EAAE,CAAC;IAExG,YAAY,CAAC,SAAyC;QACzD,KAAK,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;YAClD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;CACJ;AAED,MAAM,UAAU,QAAQ,CACpB,MAAsC,EACtC,OAAwC;IAExC,IAAI,OAAO,IAAI,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC;QACpD,OAAO,MAAM,CAAC;IAElB,OAAO;QACH,GAAG,MAAM;QACT,GAAG,OAAO;KACb,CAAC;AACN,CAAC"}

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

@@ -2,4 +2,4 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
 import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
 import { GbnfJsonSchema } from "../types.js";
 import { GbnfJsonScopeState } from "./GbnfJsonScopeState.js";
-export declare function getGbnfJsonTerminalForGbnfJsonSchema(schema: GbnfJsonSchema, grammarGenerator: GbnfGrammarGenerator, scopeState?: GbnfJsonScopeState): GbnfTerminal;
+export declare function getGbnfJsonTerminalForGbnfJsonSchema(schema: GbnfJsonSchema, grammarGenerator: GbnfGrammarGenerator, scopeState?: GbnfJsonScopeState, defs?: Record<string, GbnfJsonSchema>): GbnfTerminal;

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

@@ -6,16 +6,52 @@ 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, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema } from "../types.js";
+import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema, isGbnfJsonRefSchema } from "../types.js";
 import { getConsoleLogPrefix } from "../../getConsoleLogPrefix.js";
 import { GbnfAnyJson } from "../terminals/GbnfAnyJson.js";
 import { GbnfFormatString } from "../terminals/GbnfFormatString.js";
+import { GbnfRef } from "../terminals/GbnfRef.js";
 import { getGbnfJsonTerminalForLiteral } from "./getGbnfJsonTerminalForLiteral.js";
 import { GbnfJsonScopeState } from "./GbnfJsonScopeState.js";
-export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, scopeState = new GbnfJsonScopeState()) {
-    if (isGbnfJsonOneOfSchema(schema)) {
+import { joinDefs } from "./defsScope.js";
+const maxNestingScope = 512;
+export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, scopeState = new GbnfJsonScopeState(), defs = {}) {
+    if (scopeState.currentNestingScope >= maxNestingScope)
+        throw new Error("Maximum nesting scope exceeded. Ensure that your schema does not have circular references or excessive nesting.");
+    if (isGbnfJsonRefSchema(schema)) {
+        const currentDefs = joinDefs(defs, schema.$defs);
+        grammarGenerator.registerDefs(currentDefs);
+        const ref = schema?.$ref;
+        const referencePrefix = "#/$defs/";
+        if (ref == null || !ref.startsWith(referencePrefix)) {
+            console.warn(getConsoleLogPrefix(true, false), `Reference "${ref}" does not start with "${referencePrefix}". ` +
+                'Using an "any" type instead of a reference.');
+            return new GbnfAnyJson(scopeState);
+        }
+        const defName = ref.slice(referencePrefix.length);
+        const def = currentDefs[defName];
+        if (def == null) {
+            console.warn(getConsoleLogPrefix(true, false), `Reference "${ref}" does not point to an existing definition. ` +
+                'Using an "any" type instead of a reference.');
+            return new GbnfAnyJson(scopeState);
+        }
+        return new GbnfRef({
+            getValueTerminal() {
+                const scopeDefs = grammarGenerator.defScopeDefs.get([defName, def]);
+                return getGbnfJsonTerminalForGbnfJsonSchema(def, grammarGenerator, new GbnfJsonScopeState({
+                    allowNewLines: false,
+                    scopePadSpaces: scopeState.settings.scopePadSpaces
+                }, 0), scopeDefs ?? {});
+            },
+            def,
+            defName
+        });
+    }
+    else if (isGbnfJsonOneOfSchema(schema)) {
+        const currentDefs = joinDefs(defs, schema.$defs);
+        grammarGenerator.registerDefs(currentDefs);
         const values = schema.oneOf
-            .map((altSchema) => getGbnfJsonTerminalForGbnfJsonSchema(altSchema, grammarGenerator, scopeState));
+            .map((altSchema) => (getGbnfJsonTerminalForGbnfJsonSchema(altSchema, grammarGenerator, scopeState, currentDefs)));
         return new GbnfOr(values);
     }
     else if (isGbnfJsonConstSchema(schema)) {
@@ -26,6 +62,8 @@ export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, s
     }
     else if (isGbnfJsonObjectSchema(schema)) {
         const propertiesEntries = Object.entries(schema.properties ?? {});
+        const currentDefs = joinDefs(defs, schema.$defs);
+        grammarGenerator.registerDefs(currentDefs);
         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 ` +
@@ -38,20 +76,22 @@ export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, s
                 return {
                     required: true,
                     key: new GbnfStringValue(propName),
-                    value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator, scopeState.getForNewScope())
+                    value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator, scopeState.getForNewScope(), currentDefs)
                 };
             }),
             additionalProperties: (schema.additionalProperties == null || schema.additionalProperties === false)
                 ? undefined
                 : schema.additionalProperties === true
                     ? new GbnfAnyJson(scopeState.getForNewScope())
-                    : getGbnfJsonTerminalForGbnfJsonSchema(schema.additionalProperties, grammarGenerator, scopeState.getForNewScope()),
+                    : getGbnfJsonTerminalForGbnfJsonSchema(schema.additionalProperties, grammarGenerator, scopeState.getForNewScope(), currentDefs),
             minProperties: schema.minProperties,
             maxProperties,
             scopeState
         });
     }
     else if (isGbnfJsonArraySchema(schema)) {
+        const currentDefs = joinDefs(defs, schema.$defs);
+        grammarGenerator.registerDefs(currentDefs);
         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}). ` +
@@ -61,10 +101,10 @@ export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, s
         return new GbnfArray({
             items: schema.items == null
                 ? undefined
-                : getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator, scopeState.getForNewScope()),
+                : getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator, scopeState.getForNewScope(), currentDefs),
             prefixItems: schema.prefixItems == null
                 ? undefined
-                : schema.prefixItems.map((item) => (getGbnfJsonTerminalForGbnfJsonSchema(item, grammarGenerator, scopeState.getForNewScope()))),
+                : schema.prefixItems.map((item) => (getGbnfJsonTerminalForGbnfJsonSchema(item, grammarGenerator, scopeState.getForNewScope(), currentDefs))),
             minItems: schema.minItems,
             maxItems,
             scopeState
@@ -96,6 +136,8 @@ export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, s
         terminals.push(new GbnfBoolean());
     if (isGbnfJsonBasicSchemaIncludesType(schema, "null"))
         terminals.push(new GbnfNull());
+    if (terminals.length === 0)
+        terminals.push(new GbnfNull());
     return new GbnfOr(terminals);
 }
 //# sourceMappingURL=getGbnfJsonTerminalForGbnfJsonSchema.js.map

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

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

package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js

@@ -1,4 +1,5 @@
-import { isGbnfJsonArraySchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema } from "../types.js";
+import { isGbnfJsonArraySchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema, isGbnfJsonRefSchema } from "../types.js";
+import { DefScopeDefs, joinDefs } from "./defsScope.js";
 export function validateObjectAgainstGbnfSchema(object, schema) {
     try {
         return validateObjectWithGbnfSchema(object, schema);
@@ -23,13 +24,15 @@ class TechnicalValidationError extends Error {
         super(message);
     }
 }
-function validateObjectWithGbnfSchema(object, schema) {
-    if (isGbnfJsonArraySchema(schema))
-        return validateArray(object, schema);
+function validateObjectWithGbnfSchema(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
+    if (isGbnfJsonRefSchema(schema))
+        return validateRef(object, schema, defs, defScopeDefs);
+    else if (isGbnfJsonArraySchema(schema))
+        return validateArray(object, schema, defs, defScopeDefs);
     else if (isGbnfJsonObjectSchema(schema))
-        return validateObject(object, schema);
+        return validateObject(object, schema, defs, defScopeDefs);
     else if (isGbnfJsonOneOfSchema(schema))
-        return validateOneOf(object, schema);
+        return validateOneOf(object, schema, defs, defScopeDefs);
     else if (isGbnfJsonBasicStringSchema(schema))
         return validateBasicString(object, schema);
     else if (isGbnfJsonFormatStringSchema(schema))
@@ -49,7 +52,27 @@ function validateObjectWithGbnfSchema(object, schema) {
         return true;
     throw new TechnicalValidationError(`Expected type "${schema.type}" but got "${object === null ? "null" : typeof object}"`);
 }
-function validateArray(object, schema) {
+function validateRef(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
+    const currentDefs = joinDefs(defs, schema.$defs);
+    defScopeDefs.registerDefs(currentDefs);
+    const ref = schema.$ref;
+    const referencePrefix = "#/$defs/";
+    if (ref == null || !ref.startsWith(referencePrefix)) {
+        // if the $ref is invalid, a warning was already shows when the grammar was generated,
+        // so we don't perform validation on the object as it's considered an "any" type
+        return true;
+    }
+    const defName = ref.slice(referencePrefix.length);
+    const def = currentDefs[defName];
+    if (def == null) {
+        // if the $ref points to a non-existing def, a warning was already shows when the grammar was generated,
+        // so we don't perform validation on the object as it's considered an "any" type
+        return true;
+    }
+    const scopeDefs = defScopeDefs.defScopeDefs.get([defName, def]);
+    return validateObjectWithGbnfSchema(object, def, scopeDefs ?? {}, defScopeDefs);
+}
+function validateArray(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
     if (!(object instanceof Array))
         throw new TechnicalValidationError(`Expected an array but got "${typeof object}"`);
     const minItems = Math.max(schema.minItems ?? 0, schema.prefixItems?.length ?? 0);
@@ -68,22 +91,26 @@ function validateArray(object, schema) {
     }
     let res = true;
     let index = 0;
+    const currentDefs = joinDefs(defs, schema.$defs);
+    defScopeDefs.registerDefs(currentDefs);
     if (schema.prefixItems != null) {
         for (const item of schema.prefixItems) {
-            res &&= validateObjectWithGbnfSchema(object[index], item);
+            res &&= validateObjectWithGbnfSchema(object[index], item, currentDefs, defScopeDefs);
             index++;
         }
     }
     if (schema.items != null) {
         for (; index < object.length; index++)
-            res &&= validateObjectWithGbnfSchema(object[index], schema.items);
+            res &&= validateObjectWithGbnfSchema(object[index], schema.items, currentDefs, defScopeDefs);
     }
     return res;
 }
-function validateObject(object, schema) {
+function validateObject(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
     if (typeof object !== "object" || object === null)
         throw new TechnicalValidationError(`Expected an object but got "${typeof object}"`);
     let res = true;
+    const currentDefs = joinDefs(defs, schema.$defs);
+    defScopeDefs.registerDefs(currentDefs);
     const objectKeys = Object.keys(object);
     const objectKeysSet = new Set(objectKeys);
     const schemaKeys = Object.keys(schema.properties ?? {});
@@ -98,14 +125,14 @@ function validateObject(object, schema) {
             throw new TechnicalValidationError(`Unexpected keys: ${extraKeys.map((key) => JSON.stringify(key)).join(", ")}`);
         else if (schema.additionalProperties !== true) {
             for (const key of extraKeys)
-                res &&= validateObjectWithGbnfSchema(object[key], schema.additionalProperties);
+                res &&= validateObjectWithGbnfSchema(object[key], schema.additionalProperties, currentDefs, defScopeDefs);
         }
     }
     const missingKeys = schemaKeys.filter((key) => !objectKeysSet.has(key));
     if (missingKeys.length > 0)
         throw new TechnicalValidationError(`Missing keys: ${missingKeys.map((key) => JSON.stringify(key)).join(", ")}`);
     for (const key of schemaKeys)
-        res &&= validateObjectWithGbnfSchema(object[key], schema.properties[key]);
+        res &&= validateObjectWithGbnfSchema(object[key], schema.properties[key], currentDefs, defScopeDefs);
     if (schema.additionalProperties != null && schema.additionalProperties !== false) {
         if (objectKeys.length < minProperties) {
             if (maxProperties != null && minProperties === maxProperties)
@@ -120,10 +147,12 @@ function validateObject(object, schema) {
     }
     return res;
 }
-function validateOneOf(object, schema) {
+function validateOneOf(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
+    const currentDefs = joinDefs(defs, schema.$defs);
+    defScopeDefs.registerDefs(currentDefs);
     for (const item of schema.oneOf) {
         try {
-            return validateObjectWithGbnfSchema(object, item);
+            return validateObjectWithGbnfSchema(object, item, currentDefs, defScopeDefs);
         }
         catch (err) {
             if (err instanceof TechnicalValidationError)

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

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

package/dist/utils/getBuildDefaults.d.ts

@@ -1,5 +1,5 @@
 export declare function getBuildDefaults(): Promise<{
     repo: string;
     release: string;
-    gpuSupport: false | "cuda" | "vulkan" | "metal" | "auto";
+    gpuSupport: false | "metal" | "cuda" | "vulkan" | "auto";
 }>;

package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js

@@ -1,9 +1,48 @@
-import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonBasicStringSchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonFormatStringSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema } from "./gbnfJson/types.js";
+import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonBasicStringSchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonFormatStringSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonRefSchema } from "./gbnfJson/types.js";
+import { DefScopeDefs, joinDefs } from "./gbnfJson/utils/defsScope.js";
 const maxTypeRepetition = 10;
 export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
-    if (isGbnfJsonOneOfSchema(schema)) {
+    return _getTypeScriptTypeStringForGbnfJsonSchema(schema);
+}
+function _getTypeScriptTypeStringForGbnfJsonSchema(schema, printedDefs = new Set(), defs = {}, defScopeDefs = new DefScopeDefs()) {
+    if (isGbnfJsonRefSchema(schema)) {
+        const currentDefs = joinDefs(defs, schema.$defs);
+        defScopeDefs.registerDefs(currentDefs);
+        const ref = schema?.$ref;
+        const referencePrefix = "#/$defs/";
+        if (ref == null || !ref.startsWith(referencePrefix))
+            return "any";
+        const defName = ref.slice(referencePrefix.length);
+        const def = currentDefs[defName];
+        if (def == null)
+            return "any";
+        else if (printedDefs.has(def)) {
+            return [
+                "/* ",
+                defName
+                    .replaceAll("\n", " ")
+                    .replaceAll("*/", "* /"),
+                " type */ any"
+            ].join("");
+        }
+        const scopeDefs = defScopeDefs.defScopeDefs.get([defName, def]);
+        if (scopeDefs == null)
+            return "any";
+        printedDefs.add(def);
+        return [
+            "/* Type: ",
+            defName
+                .replaceAll("\n", " ")
+                .replaceAll("*/", "* /"),
+            " */ ",
+            _getTypeScriptTypeStringForGbnfJsonSchema(def, printedDefs, scopeDefs, defScopeDefs)
+        ].join("");
+    }
+    else if (isGbnfJsonOneOfSchema(schema)) {
+        const currentDefs = joinDefs(defs, schema.$defs);
+        defScopeDefs.registerDefs(currentDefs);
         const values = schema.oneOf
-            .map((altSchema) => getTypeScriptTypeStringForGbnfJsonSchema(altSchema));
+            .map((altSchema) => _getTypeScriptTypeStringForGbnfJsonSchema(altSchema, printedDefs, currentDefs, defScopeDefs));
         return values.join(" | ");
     }
     else if (isGbnfJsonConstSchema(schema)) {
@@ -16,12 +55,14 @@ export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
             .join(" | ");
     }
     else if (isGbnfJsonObjectSchema(schema)) {
+        const currentDefs = joinDefs(defs, schema.$defs);
+        defScopeDefs.registerDefs(currentDefs);
         let addNewline = false;
         const valueTypes = Object.entries(schema.properties ?? {})
             .map(([propName, propSchema]) => {
             const escapedValue = JSON.stringify(propName) ?? "";
             const keyText = escapedValue.slice(1, -1) === propName ? propName : escapedValue;
-            const valueType = getTypeScriptTypeStringForGbnfJsonSchema(propSchema);
+            const valueType = _getTypeScriptTypeStringForGbnfJsonSchema(propSchema, printedDefs, currentDefs, defScopeDefs);
             if (keyText === "" || valueType === "")
                 return "";
             const mapping = keyText + ": " + valueType;
@@ -90,7 +131,7 @@ export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
             : schema.additionalProperties === true
                 ? "{[key: string]: any}"
                 : schema.additionalProperties != null
-                    ? ["{[key: string]: ", getTypeScriptTypeStringForGbnfJsonSchema(schema.additionalProperties), "}"].join("")
+                    ? ["{[key: string]: ", _getTypeScriptTypeStringForGbnfJsonSchema(schema.additionalProperties), "}"].join("")
                     : undefined;
         if (valueTypes.length === 0 && additionalPropertiesMapSyntax != null)
             return additionalPropertiesMapSyntax;
@@ -99,12 +140,14 @@ export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
         return knownPropertiesMapSyntax;
     }
     else if (isGbnfJsonArraySchema(schema)) {
+        const currentDefs = joinDefs(defs, schema.$defs);
+        defScopeDefs.registerDefs(currentDefs);
         if (schema.maxItems === 0)
             return "[]";
         if (schema.prefixItems != null && schema.prefixItems.length > 0) {
-            const valueTypes = schema.prefixItems.map((item) => getTypeScriptTypeStringForGbnfJsonSchema(item));
+            const valueTypes = schema.prefixItems.map((item) => _getTypeScriptTypeStringForGbnfJsonSchema(item));
             const restType = schema.items != null
-                ? getTypeScriptTypeStringForGbnfJsonSchema(schema.items)
+                ? _getTypeScriptTypeStringForGbnfJsonSchema(schema.items, printedDefs, currentDefs, defScopeDefs)
                 : "any";
             if (schema.minItems != null) {
                 for (let i = schema.prefixItems.length; i < Math.min(schema.prefixItems.length + maxTypeRepetition, schema.minItems); i++)
@@ -115,7 +158,7 @@ export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
             return "[" + valueTypes.join(", ") + "]";
         }
         else if (schema.items != null) {
-            const valuesType = getTypeScriptTypeStringForGbnfJsonSchema(schema.items);
+            const valuesType = _getTypeScriptTypeStringForGbnfJsonSchema(schema.items, printedDefs, currentDefs, defScopeDefs);
             if (valuesType === "")
                 return "[]";
             if (schema.minItems != null) {

package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js.map

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

package/dist/utils/isLockfileActive.js

@@ -2,11 +2,11 @@ import lockfile from "proper-lockfile";
 import { isLockActive } from "lifecycle-utils";
 import { lockfileLockScope } from "./withLockfile.js";
 export async function isLockfileActive({ resourcePath, staleDuration = 1000 * 10 }) {
-    if (isLockActive(lockfileLockScope, resourcePath))
+    if (isLockActive([lockfileLockScope, resourcePath]))
         return true;
     const lockfileActive = await lockfile.check(resourcePath, { stale: staleDuration, realpath: false });
     if (lockfileActive)
         return true;
-    return isLockActive(lockfileLockScope, resourcePath);
+    return isLockActive([lockfileLockScope, resourcePath]);
 }
 //# sourceMappingURL=isLockfileActive.js.map

package/dist/utils/isLockfileActive.js.map

@@ -1 +1 @@
-{"version":3,"file":"isLockfileActive.js","sourceRoot":"","sources":["../../src/utils/isLockfileActive.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAG1C;IACG,IAAI,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC;QAC7C,OAAO,IAAI,CAAC;IAEhB,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;IACnG,IAAI,cAAc;QACd,OAAO,IAAI,CAAC;IAEhB,OAAO,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;AACzD,CAAC"}
+{"version":3,"file":"isLockfileActive.js","sourceRoot":"","sources":["../../src/utils/isLockfileActive.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAG1C;IACG,IAAI,YAAY,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IAEhB,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;IACnG,IAAI,cAAc;QACd,OAAO,IAAI,CAAC;IAEhB,OAAO,YAAY,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;AAC3D,CAAC"}

package/dist/utils/utilTypes.d.ts

@@ -1,6 +1,16 @@
 export type Writable<T> = {
     -readonly [P in keyof T]: T[P];
 };
+/**
+ * Omit all the keys from `Value` that are not present in `Options` and are `true`.
+ *
+ * For example:
+ * ```ts
+ * type Value = {a: number, b: string, c: boolean};
+ * type Options = {a: true, b: false, c: true};
+ * type Result = PickOptions<Value, Options>; // {a: number, c: boolean}
+ * ```
+ */
 export type PickOptions<Value extends Readonly<Record<string, any>>, Options extends {
     readonly [key: string]: boolean | undefined;
 }> = Pick<Value, {

package/dist/utils/waitForLockfileRelease.js

@@ -3,12 +3,12 @@ import { isLockActive, waitForLockRelease } from "lifecycle-utils";
 import { lockfileLockScope } from "./withLockfile.js";
 export async function waitForLockfileRelease({ resourcePath, checkInterval = 1000 * 5.5, staleDuration = 1000 * 10 }) {
     while (true) {
-        if (isLockActive(lockfileLockScope, resourcePath)) {
-            await waitForLockRelease(lockfileLockScope, resourcePath);
+        if (isLockActive([lockfileLockScope, resourcePath])) {
+            await waitForLockRelease([lockfileLockScope, resourcePath]);
             continue;
         }
         const lockfileActive = await lockfile.check(resourcePath, { stale: staleDuration, realpath: false });
-        const lockIsActive = isLockActive(lockfileLockScope, resourcePath);
+        const lockIsActive = isLockActive([lockfileLockScope, resourcePath]);
         if (lockIsActive)
             continue;
         if (!lockfileActive)

package/dist/utils/waitForLockfileRelease.js.map

@@ -1 +1 @@
-{"version":3,"file":"waitForLockfileRelease.js","sourceRoot":"","sources":["../../src/utils/waitForLockfileRelease.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EACzC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,GAAG,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAGtE;IACG,OAAO,IAAI,EAAE,CAAC;QACV,IAAI,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,CAAC;YAChD,MAAM,kBAAkB,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;YAC1D,SAAS;QACb,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;QAEnE,IAAI,YAAY;YACZ,SAAS;QAEb,IAAI,CAAC,cAAc;YACf,OAAO;QAEX,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IACvE,CAAC;AACL,CAAC"}
+{"version":3,"file":"waitForLockfileRelease.js","sourceRoot":"","sources":["../../src/utils/waitForLockfileRelease.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,YAAY,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,EACzC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,GAAG,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAGtE;IACG,OAAO,IAAI,EAAE,CAAC;QACV,IAAI,YAAY,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC;YAClD,MAAM,kBAAkB,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;YAC5D,SAAS;QACb,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC,CAAC;QAErE,IAAI,YAAY;YACZ,SAAS;QAEb,IAAI,CAAC,cAAc;YACf,OAAO;QAEX,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IACvE,CAAC;AACL,CAAC"}

package/dist/utils/withLockfile.js

@@ -3,7 +3,7 @@ import { withLock } from "lifecycle-utils";
 import { getConsoleLogPrefix } from "./getConsoleLogPrefix.js";
 export const lockfileLockScope = {};
 export async function withLockfile({ resourcePath, staleDuration = 1000 * 10, updateInterval = staleDuration / 2, retries = 2 }, callback) {
-    return await withLock(lockfileLockScope, resourcePath, async () => {
+    return await withLock([lockfileLockScope, resourcePath], async () => {
         let releaseLock;
         let res;
         const lockPromise = lockfile.lock(resourcePath, {

package/dist/utils/withLockfile.js.map

@@ -1 +1 @@
-{"version":3,"file":"withLockfile.js","sourceRoot":"","sources":["../../src/utils/withLockfile.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,EACI,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAAE,cAAc,GAAG,aAAa,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAG3F,EACD,QAA8B;IAE9B,OAAO,MAAM,QAAQ,CAAC,iBAAiB,EAAE,YAAY,EAAE,KAAK,IAAI,EAAE;QAC9D,IAAI,WAAgC,CAAC;QACrC,IAAI,GAAM,CAAC;QAEX,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE;YAC5C,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,cAAc;YACtB,OAAO;YACP,QAAQ,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC;YACD,WAAW,GAAG,MAAM,WAAW,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,CAAC;gBACD,MAAM,WAAW,EAAE,CAAC;YACxB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YACnG,CAAC;YAED,MAAM,GAAG,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,MAAM,WAAW,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;QACd,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"withLockfile.js","sourceRoot":"","sources":["../../src/utils/withLockfile.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,MAAM,CAAC,KAAK,UAAU,YAAY,CAC9B,EACI,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,EAAE,EAAE,cAAc,GAAG,aAAa,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAG3F,EACD,QAA8B;IAE9B,OAAO,MAAM,QAAQ,CAAC,CAAC,iBAAiB,EAAE,YAAY,CAAC,EAAE,KAAK,IAAI,EAAE;QAChE,IAAI,WAAgC,CAAC;QACrC,IAAI,GAAM,CAAC;QAEX,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE;YAC5C,KAAK,EAAE,aAAa;YACpB,MAAM,EAAE,cAAc;YACtB,OAAO;YACP,QAAQ,EAAE,KAAK;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC;YACD,WAAW,GAAG,MAAM,WAAW,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,CAAC;gBACD,MAAM,WAAW,EAAE,CAAC;YACxB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YACnG,CAAC;YAED,MAAM,GAAG,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACD,MAAM,WAAW,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,mCAAmC,YAAY,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/F,MAAM,GAAG,CAAC;QACd,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;AACP,CAAC"}