node-llama-cpp 3.9.0 → 3.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bindings/Llama.d.ts +2 -2
- package/dist/bindings/Llama.js.map +1 -1
- package/dist/chatWrappers/QwenChatWrapper.js +5 -3
- package/dist/chatWrappers/QwenChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/JinjaTemplateChatWrapper.js.map +1 -1
- package/dist/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.js +80 -5
- package/dist/chatWrappers/generic/utils/extractFunctionCallSettingsFromJinjaTemplate.js.map +1 -1
- package/dist/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.js +25 -0
- package/dist/chatWrappers/generic/utils/extractSegmentSettingsFromTokenizerAndChatTemplate.js.map +1 -1
- package/dist/cli/commands/ChatCommand.js +1 -2
- package/dist/cli/commands/ChatCommand.js.map +1 -1
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js +23 -3
- package/dist/cli/commands/inspect/commands/InspectGgufCommand.js.map +1 -1
- package/dist/evaluator/LlamaChat/LlamaChat.js +26 -13
- package/dist/evaluator/LlamaChat/LlamaChat.js.map +1 -1
- package/dist/evaluator/LlamaChat/utils/FunctionCallParamsGrammar.js +1 -1
- package/dist/evaluator/LlamaChat/utils/FunctionCallParamsGrammar.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.d.ts +2 -0
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.js +7 -2
- package/dist/evaluator/LlamaChatSession/utils/LlamaChatSessionPromptCompletionEngine.js.map +1 -1
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.d.ts +5 -5
- package/dist/evaluator/LlamaChatSession/utils/defineChatSessionFunction.js.map +1 -1
- package/dist/evaluator/LlamaJsonSchemaGrammar.d.ts +3 -3
- package/dist/evaluator/LlamaJsonSchemaGrammar.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types.d.ts +2 -2
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.d.ts +9 -1
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.js +18 -0
- package/dist/utils/gbnfJson/GbnfGrammarGenerator.js.map +1 -1
- package/dist/utils/gbnfJson/GbnfTerminal.d.ts +2 -1
- package/dist/utils/gbnfJson/GbnfTerminal.js +17 -2
- package/dist/utils/gbnfJson/GbnfTerminal.js.map +1 -1
- package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.js +1 -1
- package/dist/utils/gbnfJson/getGbnfGrammarForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfGrammar.d.ts +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfGrammar.js +2 -2
- package/dist/utils/gbnfJson/terminals/GbnfGrammar.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfNumberValue.d.ts +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js +2 -2
- package/dist/utils/gbnfJson/terminals/GbnfNumberValue.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfOr.d.ts +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfOr.js +2 -2
- package/dist/utils/gbnfJson/terminals/GbnfOr.js.map +1 -1
- package/dist/utils/gbnfJson/terminals/GbnfRef.d.ts +15 -0
- package/dist/utils/gbnfJson/terminals/GbnfRef.js +34 -0
- package/dist/utils/gbnfJson/terminals/GbnfRef.js.map +1 -0
- package/dist/utils/gbnfJson/types.d.ts +51 -29
- package/dist/utils/gbnfJson/types.js +3 -0
- package/dist/utils/gbnfJson/types.js.map +1 -1
- package/dist/utils/gbnfJson/utils/defsScope.d.ts +7 -0
- package/dist/utils/gbnfJson/utils/defsScope.js +17 -0
- package/dist/utils/gbnfJson/utils/defsScope.js.map +1 -0
- package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.d.ts +1 -1
- package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js +48 -8
- package/dist/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.js.map +1 -1
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js +43 -14
- package/dist/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.js.map +1 -1
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js +51 -8
- package/dist/utils/getTypeScriptTypeStringForGbnfJsonSchema.js.map +1 -1
- package/llama/addon/AddonContext.cpp +5 -5
- package/llama/binariesGithubRelease.json +1 -1
- package/llama/gitRelease.bundle +0 -0
- package/llama/llama.cpp.info.json +1 -1
- package/package.json +13 -13
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { MultiKeyMap } from "lifecycle-utils";
|
|
2
|
+
export class DefScopeDefs {
|
|
3
|
+
defScopeDefs = new MultiKeyMap();
|
|
4
|
+
registerDefs(scopeDefs) {
|
|
5
|
+
for (const [defName, def] of Object.entries(scopeDefs))
|
|
6
|
+
this.defScopeDefs.set([defName, def], scopeDefs);
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
export function joinDefs(parent, current) {
|
|
10
|
+
if (current == null || Object.keys(current).length === 0)
|
|
11
|
+
return parent;
|
|
12
|
+
return {
|
|
13
|
+
...parent,
|
|
14
|
+
...current
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=defsScope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -2,4 +2,4 @@ import { GbnfTerminal } from "../GbnfTerminal.js";
|
|
|
2
2
|
import { GbnfGrammarGenerator } from "../GbnfGrammarGenerator.js";
|
|
3
3
|
import { GbnfJsonSchema } from "../types.js";
|
|
4
4
|
import { GbnfJsonScopeState } from "./GbnfJsonScopeState.js";
|
|
5
|
-
export declare function getGbnfJsonTerminalForGbnfJsonSchema(schema: GbnfJsonSchema, grammarGenerator: GbnfGrammarGenerator, scopeState?: GbnfJsonScopeState): GbnfTerminal;
|
|
5
|
+
export declare function getGbnfJsonTerminalForGbnfJsonSchema(schema: GbnfJsonSchema, grammarGenerator: GbnfGrammarGenerator, scopeState?: GbnfJsonScopeState, defs?: Record<string, GbnfJsonSchema>): GbnfTerminal;
|
|
@@ -6,16 +6,52 @@ import { GbnfString } from "../terminals/GbnfString.js";
|
|
|
6
6
|
import { GbnfNumber } from "../terminals/GbnfNumber.js";
|
|
7
7
|
import { GbnfBoolean } from "../terminals/GbnfBoolean.js";
|
|
8
8
|
import { GbnfNull } from "../terminals/GbnfNull.js";
|
|
9
|
-
import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema } from "../types.js";
|
|
9
|
+
import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema, isGbnfJsonRefSchema } from "../types.js";
|
|
10
10
|
import { getConsoleLogPrefix } from "../../getConsoleLogPrefix.js";
|
|
11
11
|
import { GbnfAnyJson } from "../terminals/GbnfAnyJson.js";
|
|
12
12
|
import { GbnfFormatString } from "../terminals/GbnfFormatString.js";
|
|
13
|
+
import { GbnfRef } from "../terminals/GbnfRef.js";
|
|
13
14
|
import { getGbnfJsonTerminalForLiteral } from "./getGbnfJsonTerminalForLiteral.js";
|
|
14
15
|
import { GbnfJsonScopeState } from "./GbnfJsonScopeState.js";
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
import { joinDefs } from "./defsScope.js";
|
|
17
|
+
const maxNestingScope = 512;
|
|
18
|
+
export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, scopeState = new GbnfJsonScopeState(), defs = {}) {
|
|
19
|
+
if (scopeState.currentNestingScope >= maxNestingScope)
|
|
20
|
+
throw new Error("Maximum nesting scope exceeded. Ensure that your schema does not have circular references or excessive nesting.");
|
|
21
|
+
if (isGbnfJsonRefSchema(schema)) {
|
|
22
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
23
|
+
grammarGenerator.registerDefs(currentDefs);
|
|
24
|
+
const ref = schema?.$ref;
|
|
25
|
+
const referencePrefix = "#/$defs/";
|
|
26
|
+
if (ref == null || !ref.startsWith(referencePrefix)) {
|
|
27
|
+
console.warn(getConsoleLogPrefix(true, false), `Reference "${ref}" does not start with "${referencePrefix}". ` +
|
|
28
|
+
'Using an "any" type instead of a reference.');
|
|
29
|
+
return new GbnfAnyJson(scopeState);
|
|
30
|
+
}
|
|
31
|
+
const defName = ref.slice(referencePrefix.length);
|
|
32
|
+
const def = currentDefs[defName];
|
|
33
|
+
if (def == null) {
|
|
34
|
+
console.warn(getConsoleLogPrefix(true, false), `Reference "${ref}" does not point to an existing definition. ` +
|
|
35
|
+
'Using an "any" type instead of a reference.');
|
|
36
|
+
return new GbnfAnyJson(scopeState);
|
|
37
|
+
}
|
|
38
|
+
return new GbnfRef({
|
|
39
|
+
getValueTerminal() {
|
|
40
|
+
const scopeDefs = grammarGenerator.defScopeDefs.get([defName, def]);
|
|
41
|
+
return getGbnfJsonTerminalForGbnfJsonSchema(def, grammarGenerator, new GbnfJsonScopeState({
|
|
42
|
+
allowNewLines: false,
|
|
43
|
+
scopePadSpaces: scopeState.settings.scopePadSpaces
|
|
44
|
+
}, 0), scopeDefs ?? {});
|
|
45
|
+
},
|
|
46
|
+
def,
|
|
47
|
+
defName
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
else if (isGbnfJsonOneOfSchema(schema)) {
|
|
51
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
52
|
+
grammarGenerator.registerDefs(currentDefs);
|
|
17
53
|
const values = schema.oneOf
|
|
18
|
-
.map((altSchema) => getGbnfJsonTerminalForGbnfJsonSchema(altSchema, grammarGenerator, scopeState));
|
|
54
|
+
.map((altSchema) => (getGbnfJsonTerminalForGbnfJsonSchema(altSchema, grammarGenerator, scopeState, currentDefs)));
|
|
19
55
|
return new GbnfOr(values);
|
|
20
56
|
}
|
|
21
57
|
else if (isGbnfJsonConstSchema(schema)) {
|
|
@@ -26,6 +62,8 @@ export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, s
|
|
|
26
62
|
}
|
|
27
63
|
else if (isGbnfJsonObjectSchema(schema)) {
|
|
28
64
|
const propertiesEntries = Object.entries(schema.properties ?? {});
|
|
65
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
66
|
+
grammarGenerator.registerDefs(currentDefs);
|
|
29
67
|
let maxProperties = schema.maxProperties;
|
|
30
68
|
if (schema.properties != null && maxProperties != null && maxProperties < propertiesEntries.length) {
|
|
31
69
|
console.warn(getConsoleLogPrefix(true, false), `maxProperties (${maxProperties}) must be greater than or equal to ` +
|
|
@@ -38,20 +76,22 @@ export function getGbnfJsonTerminalForGbnfJsonSchema(schema, grammarGenerator, s
|
|
|
38
76
|
return {
|
|
39
77
|
required: true,
|
|
40
78
|
key: new GbnfStringValue(propName),
|
|
41
|
-
value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator, scopeState.getForNewScope())
|
|
79
|
+
value: getGbnfJsonTerminalForGbnfJsonSchema(propSchema, grammarGenerator, scopeState.getForNewScope(), currentDefs)
|
|
42
80
|
};
|
|
43
81
|
}),
|
|
44
82
|
additionalProperties: (schema.additionalProperties == null || schema.additionalProperties === false)
|
|
45
83
|
? undefined
|
|
46
84
|
: schema.additionalProperties === true
|
|
47
85
|
? new GbnfAnyJson(scopeState.getForNewScope())
|
|
48
|
-
: getGbnfJsonTerminalForGbnfJsonSchema(schema.additionalProperties, grammarGenerator, scopeState.getForNewScope()),
|
|
86
|
+
: getGbnfJsonTerminalForGbnfJsonSchema(schema.additionalProperties, grammarGenerator, scopeState.getForNewScope(), currentDefs),
|
|
49
87
|
minProperties: schema.minProperties,
|
|
50
88
|
maxProperties,
|
|
51
89
|
scopeState
|
|
52
90
|
});
|
|
53
91
|
}
|
|
54
92
|
else if (isGbnfJsonArraySchema(schema)) {
|
|
93
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
94
|
+
grammarGenerator.registerDefs(currentDefs);
|
|
55
95
|
let maxItems = schema.maxItems;
|
|
56
96
|
if (schema.prefixItems != null && maxItems != null && maxItems < schema.prefixItems.length) {
|
|
57
97
|
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
|
|
|
61
101
|
return new GbnfArray({
|
|
62
102
|
items: schema.items == null
|
|
63
103
|
? undefined
|
|
64
|
-
: getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator, scopeState.getForNewScope()),
|
|
104
|
+
: getGbnfJsonTerminalForGbnfJsonSchema(schema.items, grammarGenerator, scopeState.getForNewScope(), currentDefs),
|
|
65
105
|
prefixItems: schema.prefixItems == null
|
|
66
106
|
? undefined
|
|
67
|
-
: schema.prefixItems.map((item) => (getGbnfJsonTerminalForGbnfJsonSchema(item, grammarGenerator, scopeState.getForNewScope()))),
|
|
107
|
+
: schema.prefixItems.map((item) => (getGbnfJsonTerminalForGbnfJsonSchema(item, grammarGenerator, scopeState.getForNewScope(), currentDefs))),
|
|
68
108
|
minItems: schema.minItems,
|
|
69
109
|
maxItems,
|
|
70
110
|
scopeState
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getGbnfJsonTerminalForGbnfJsonSchema.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAC,aAAa,EAAC,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,QAAQ,EAAC,MAAM,0BAA0B,CAAC;AAElD,OAAO,EACa,qBAAqB,EAAE,iCAAiC,EAAE,qBAAqB,EAAE,oBAAoB,EACrH,sBAAsB,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,4BAA4B,
|
|
1
|
+
{"version":3,"file":"getGbnfJsonTerminalForGbnfJsonSchema.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/getGbnfJsonTerminalForGbnfJsonSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { isGbnfJsonArraySchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema } from "../types.js";
|
|
1
|
+
import { isGbnfJsonArraySchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonBasicStringSchema, isGbnfJsonFormatStringSchema, isGbnfJsonRefSchema } from "../types.js";
|
|
2
|
+
import { DefScopeDefs, joinDefs } from "./defsScope.js";
|
|
2
3
|
export function validateObjectAgainstGbnfSchema(object, schema) {
|
|
3
4
|
try {
|
|
4
5
|
return validateObjectWithGbnfSchema(object, schema);
|
|
@@ -23,13 +24,15 @@ class TechnicalValidationError extends Error {
|
|
|
23
24
|
super(message);
|
|
24
25
|
}
|
|
25
26
|
}
|
|
26
|
-
function validateObjectWithGbnfSchema(object, schema) {
|
|
27
|
-
if (
|
|
28
|
-
return
|
|
27
|
+
function validateObjectWithGbnfSchema(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
|
|
28
|
+
if (isGbnfJsonRefSchema(schema))
|
|
29
|
+
return validateRef(object, schema, defs, defScopeDefs);
|
|
30
|
+
else if (isGbnfJsonArraySchema(schema))
|
|
31
|
+
return validateArray(object, schema, defs, defScopeDefs);
|
|
29
32
|
else if (isGbnfJsonObjectSchema(schema))
|
|
30
|
-
return validateObject(object, schema);
|
|
33
|
+
return validateObject(object, schema, defs, defScopeDefs);
|
|
31
34
|
else if (isGbnfJsonOneOfSchema(schema))
|
|
32
|
-
return validateOneOf(object, schema);
|
|
35
|
+
return validateOneOf(object, schema, defs, defScopeDefs);
|
|
33
36
|
else if (isGbnfJsonBasicStringSchema(schema))
|
|
34
37
|
return validateBasicString(object, schema);
|
|
35
38
|
else if (isGbnfJsonFormatStringSchema(schema))
|
|
@@ -49,7 +52,27 @@ function validateObjectWithGbnfSchema(object, schema) {
|
|
|
49
52
|
return true;
|
|
50
53
|
throw new TechnicalValidationError(`Expected type "${schema.type}" but got "${object === null ? "null" : typeof object}"`);
|
|
51
54
|
}
|
|
52
|
-
function
|
|
55
|
+
function validateRef(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
|
|
56
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
57
|
+
defScopeDefs.registerDefs(currentDefs);
|
|
58
|
+
const ref = schema.$ref;
|
|
59
|
+
const referencePrefix = "#/$defs/";
|
|
60
|
+
if (ref == null || !ref.startsWith(referencePrefix)) {
|
|
61
|
+
// if the $ref is invalid, a warning was already shows when the grammar was generated,
|
|
62
|
+
// so we don't perform validation on the object as it's considered an "any" type
|
|
63
|
+
return true;
|
|
64
|
+
}
|
|
65
|
+
const defName = ref.slice(referencePrefix.length);
|
|
66
|
+
const def = currentDefs[defName];
|
|
67
|
+
if (def == null) {
|
|
68
|
+
// if the $ref points to a non-existing def, a warning was already shows when the grammar was generated,
|
|
69
|
+
// so we don't perform validation on the object as it's considered an "any" type
|
|
70
|
+
return true;
|
|
71
|
+
}
|
|
72
|
+
const scopeDefs = defScopeDefs.defScopeDefs.get([defName, def]);
|
|
73
|
+
return validateObjectWithGbnfSchema(object, def, scopeDefs ?? {}, defScopeDefs);
|
|
74
|
+
}
|
|
75
|
+
function validateArray(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
|
|
53
76
|
if (!(object instanceof Array))
|
|
54
77
|
throw new TechnicalValidationError(`Expected an array but got "${typeof object}"`);
|
|
55
78
|
const minItems = Math.max(schema.minItems ?? 0, schema.prefixItems?.length ?? 0);
|
|
@@ -68,22 +91,26 @@ function validateArray(object, schema) {
|
|
|
68
91
|
}
|
|
69
92
|
let res = true;
|
|
70
93
|
let index = 0;
|
|
94
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
95
|
+
defScopeDefs.registerDefs(currentDefs);
|
|
71
96
|
if (schema.prefixItems != null) {
|
|
72
97
|
for (const item of schema.prefixItems) {
|
|
73
|
-
res &&= validateObjectWithGbnfSchema(object[index], item);
|
|
98
|
+
res &&= validateObjectWithGbnfSchema(object[index], item, currentDefs, defScopeDefs);
|
|
74
99
|
index++;
|
|
75
100
|
}
|
|
76
101
|
}
|
|
77
102
|
if (schema.items != null) {
|
|
78
103
|
for (; index < object.length; index++)
|
|
79
|
-
res &&= validateObjectWithGbnfSchema(object[index], schema.items);
|
|
104
|
+
res &&= validateObjectWithGbnfSchema(object[index], schema.items, currentDefs, defScopeDefs);
|
|
80
105
|
}
|
|
81
106
|
return res;
|
|
82
107
|
}
|
|
83
|
-
function validateObject(object, schema) {
|
|
108
|
+
function validateObject(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
|
|
84
109
|
if (typeof object !== "object" || object === null)
|
|
85
110
|
throw new TechnicalValidationError(`Expected an object but got "${typeof object}"`);
|
|
86
111
|
let res = true;
|
|
112
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
113
|
+
defScopeDefs.registerDefs(currentDefs);
|
|
87
114
|
const objectKeys = Object.keys(object);
|
|
88
115
|
const objectKeysSet = new Set(objectKeys);
|
|
89
116
|
const schemaKeys = Object.keys(schema.properties ?? {});
|
|
@@ -98,14 +125,14 @@ function validateObject(object, schema) {
|
|
|
98
125
|
throw new TechnicalValidationError(`Unexpected keys: ${extraKeys.map((key) => JSON.stringify(key)).join(", ")}`);
|
|
99
126
|
else if (schema.additionalProperties !== true) {
|
|
100
127
|
for (const key of extraKeys)
|
|
101
|
-
res &&= validateObjectWithGbnfSchema(object[key], schema.additionalProperties);
|
|
128
|
+
res &&= validateObjectWithGbnfSchema(object[key], schema.additionalProperties, currentDefs, defScopeDefs);
|
|
102
129
|
}
|
|
103
130
|
}
|
|
104
131
|
const missingKeys = schemaKeys.filter((key) => !objectKeysSet.has(key));
|
|
105
132
|
if (missingKeys.length > 0)
|
|
106
133
|
throw new TechnicalValidationError(`Missing keys: ${missingKeys.map((key) => JSON.stringify(key)).join(", ")}`);
|
|
107
134
|
for (const key of schemaKeys)
|
|
108
|
-
res &&= validateObjectWithGbnfSchema(object[key], schema.properties[key]);
|
|
135
|
+
res &&= validateObjectWithGbnfSchema(object[key], schema.properties[key], currentDefs, defScopeDefs);
|
|
109
136
|
if (schema.additionalProperties != null && schema.additionalProperties !== false) {
|
|
110
137
|
if (objectKeys.length < minProperties) {
|
|
111
138
|
if (maxProperties != null && minProperties === maxProperties)
|
|
@@ -120,10 +147,12 @@ function validateObject(object, schema) {
|
|
|
120
147
|
}
|
|
121
148
|
return res;
|
|
122
149
|
}
|
|
123
|
-
function validateOneOf(object, schema) {
|
|
150
|
+
function validateOneOf(object, schema, defs = {}, defScopeDefs = new DefScopeDefs()) {
|
|
151
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
152
|
+
defScopeDefs.registerDefs(currentDefs);
|
|
124
153
|
for (const item of schema.oneOf) {
|
|
125
154
|
try {
|
|
126
|
-
return validateObjectWithGbnfSchema(object, item);
|
|
155
|
+
return validateObjectWithGbnfSchema(object, item, currentDefs, defScopeDefs);
|
|
127
156
|
}
|
|
128
157
|
catch (err) {
|
|
129
158
|
if (err instanceof TechnicalValidationError)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateObjectAgainstGbnfSchema.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"validateObjectAgainstGbnfSchema.js","sourceRoot":"","sources":["../../../../src/utils/gbnfJson/utils/validateObjectAgainstGbnfSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAEuG,qBAAqB,EAC/H,qBAAqB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,2BAA2B,EACvH,4BAA4B,EAAE,mBAAmB,EACpD,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,YAAY,EAAE,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAKtD,MAAM,UAAU,+BAA+B,CAA2B,MAAW,EAAE,MAAS;IAC5F,IAAI,CAAC;QACD,OAAO,4BAA4B,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,IAAI,GAAG,YAAY,wBAAwB;YACvC,MAAM,IAAI,8BAA8B,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAE1E,MAAM,GAAG,CAAC;IACd,CAAC;AACL,CAAC;AAED,MAAM,OAAO,8BAA+B,SAAQ,KAAK;IACrC,MAAM,CAAM;IACZ,MAAM,CAAiB;IAEvC,YAAmB,OAAe,EAAE,MAAW,EAAE,MAAsB;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;CACJ;AAED,MAAM,wBAAyB,SAAQ,KAAK;IACxC,YAAmB,OAAe;QAC9B,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;CACJ;AAED,SAAS,4BAA4B,CACjC,MAAW,EACX,MAAS,EACT,OAAuC,EAAE,EACzC,eAA6B,IAAI,YAAY,EAAE;IAE/C,IAAI,mBAAmB,CAAC,MAAM,CAAC;QAC3B,OAAO,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;SACtD,IAAI,qBAAqB,CAAC,MAAM,CAAC;QAClC,OAAO,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;SACxD,IAAI,sBAAsB,CAAC,MAAM,CAAC;QACnC,OAAO,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;SACzD,IAAI,qBAAqB,CAAC,MAAM,CAAC;QAClC,OAAO,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;SACxD,IAAI,2BAA2B,CAAC,MAAM,CAAC;QACxC,OAAO,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAC1C,IAAI,4BAA4B,CAAC,MAAM,CAAC;QACzC,OAAO,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAC3C,IAAI,oBAAoB,CAAC,MAAM,CAAC;QACjC,OAAO,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACnC,IAAI,qBAAqB,CAAC,MAAM,CAAC;QAClC,OAAO,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEzC,IAAI,MAAM,CAAC,IAAI,YAAY,KAAK,EAAE,CAAC;QAC/B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAC7B,IAAI,qBAAqB,CAAC,MAAM,EAAE,IAAI,CAAC;gBACnC,OAAO,IAAI,CAAC;QACpB,CAAC;QAED,MAAM,IAAI,wBAAwB,CAAC,yBAC/B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAC7D,mBAAmB,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,MAAM,GAAG,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,qBAAqB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC;QAC1C,OAAO,IAAI,CAAC;IAEhB,MAAM,IAAI,wBAAwB,CAAC,kBAAkB,MAAM,CAAC,IAAI,cAAc,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,MAAM,GAAG,CAAC,CAAC;AAC/H,CAAC;AAED,SAAS,WAAW,CAChB,MAAW,EACX,MAAS,EACT,OAAuC,EAAE,EACzC,eAA6B,IAAI,YAAY,EAAE;IAE/C,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEvC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC;IACxB,MAAM,eAAe,GAAG,UAAU,CAAC;IAEnC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAClD,sFAAsF;QACtF,gFAAgF;QAChF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACjC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACd,wGAAwG;QACxG,gFAAgF;QAChF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;IAChE,OAAO,4BAA4B,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,IAAI,EAAE,EAAE,YAAY,CAAC,CAAC;AACpF,CAAC;AAED,SAAS,aAAa,CAClB,MAAW,EACX,MAAS,EACT,OAAuC,EAAE,EACzC,eAA6B,IAAI,YAAY,EAAE;IAE/C,IAAI,CAAC,CAAC,MAAM,YAAY,KAAK,CAAC;QAC1B,MAAM,IAAI,wBAAwB,CAAC,8BAA8B,OAAO,MAAM,GAAG,CAAC,CAAC;IAEvF,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;IACjF,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,IAAI;QACpC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE1C,IAAI,MAAM,CAAC,MAAM,GAAG,QAAQ,EAAE,CAAC;QAC3B,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,KAAK,QAAQ;YACzC,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,QAAQ,kBAAkB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAEtG,MAAM,IAAI,wBAAwB,CAAC,qBAAqB,QAAQ,kBAAkB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACvG,CAAC;SAAM,IAAI,QAAQ,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,GAAG,QAAQ,EAAE,CAAC;QACtD,IAAI,QAAQ,KAAK,QAAQ;YACrB,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,QAAQ,kBAAkB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAEtG,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,QAAQ,kBAAkB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACtG,CAAC;IAED,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEvC,IAAI,MAAM,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;QAC7B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACpC,GAAG,KAAK,4BAA4B,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;YACrF,KAAK,EAAE,CAAC;QACZ,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE;YACjC,GAAG,KAAK,4BAA4B,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IACrG,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CACnB,MAAW,EACX,MAAS,EACT,OAAuC,EAAE,EACzC,eAA6B,IAAI,YAAY,EAAE;IAE/C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;QAC7C,MAAM,IAAI,wBAAwB,CAAC,+BAA+B,OAAO,MAAM,GAAG,CAAC,CAAC;IAExF,IAAI,GAAG,GAAG,IAAI,CAAC;IAEf,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEvC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAE1C,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,IAAI;QAC9C,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAEpD,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACtE,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,IAAI,MAAM,CAAC,oBAAoB,IAAI,IAAI,IAAI,MAAM,CAAC,oBAAoB,KAAK,KAAK;YAC5E,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAChH,IAAI,MAAM,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;YAC5C,KAAK,MAAM,GAAG,IAAI,SAAS;gBACvB,GAAG,KAAK,4BAA4B,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,oBAAoB,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QAClH,CAAC;IACL,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IACxE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC;QACtB,MAAM,IAAI,wBAAwB,CAAC,iBAAiB,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEpH,KAAK,MAAM,GAAG,IAAI,UAAU;QACxB,GAAG,KAAK,4BAA4B,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAW,CAAC,GAAG,CAAE,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IAE3G,IAAI,MAAM,CAAC,oBAAoB,IAAI,IAAI,IAAI,MAAM,CAAC,oBAAoB,KAAK,KAAK,EAAE,CAAC;QAC/E,IAAI,UAAU,CAAC,MAAM,GAAG,aAAa,EAAE,CAAC;YACpC,IAAI,aAAa,IAAI,IAAI,IAAI,aAAa,KAAK,aAAa;gBACxD,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,aAAa,uBAAuB,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAEpH,MAAM,IAAI,wBAAwB,CAAC,qBAAqB,aAAa,uBAAuB,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QACrH,CAAC;aAAM,IAAI,aAAa,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,aAAa,EAAE,CAAC;YACpE,IAAI,aAAa,KAAK,aAAa;gBAC/B,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,aAAa,uBAAuB,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;YAEpH,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,aAAa,uBAAuB,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QACpH,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAED,SAAS,aAAa,CAClB,MAAW,EACX,MAAS,EACT,OAAuC,EAAE,EACzC,eAA6B,IAAI,YAAY,EAAE;IAE/C,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IACjD,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;IAEvC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,CAAC;YACD,OAAO,4BAA4B,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QACjF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,GAAG,YAAY,wBAAwB;gBACvC,SAAS;YAEb,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAED,MAAM,IAAI,wBAAwB,CAAC,mBAAmB,MAAM,CAAC,KAAK,CAAC,MAAM,oBAAoB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3H,CAAC;AAED,SAAS,mBAAmB,CAAsC,MAAW,EAAE,MAAS;IACpF,IAAI,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,IAAI,wBAAwB,CAAC,kBAAkB,MAAM,CAAC,IAAI,cAAc,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,MAAM,GAAG,CAAC,CAAC;IAE/H,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,IAAI;QACtC,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAE5C,IAAI,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;QAC5B,IAAI,SAAS,KAAK,SAAS;YACvB,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,SAAS,uBAAuB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAE5G,MAAM,IAAI,wBAAwB,CAAC,qBAAqB,SAAS,uBAAuB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7G,CAAC;SAAM,IAAI,SAAS,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;QACxD,IAAI,SAAS,KAAK,SAAS;YACvB,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,SAAS,uBAAuB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QAE5G,MAAM,IAAI,wBAAwB,CAAC,oBAAoB,SAAS,uBAAuB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5G,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,SAAS,GAAG,+CAA+C,CAAC;AAClE,MAAM,SAAS,GAAG,mFAAmF,CAAC;AACtG,MAAM,aAAa,GACf,+HAA+H,CAAC;AAEpI,SAAS,oBAAoB,CAAuC,MAAW,EAAE,MAAS;IACtF,IAAI,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,IAAI,wBAAwB,CAAC,kBAAkB,MAAM,CAAC,IAAI,cAAc,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,MAAM,GAAG,CAAC,CAAC;IAE/H,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI;YAC/B,OAAO,IAAI,CAAC;QAEhB,MAAM,IAAI,wBAAwB,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzG,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAClC,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI;YAC/B,OAAO,IAAI,CAAC;QAEhB,MAAM,IAAI,wBAAwB,CAAC,wCAAwC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzG,CAAC;SAAM,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QACvC,IAAI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI;YACnC,OAAO,IAAI,CAAC;QAEhB,MAAM,IAAI,wBAAwB,CAAC,6CAA6C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC9G,CAAC;IAED,MAAM,IAAI,wBAAwB,CAAC,mBAAmB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,YAAY,CAA+B,MAAW,EAAE,MAAS;IACtE,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,MAAM,KAAK,KAAK;YAChB,OAAO,IAAI,CAAC;IACpB,CAAC;IAED,MAAM,IAAI,wBAAwB,CAAC,oBAC/B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAC7D,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,aAAa,CAAgC,MAAW,EAAE,MAAS;IACxE,IAAI,MAAM,KAAK,MAAM,CAAC,KAAK;QACvB,OAAO,IAAI,CAAC;IAEhB,MAAM,IAAI,wBAAwB,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACrH,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAU,EAAE,IAAiC;IACxE,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpB,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;IACrC,CAAC;SAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC3B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;IACrC,CAAC;SAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ;YACzB,OAAO,KAAK,CAAC;QACjB,OAAO,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;SAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO,OAAO,KAAK,KAAK,SAAS,CAAC;IACtC,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,KAAK,KAAK,IAAI,CAAC;IAC1B,CAAC;SAAM,CAAC;QACJ,KAAM,IAAqB,CAAC;IAChC,CAAC;IAED,MAAM,IAAI,wBAAwB,CAAC,0BAA0B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACzF,CAAC"}
|
|
@@ -1,9 +1,48 @@
|
|
|
1
|
-
import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonBasicStringSchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonFormatStringSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema } from "./gbnfJson/types.js";
|
|
1
|
+
import { isGbnfJsonArraySchema, isGbnfJsonBasicSchemaIncludesType, isGbnfJsonBasicStringSchema, isGbnfJsonConstSchema, isGbnfJsonEnumSchema, isGbnfJsonFormatStringSchema, isGbnfJsonObjectSchema, isGbnfJsonOneOfSchema, isGbnfJsonRefSchema } from "./gbnfJson/types.js";
|
|
2
|
+
import { DefScopeDefs, joinDefs } from "./gbnfJson/utils/defsScope.js";
|
|
2
3
|
const maxTypeRepetition = 10;
|
|
3
4
|
export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
|
|
4
|
-
|
|
5
|
+
return _getTypeScriptTypeStringForGbnfJsonSchema(schema);
|
|
6
|
+
}
|
|
7
|
+
function _getTypeScriptTypeStringForGbnfJsonSchema(schema, printedDefs = new Set(), defs = {}, defScopeDefs = new DefScopeDefs()) {
|
|
8
|
+
if (isGbnfJsonRefSchema(schema)) {
|
|
9
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
10
|
+
defScopeDefs.registerDefs(currentDefs);
|
|
11
|
+
const ref = schema?.$ref;
|
|
12
|
+
const referencePrefix = "#/$defs/";
|
|
13
|
+
if (ref == null || !ref.startsWith(referencePrefix))
|
|
14
|
+
return "any";
|
|
15
|
+
const defName = ref.slice(referencePrefix.length);
|
|
16
|
+
const def = currentDefs[defName];
|
|
17
|
+
if (def == null)
|
|
18
|
+
return "any";
|
|
19
|
+
else if (printedDefs.has(def)) {
|
|
20
|
+
return [
|
|
21
|
+
"/* ",
|
|
22
|
+
defName
|
|
23
|
+
.replaceAll("\n", " ")
|
|
24
|
+
.replaceAll("*/", "* /"),
|
|
25
|
+
" type */ any"
|
|
26
|
+
].join("");
|
|
27
|
+
}
|
|
28
|
+
const scopeDefs = defScopeDefs.defScopeDefs.get([defName, def]);
|
|
29
|
+
if (scopeDefs == null)
|
|
30
|
+
return "any";
|
|
31
|
+
printedDefs.add(def);
|
|
32
|
+
return [
|
|
33
|
+
"/* Type: ",
|
|
34
|
+
defName
|
|
35
|
+
.replaceAll("\n", " ")
|
|
36
|
+
.replaceAll("*/", "* /"),
|
|
37
|
+
" */ ",
|
|
38
|
+
_getTypeScriptTypeStringForGbnfJsonSchema(def, printedDefs, scopeDefs, defScopeDefs)
|
|
39
|
+
].join("");
|
|
40
|
+
}
|
|
41
|
+
else if (isGbnfJsonOneOfSchema(schema)) {
|
|
42
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
43
|
+
defScopeDefs.registerDefs(currentDefs);
|
|
5
44
|
const values = schema.oneOf
|
|
6
|
-
.map((altSchema) =>
|
|
45
|
+
.map((altSchema) => _getTypeScriptTypeStringForGbnfJsonSchema(altSchema, printedDefs, currentDefs, defScopeDefs));
|
|
7
46
|
return values.join(" | ");
|
|
8
47
|
}
|
|
9
48
|
else if (isGbnfJsonConstSchema(schema)) {
|
|
@@ -16,12 +55,14 @@ export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
|
|
|
16
55
|
.join(" | ");
|
|
17
56
|
}
|
|
18
57
|
else if (isGbnfJsonObjectSchema(schema)) {
|
|
58
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
59
|
+
defScopeDefs.registerDefs(currentDefs);
|
|
19
60
|
let addNewline = false;
|
|
20
61
|
const valueTypes = Object.entries(schema.properties ?? {})
|
|
21
62
|
.map(([propName, propSchema]) => {
|
|
22
63
|
const escapedValue = JSON.stringify(propName) ?? "";
|
|
23
64
|
const keyText = escapedValue.slice(1, -1) === propName ? propName : escapedValue;
|
|
24
|
-
const valueType =
|
|
65
|
+
const valueType = _getTypeScriptTypeStringForGbnfJsonSchema(propSchema, printedDefs, currentDefs, defScopeDefs);
|
|
25
66
|
if (keyText === "" || valueType === "")
|
|
26
67
|
return "";
|
|
27
68
|
const mapping = keyText + ": " + valueType;
|
|
@@ -90,7 +131,7 @@ export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
|
|
|
90
131
|
: schema.additionalProperties === true
|
|
91
132
|
? "{[key: string]: any}"
|
|
92
133
|
: schema.additionalProperties != null
|
|
93
|
-
? ["{[key: string]: ",
|
|
134
|
+
? ["{[key: string]: ", _getTypeScriptTypeStringForGbnfJsonSchema(schema.additionalProperties), "}"].join("")
|
|
94
135
|
: undefined;
|
|
95
136
|
if (valueTypes.length === 0 && additionalPropertiesMapSyntax != null)
|
|
96
137
|
return additionalPropertiesMapSyntax;
|
|
@@ -99,12 +140,14 @@ export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
|
|
|
99
140
|
return knownPropertiesMapSyntax;
|
|
100
141
|
}
|
|
101
142
|
else if (isGbnfJsonArraySchema(schema)) {
|
|
143
|
+
const currentDefs = joinDefs(defs, schema.$defs);
|
|
144
|
+
defScopeDefs.registerDefs(currentDefs);
|
|
102
145
|
if (schema.maxItems === 0)
|
|
103
146
|
return "[]";
|
|
104
147
|
if (schema.prefixItems != null && schema.prefixItems.length > 0) {
|
|
105
|
-
const valueTypes = schema.prefixItems.map((item) =>
|
|
148
|
+
const valueTypes = schema.prefixItems.map((item) => _getTypeScriptTypeStringForGbnfJsonSchema(item));
|
|
106
149
|
const restType = schema.items != null
|
|
107
|
-
?
|
|
150
|
+
? _getTypeScriptTypeStringForGbnfJsonSchema(schema.items, printedDefs, currentDefs, defScopeDefs)
|
|
108
151
|
: "any";
|
|
109
152
|
if (schema.minItems != null) {
|
|
110
153
|
for (let i = schema.prefixItems.length; i < Math.min(schema.prefixItems.length + maxTypeRepetition, schema.minItems); i++)
|
|
@@ -115,7 +158,7 @@ export function getTypeScriptTypeStringForGbnfJsonSchema(schema) {
|
|
|
115
158
|
return "[" + valueTypes.join(", ") + "]";
|
|
116
159
|
}
|
|
117
160
|
else if (schema.items != null) {
|
|
118
|
-
const valuesType =
|
|
161
|
+
const valuesType = _getTypeScriptTypeStringForGbnfJsonSchema(schema.items, printedDefs, currentDefs, defScopeDefs);
|
|
119
162
|
if (valuesType === "")
|
|
120
163
|
return "[]";
|
|
121
164
|
if (schema.minItems != null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getTypeScriptTypeStringForGbnfJsonSchema.js","sourceRoot":"","sources":["../../src/utils/getTypeScriptTypeStringForGbnfJsonSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EACa,qBAAqB,EAAE,iCAAiC,EAAE,2BAA2B,EAAE,qBAAqB,EAC5H,oBAAoB,EAAE,4BAA4B,EAAE,sBAAsB,EAAE,qBAAqB,
|
|
1
|
+
{"version":3,"file":"getTypeScriptTypeStringForGbnfJsonSchema.js","sourceRoot":"","sources":["../../src/utils/getTypeScriptTypeStringForGbnfJsonSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -587,7 +587,7 @@ Napi::Value AddonContext::DisposeSequence(const Napi::CallbackInfo& info) {
|
|
|
587
587
|
|
|
588
588
|
int32_t sequenceId = info[0].As<Napi::Number>().Int32Value();
|
|
589
589
|
|
|
590
|
-
bool result =
|
|
590
|
+
bool result = llama_memory_seq_rm(llama_get_memory(ctx), sequenceId, -1, -1);
|
|
591
591
|
|
|
592
592
|
if (!result) {
|
|
593
593
|
Napi::Error::New(info.Env(), "Failed to dispose sequence").ThrowAsJavaScriptException();
|
|
@@ -606,7 +606,7 @@ Napi::Value AddonContext::RemoveTokenCellsFromSequence(const Napi::CallbackInfo&
|
|
|
606
606
|
int32_t startPos = info[1].As<Napi::Number>().Int32Value();
|
|
607
607
|
int32_t endPos = info[2].As<Napi::Number>().Int32Value();
|
|
608
608
|
|
|
609
|
-
bool result =
|
|
609
|
+
bool result = llama_memory_seq_rm(llama_get_memory(ctx), sequenceId, startPos, endPos);
|
|
610
610
|
|
|
611
611
|
return Napi::Boolean::New(info.Env(), result);
|
|
612
612
|
}
|
|
@@ -621,7 +621,7 @@ Napi::Value AddonContext::ShiftSequenceTokenCells(const Napi::CallbackInfo& info
|
|
|
621
621
|
int32_t endPos = info[2].As<Napi::Number>().Int32Value();
|
|
622
622
|
int32_t shiftDelta = info[3].As<Napi::Number>().Int32Value();
|
|
623
623
|
|
|
624
|
-
|
|
624
|
+
llama_memory_seq_add(llama_get_memory(ctx), sequenceId, startPos, endPos, shiftDelta);
|
|
625
625
|
|
|
626
626
|
return info.Env().Undefined();
|
|
627
627
|
}
|
|
@@ -634,7 +634,7 @@ Napi::Value AddonContext::GetSequenceKvCacheMinPosition(const Napi::CallbackInfo
|
|
|
634
634
|
int32_t sequenceId = info[0].As<Napi::Number>().Int32Value();
|
|
635
635
|
|
|
636
636
|
|
|
637
|
-
const auto minPosition =
|
|
637
|
+
const auto minPosition = llama_memory_seq_pos_min(llama_get_memory(ctx), sequenceId);
|
|
638
638
|
|
|
639
639
|
return Napi::Number::New(info.Env(), minPosition);
|
|
640
640
|
}
|
|
@@ -647,7 +647,7 @@ Napi::Value AddonContext::GetSequenceKvCacheMaxPosition(const Napi::CallbackInfo
|
|
|
647
647
|
int32_t sequenceId = info[0].As<Napi::Number>().Int32Value();
|
|
648
648
|
|
|
649
649
|
|
|
650
|
-
const auto maxPosition =
|
|
650
|
+
const auto maxPosition = llama_memory_seq_pos_max(llama_get_memory(ctx), sequenceId);
|
|
651
651
|
|
|
652
652
|
return Napi::Number::New(info.Env(), maxPosition);
|
|
653
653
|
}
|
package/llama/gitRelease.bundle
CHANGED
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-llama-cpp",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.10.0",
|
|
4
4
|
"description": "Run AI models locally on your machine with node.js bindings for llama.cpp. Enforce a JSON schema on the model output on the generation level",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -197,7 +197,7 @@
|
|
|
197
197
|
"ignore": "^7.0.4",
|
|
198
198
|
"ipull": "^3.9.2",
|
|
199
199
|
"is-unicode-supported": "^2.1.0",
|
|
200
|
-
"lifecycle-utils": "^2.0.
|
|
200
|
+
"lifecycle-utils": "^2.0.1",
|
|
201
201
|
"log-symbols": "^7.0.0",
|
|
202
202
|
"nanoid": "^5.1.5",
|
|
203
203
|
"node-addon-api": "^8.3.1",
|
|
@@ -223,16 +223,16 @@
|
|
|
223
223
|
}
|
|
224
224
|
},
|
|
225
225
|
"optionalDependencies": {
|
|
226
|
-
"@node-llama-cpp/linux-arm64": "3.
|
|
227
|
-
"@node-llama-cpp/linux-armv7l": "3.
|
|
228
|
-
"@node-llama-cpp/linux-x64": "3.
|
|
229
|
-
"@node-llama-cpp/linux-x64-cuda": "3.
|
|
230
|
-
"@node-llama-cpp/linux-x64-vulkan": "3.
|
|
231
|
-
"@node-llama-cpp/mac-arm64-metal": "3.
|
|
232
|
-
"@node-llama-cpp/mac-x64": "3.
|
|
233
|
-
"@node-llama-cpp/win-arm64": "3.
|
|
234
|
-
"@node-llama-cpp/win-x64": "3.
|
|
235
|
-
"@node-llama-cpp/win-x64-cuda": "3.
|
|
236
|
-
"@node-llama-cpp/win-x64-vulkan": "3.
|
|
226
|
+
"@node-llama-cpp/linux-arm64": "3.10.0",
|
|
227
|
+
"@node-llama-cpp/linux-armv7l": "3.10.0",
|
|
228
|
+
"@node-llama-cpp/linux-x64": "3.10.0",
|
|
229
|
+
"@node-llama-cpp/linux-x64-cuda": "3.10.0",
|
|
230
|
+
"@node-llama-cpp/linux-x64-vulkan": "3.10.0",
|
|
231
|
+
"@node-llama-cpp/mac-arm64-metal": "3.10.0",
|
|
232
|
+
"@node-llama-cpp/mac-x64": "3.10.0",
|
|
233
|
+
"@node-llama-cpp/win-arm64": "3.10.0",
|
|
234
|
+
"@node-llama-cpp/win-x64": "3.10.0",
|
|
235
|
+
"@node-llama-cpp/win-x64-cuda": "3.10.0",
|
|
236
|
+
"@node-llama-cpp/win-x64-vulkan": "3.10.0"
|
|
237
237
|
}
|
|
238
238
|
}
|