@llumiverse/core 0.22.0-dev.1 → 0.22.1
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/lib/cjs/Driver.js +23 -5
- package/lib/cjs/Driver.js.map +1 -1
- package/lib/cjs/json.js +3 -174
- package/lib/cjs/json.js.map +1 -1
- package/lib/cjs/validation.js +19 -3
- package/lib/cjs/validation.js.map +1 -1
- package/lib/esm/Driver.js +23 -5
- package/lib/esm/Driver.js.map +1 -1
- package/lib/esm/json.js +3 -172
- package/lib/esm/json.js.map +1 -1
- package/lib/esm/validation.js +19 -3
- package/lib/esm/validation.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/Driver.d.ts.map +1 -1
- package/lib/types/json.d.ts +0 -13
- package/lib/types/json.d.ts.map +1 -1
- package/lib/types/validation.d.ts.map +1 -1
- package/package.json +87 -86
- package/src/json.ts +3 -168
- package/src/validation.ts +21 -3
package/lib/cjs/Driver.js
CHANGED
|
@@ -11,11 +11,28 @@ const CompletionStream_js_1 = require("./CompletionStream.js");
|
|
|
11
11
|
const index_js_1 = require("./formatters/index.js");
|
|
12
12
|
const common_1 = require("@llumiverse/common");
|
|
13
13
|
const validation_js_1 = require("./validation.js");
|
|
14
|
+
// Helper to create logger methods that support both message-only and object-first signatures
|
|
15
|
+
function createConsoleLoggerMethod(consoleMethod) {
|
|
16
|
+
return ((objOrMsg, msgOrNever, ...args) => {
|
|
17
|
+
if (typeof objOrMsg === 'string') {
|
|
18
|
+
// Message-only: logger.info("message", ...args)
|
|
19
|
+
consoleMethod(objOrMsg, msgOrNever, ...args);
|
|
20
|
+
}
|
|
21
|
+
else if (msgOrNever !== undefined) {
|
|
22
|
+
// Object-first: logger.info({ obj }, "message", ...args)
|
|
23
|
+
consoleMethod(msgOrNever, objOrMsg, ...args);
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
// Object-only: logger.info({ obj })
|
|
27
|
+
consoleMethod(objOrMsg, ...args);
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
}
|
|
14
31
|
const ConsoleLogger = {
|
|
15
|
-
debug: console.debug,
|
|
16
|
-
info: console.info,
|
|
17
|
-
warn: console.warn,
|
|
18
|
-
error: console.error,
|
|
32
|
+
debug: createConsoleLoggerMethod(console.debug.bind(console)),
|
|
33
|
+
info: createConsoleLoggerMethod(console.info.bind(console)),
|
|
34
|
+
warn: createConsoleLoggerMethod(console.warn.bind(console)),
|
|
35
|
+
error: createConsoleLoggerMethod(console.error.bind(console)),
|
|
19
36
|
};
|
|
20
37
|
const noop = () => void 0;
|
|
21
38
|
const NoopLogger = {
|
|
@@ -67,7 +84,8 @@ class AbstractDriver {
|
|
|
67
84
|
result.result = (0, validation_js_1.validateResult)(result.result, options.result_schema);
|
|
68
85
|
}
|
|
69
86
|
catch (error) {
|
|
70
|
-
|
|
87
|
+
const errorMessage = `[${this.provider}] [${options.model}] ${error.code ? '[' + error.code + '] ' : ''}Result validation error: ${error.message}`;
|
|
88
|
+
this.logger.error({ err: error, data: result.result }, errorMessage);
|
|
71
89
|
result.error = {
|
|
72
90
|
code: error.code || error.name,
|
|
73
91
|
message: error.message,
|
package/lib/cjs/Driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Driver.js","sourceRoot":"","sources":["../../src/Driver.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;
|
|
1
|
+
{"version":3,"file":"Driver.js","sourceRoot":"","sources":["../../src/Driver.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/json.js
CHANGED
|
@@ -1,187 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.JsonParser = void 0;
|
|
4
3
|
exports.extractAndParseJSON = extractAndParseJSON;
|
|
5
4
|
exports.parseJSON = parseJSON;
|
|
5
|
+
const jsonrepair_1 = require("jsonrepair");
|
|
6
6
|
function extractJsonFromText(text) {
|
|
7
7
|
const start = text.indexOf("{");
|
|
8
8
|
const end = text.lastIndexOf("}");
|
|
9
|
-
|
|
10
|
-
return text.replace(/\\n/g, "");
|
|
9
|
+
return text.substring(start, end + 1);
|
|
11
10
|
}
|
|
12
11
|
function extractAndParseJSON(text) {
|
|
13
12
|
return parseJSON(extractJsonFromText(text));
|
|
14
13
|
}
|
|
15
|
-
const RX_DQUOTE = /^"([^"\\]|\\.)*"/us;
|
|
16
|
-
const RX_SQUOTE = /^'([^'\\]|\\.)*'/us;
|
|
17
|
-
const RX_NUMBER = /^-?\d+(\.\d+)?/;
|
|
18
|
-
const RX_BOOLEAN = /^true|false/;
|
|
19
|
-
const RX_NULL = /^null/;
|
|
20
|
-
const RX_KEY = /^[$_a-zA-Z][$_a-zA-Z0-9]*/;
|
|
21
|
-
const RX_PUNCTUATION = /^\s*([\[\]{}:,])\s*/;
|
|
22
|
-
function fixText(value) {
|
|
23
|
-
return value.replaceAll('\n', '\\n').replaceAll('\r', '\\r');
|
|
24
|
-
}
|
|
25
|
-
function decodeSingleQuotedString(value) {
|
|
26
|
-
return JSON.parse('"' + value.slice(1, -1).replaceAll(/(?<!\\)"/g, '\\"') + '"');
|
|
27
|
-
}
|
|
28
|
-
class JsonParser {
|
|
29
|
-
text;
|
|
30
|
-
pos = 0;
|
|
31
|
-
constructor(text) {
|
|
32
|
-
this.text = text;
|
|
33
|
-
}
|
|
34
|
-
skip(n) {
|
|
35
|
-
this.text = this.text.substring(n);
|
|
36
|
-
this.pos += n;
|
|
37
|
-
}
|
|
38
|
-
tryReadPunctuation() {
|
|
39
|
-
const m = RX_PUNCTUATION.exec(this.text);
|
|
40
|
-
if (m) {
|
|
41
|
-
this.skip(m[0].length);
|
|
42
|
-
return m[1];
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
readKey() {
|
|
46
|
-
const first = this.text.charCodeAt(0);
|
|
47
|
-
if (first === 34) { // "
|
|
48
|
-
const m = RX_DQUOTE.exec(this.text);
|
|
49
|
-
if (m) {
|
|
50
|
-
this.skip(m[0].length);
|
|
51
|
-
return JSON.parse(m[0]);
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
else if (first === 39) { // '
|
|
55
|
-
const m = RX_SQUOTE.exec(this.text);
|
|
56
|
-
if (m) {
|
|
57
|
-
this.skip(m[0].length);
|
|
58
|
-
return decodeSingleQuotedString(m[0]);
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
else {
|
|
62
|
-
const m = RX_KEY.exec(this.text);
|
|
63
|
-
if (m) {
|
|
64
|
-
this.skip(m[0].length);
|
|
65
|
-
return m[0];
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
69
|
-
}
|
|
70
|
-
readScalar() {
|
|
71
|
-
const first = this.text.charCodeAt(0);
|
|
72
|
-
if (first === 34) { // "
|
|
73
|
-
const m = RX_DQUOTE.exec(this.text);
|
|
74
|
-
if (m) {
|
|
75
|
-
this.skip(m[0].length);
|
|
76
|
-
return JSON.parse(fixText(m[0]));
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
else if (first === 39) { // '
|
|
80
|
-
const m = RX_SQUOTE.exec(this.text);
|
|
81
|
-
if (m) {
|
|
82
|
-
this.skip(m[0].length);
|
|
83
|
-
return decodeSingleQuotedString(fixText(m[0]));
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
let m = RX_NUMBER.exec(this.text);
|
|
88
|
-
if (m) {
|
|
89
|
-
this.skip(m[0].length);
|
|
90
|
-
return parseFloat(m[0]);
|
|
91
|
-
}
|
|
92
|
-
m = RX_BOOLEAN.exec(this.text);
|
|
93
|
-
if (m) {
|
|
94
|
-
this.skip(m[0].length);
|
|
95
|
-
return m[0] === 'true';
|
|
96
|
-
}
|
|
97
|
-
m = RX_NULL.exec(this.text);
|
|
98
|
-
if (m) {
|
|
99
|
-
this.skip(m[0].length);
|
|
100
|
-
return null;
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
104
|
-
}
|
|
105
|
-
readObject() {
|
|
106
|
-
let key;
|
|
107
|
-
const obj = {};
|
|
108
|
-
while (true) {
|
|
109
|
-
if (!key) { // read key
|
|
110
|
-
const p = this.tryReadPunctuation();
|
|
111
|
-
if (p === '}') {
|
|
112
|
-
return obj;
|
|
113
|
-
}
|
|
114
|
-
else if (p === ',') {
|
|
115
|
-
continue;
|
|
116
|
-
}
|
|
117
|
-
else if (p) {
|
|
118
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
119
|
-
}
|
|
120
|
-
key = this.readKey();
|
|
121
|
-
if (!key) {
|
|
122
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
123
|
-
}
|
|
124
|
-
if (this.tryReadPunctuation() !== ':') {
|
|
125
|
-
throw new Error('Expected a colon at position ' + this.pos + ' but found ' + this.text);
|
|
126
|
-
}
|
|
127
|
-
;
|
|
128
|
-
}
|
|
129
|
-
else { // read value
|
|
130
|
-
const value = this.readValue();
|
|
131
|
-
if (value === undefined) {
|
|
132
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
133
|
-
}
|
|
134
|
-
obj[key] = value;
|
|
135
|
-
key = undefined;
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
readArray() {
|
|
140
|
-
const ar = [];
|
|
141
|
-
while (true) {
|
|
142
|
-
const p = this.tryReadPunctuation();
|
|
143
|
-
if (p === ',') {
|
|
144
|
-
continue;
|
|
145
|
-
}
|
|
146
|
-
else if (p === ']') {
|
|
147
|
-
return ar;
|
|
148
|
-
}
|
|
149
|
-
else if (p === '[') {
|
|
150
|
-
ar.push(this.readArray());
|
|
151
|
-
}
|
|
152
|
-
else if (p === '{') {
|
|
153
|
-
ar.push(this.readObject());
|
|
154
|
-
}
|
|
155
|
-
else if (!p) {
|
|
156
|
-
ar.push(this.readScalar());
|
|
157
|
-
}
|
|
158
|
-
else {
|
|
159
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
readValue() {
|
|
164
|
-
const p = this.tryReadPunctuation();
|
|
165
|
-
if (p === '{') {
|
|
166
|
-
return this.readObject();
|
|
167
|
-
}
|
|
168
|
-
else if (p === '[') {
|
|
169
|
-
return this.readArray();
|
|
170
|
-
}
|
|
171
|
-
else if (!p) {
|
|
172
|
-
return this.readScalar();
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
static parse(text) {
|
|
176
|
-
const parser = new JsonParser(text);
|
|
177
|
-
const r = parser.readValue();
|
|
178
|
-
if (r === undefined) {
|
|
179
|
-
throw new Error('Not a valid JSON');
|
|
180
|
-
}
|
|
181
|
-
return r;
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
exports.JsonParser = JsonParser;
|
|
185
14
|
function parseJSON(text) {
|
|
186
15
|
text = text.trim();
|
|
187
16
|
try {
|
|
@@ -190,7 +19,7 @@ function parseJSON(text) {
|
|
|
190
19
|
catch (err) {
|
|
191
20
|
// use a relaxed parser
|
|
192
21
|
try {
|
|
193
|
-
return
|
|
22
|
+
return JSON.parse((0, jsonrepair_1.jsonrepair)(text));
|
|
194
23
|
}
|
|
195
24
|
catch (err2) { // throw the original error
|
|
196
25
|
throw err;
|
package/lib/cjs/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/json.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/json.ts"],"names":[],"mappings":";;AASA,kDAEC;AAED,8BAYC;AAxBD,2CAAwC;AAExC,SAAS,mBAAmB,CAAC,IAAY;IACrC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAgB,mBAAmB,CAAC,IAAY;IAC5C,OAAO,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,SAAgB,SAAS,CAAC,IAAY;IAClC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IACnB,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAChB,uBAAuB;QACvB,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,uBAAU,EAAC,IAAI,CAAC,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,IAAS,EAAE,CAAC,CAAC,2BAA2B;YAC7C,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;AACL,CAAC"}
|
package/lib/cjs/validation.js
CHANGED
|
@@ -9,7 +9,6 @@ const ajv_1 = require("ajv");
|
|
|
9
9
|
const ajv_formats_1 = __importDefault(require("ajv-formats"));
|
|
10
10
|
const json_js_1 = require("./json.js");
|
|
11
11
|
const resolver_js_1 = require("./resolver.js");
|
|
12
|
-
const common_1 = require("@llumiverse/common");
|
|
13
12
|
const ajv = new ajv_1.Ajv({
|
|
14
13
|
coerceTypes: 'array',
|
|
15
14
|
allowDate: true,
|
|
@@ -29,6 +28,24 @@ class ValidationError extends Error {
|
|
|
29
28
|
}
|
|
30
29
|
}
|
|
31
30
|
exports.ValidationError = ValidationError;
|
|
31
|
+
function parseCompletionAsJson(data) {
|
|
32
|
+
let lastError;
|
|
33
|
+
for (const part of data) {
|
|
34
|
+
if (part.type === "text") {
|
|
35
|
+
const text = part.value.trim();
|
|
36
|
+
try {
|
|
37
|
+
return (0, json_js_1.extractAndParseJSON)(text);
|
|
38
|
+
}
|
|
39
|
+
catch (error) {
|
|
40
|
+
lastError = new ValidationError("json_error", error.message);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (!lastError) {
|
|
45
|
+
lastError = new ValidationError("json_error", "No JSON compatible response found in completion result");
|
|
46
|
+
}
|
|
47
|
+
throw lastError;
|
|
48
|
+
}
|
|
32
49
|
function validateResult(data, schema) {
|
|
33
50
|
let json;
|
|
34
51
|
if (Array.isArray(data)) {
|
|
@@ -37,9 +54,8 @@ function validateResult(data, schema) {
|
|
|
37
54
|
json = jsonResults[0].value;
|
|
38
55
|
}
|
|
39
56
|
else {
|
|
40
|
-
const stringResult = data.map(common_1.completionResultToString).join("");
|
|
41
57
|
try {
|
|
42
|
-
json = (
|
|
58
|
+
json = parseCompletionAsJson(data);
|
|
43
59
|
}
|
|
44
60
|
catch (error) {
|
|
45
61
|
throw new ValidationError("json_error", error.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/Driver.js
CHANGED
|
@@ -7,11 +7,28 @@ import { DefaultCompletionStream, FallbackCompletionStream } from "./CompletionS
|
|
|
7
7
|
import { formatTextPrompt } from "./formatters/index.js";
|
|
8
8
|
import { Modalities } from "@llumiverse/common";
|
|
9
9
|
import { validateResult } from "./validation.js";
|
|
10
|
+
// Helper to create logger methods that support both message-only and object-first signatures
|
|
11
|
+
function createConsoleLoggerMethod(consoleMethod) {
|
|
12
|
+
return ((objOrMsg, msgOrNever, ...args) => {
|
|
13
|
+
if (typeof objOrMsg === 'string') {
|
|
14
|
+
// Message-only: logger.info("message", ...args)
|
|
15
|
+
consoleMethod(objOrMsg, msgOrNever, ...args);
|
|
16
|
+
}
|
|
17
|
+
else if (msgOrNever !== undefined) {
|
|
18
|
+
// Object-first: logger.info({ obj }, "message", ...args)
|
|
19
|
+
consoleMethod(msgOrNever, objOrMsg, ...args);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
// Object-only: logger.info({ obj })
|
|
23
|
+
consoleMethod(objOrMsg, ...args);
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
}
|
|
10
27
|
const ConsoleLogger = {
|
|
11
|
-
debug: console.debug,
|
|
12
|
-
info: console.info,
|
|
13
|
-
warn: console.warn,
|
|
14
|
-
error: console.error,
|
|
28
|
+
debug: createConsoleLoggerMethod(console.debug.bind(console)),
|
|
29
|
+
info: createConsoleLoggerMethod(console.info.bind(console)),
|
|
30
|
+
warn: createConsoleLoggerMethod(console.warn.bind(console)),
|
|
31
|
+
error: createConsoleLoggerMethod(console.error.bind(console)),
|
|
15
32
|
};
|
|
16
33
|
const noop = () => void 0;
|
|
17
34
|
const NoopLogger = {
|
|
@@ -63,7 +80,8 @@ export class AbstractDriver {
|
|
|
63
80
|
result.result = validateResult(result.result, options.result_schema);
|
|
64
81
|
}
|
|
65
82
|
catch (error) {
|
|
66
|
-
|
|
83
|
+
const errorMessage = `[${this.provider}] [${options.model}] ${error.code ? '[' + error.code + '] ' : ''}Result validation error: ${error.message}`;
|
|
84
|
+
this.logger.error({ err: error, data: result.result }, errorMessage);
|
|
67
85
|
result.error = {
|
|
68
86
|
code: error.code || error.name,
|
|
69
87
|
message: error.message,
|
package/lib/esm/Driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Driver.js","sourceRoot":"","sources":["../../src/Driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAYH,UAAU,EAOb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,aAAa,GAAW;IAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"Driver.js","sourceRoot":"","sources":["../../src/Driver.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/json.js
CHANGED
|
@@ -1,181 +1,12 @@
|
|
|
1
|
+
import { jsonrepair } from 'jsonrepair';
|
|
1
2
|
function extractJsonFromText(text) {
|
|
2
3
|
const start = text.indexOf("{");
|
|
3
4
|
const end = text.lastIndexOf("}");
|
|
4
|
-
|
|
5
|
-
return text.replace(/\\n/g, "");
|
|
5
|
+
return text.substring(start, end + 1);
|
|
6
6
|
}
|
|
7
7
|
export function extractAndParseJSON(text) {
|
|
8
8
|
return parseJSON(extractJsonFromText(text));
|
|
9
9
|
}
|
|
10
|
-
const RX_DQUOTE = /^"([^"\\]|\\.)*"/us;
|
|
11
|
-
const RX_SQUOTE = /^'([^'\\]|\\.)*'/us;
|
|
12
|
-
const RX_NUMBER = /^-?\d+(\.\d+)?/;
|
|
13
|
-
const RX_BOOLEAN = /^true|false/;
|
|
14
|
-
const RX_NULL = /^null/;
|
|
15
|
-
const RX_KEY = /^[$_a-zA-Z][$_a-zA-Z0-9]*/;
|
|
16
|
-
const RX_PUNCTUATION = /^\s*([\[\]{}:,])\s*/;
|
|
17
|
-
function fixText(value) {
|
|
18
|
-
return value.replaceAll('\n', '\\n').replaceAll('\r', '\\r');
|
|
19
|
-
}
|
|
20
|
-
function decodeSingleQuotedString(value) {
|
|
21
|
-
return JSON.parse('"' + value.slice(1, -1).replaceAll(/(?<!\\)"/g, '\\"') + '"');
|
|
22
|
-
}
|
|
23
|
-
export class JsonParser {
|
|
24
|
-
text;
|
|
25
|
-
pos = 0;
|
|
26
|
-
constructor(text) {
|
|
27
|
-
this.text = text;
|
|
28
|
-
}
|
|
29
|
-
skip(n) {
|
|
30
|
-
this.text = this.text.substring(n);
|
|
31
|
-
this.pos += n;
|
|
32
|
-
}
|
|
33
|
-
tryReadPunctuation() {
|
|
34
|
-
const m = RX_PUNCTUATION.exec(this.text);
|
|
35
|
-
if (m) {
|
|
36
|
-
this.skip(m[0].length);
|
|
37
|
-
return m[1];
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
readKey() {
|
|
41
|
-
const first = this.text.charCodeAt(0);
|
|
42
|
-
if (first === 34) { // "
|
|
43
|
-
const m = RX_DQUOTE.exec(this.text);
|
|
44
|
-
if (m) {
|
|
45
|
-
this.skip(m[0].length);
|
|
46
|
-
return JSON.parse(m[0]);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
else if (first === 39) { // '
|
|
50
|
-
const m = RX_SQUOTE.exec(this.text);
|
|
51
|
-
if (m) {
|
|
52
|
-
this.skip(m[0].length);
|
|
53
|
-
return decodeSingleQuotedString(m[0]);
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
const m = RX_KEY.exec(this.text);
|
|
58
|
-
if (m) {
|
|
59
|
-
this.skip(m[0].length);
|
|
60
|
-
return m[0];
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
64
|
-
}
|
|
65
|
-
readScalar() {
|
|
66
|
-
const first = this.text.charCodeAt(0);
|
|
67
|
-
if (first === 34) { // "
|
|
68
|
-
const m = RX_DQUOTE.exec(this.text);
|
|
69
|
-
if (m) {
|
|
70
|
-
this.skip(m[0].length);
|
|
71
|
-
return JSON.parse(fixText(m[0]));
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
else if (first === 39) { // '
|
|
75
|
-
const m = RX_SQUOTE.exec(this.text);
|
|
76
|
-
if (m) {
|
|
77
|
-
this.skip(m[0].length);
|
|
78
|
-
return decodeSingleQuotedString(fixText(m[0]));
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
else {
|
|
82
|
-
let m = RX_NUMBER.exec(this.text);
|
|
83
|
-
if (m) {
|
|
84
|
-
this.skip(m[0].length);
|
|
85
|
-
return parseFloat(m[0]);
|
|
86
|
-
}
|
|
87
|
-
m = RX_BOOLEAN.exec(this.text);
|
|
88
|
-
if (m) {
|
|
89
|
-
this.skip(m[0].length);
|
|
90
|
-
return m[0] === 'true';
|
|
91
|
-
}
|
|
92
|
-
m = RX_NULL.exec(this.text);
|
|
93
|
-
if (m) {
|
|
94
|
-
this.skip(m[0].length);
|
|
95
|
-
return null;
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
99
|
-
}
|
|
100
|
-
readObject() {
|
|
101
|
-
let key;
|
|
102
|
-
const obj = {};
|
|
103
|
-
while (true) {
|
|
104
|
-
if (!key) { // read key
|
|
105
|
-
const p = this.tryReadPunctuation();
|
|
106
|
-
if (p === '}') {
|
|
107
|
-
return obj;
|
|
108
|
-
}
|
|
109
|
-
else if (p === ',') {
|
|
110
|
-
continue;
|
|
111
|
-
}
|
|
112
|
-
else if (p) {
|
|
113
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
114
|
-
}
|
|
115
|
-
key = this.readKey();
|
|
116
|
-
if (!key) {
|
|
117
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
118
|
-
}
|
|
119
|
-
if (this.tryReadPunctuation() !== ':') {
|
|
120
|
-
throw new Error('Expected a colon at position ' + this.pos + ' but found ' + this.text);
|
|
121
|
-
}
|
|
122
|
-
;
|
|
123
|
-
}
|
|
124
|
-
else { // read value
|
|
125
|
-
const value = this.readValue();
|
|
126
|
-
if (value === undefined) {
|
|
127
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
128
|
-
}
|
|
129
|
-
obj[key] = value;
|
|
130
|
-
key = undefined;
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
readArray() {
|
|
135
|
-
const ar = [];
|
|
136
|
-
while (true) {
|
|
137
|
-
const p = this.tryReadPunctuation();
|
|
138
|
-
if (p === ',') {
|
|
139
|
-
continue;
|
|
140
|
-
}
|
|
141
|
-
else if (p === ']') {
|
|
142
|
-
return ar;
|
|
143
|
-
}
|
|
144
|
-
else if (p === '[') {
|
|
145
|
-
ar.push(this.readArray());
|
|
146
|
-
}
|
|
147
|
-
else if (p === '{') {
|
|
148
|
-
ar.push(this.readObject());
|
|
149
|
-
}
|
|
150
|
-
else if (!p) {
|
|
151
|
-
ar.push(this.readScalar());
|
|
152
|
-
}
|
|
153
|
-
else {
|
|
154
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
readValue() {
|
|
159
|
-
const p = this.tryReadPunctuation();
|
|
160
|
-
if (p === '{') {
|
|
161
|
-
return this.readObject();
|
|
162
|
-
}
|
|
163
|
-
else if (p === '[') {
|
|
164
|
-
return this.readArray();
|
|
165
|
-
}
|
|
166
|
-
else if (!p) {
|
|
167
|
-
return this.readScalar();
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
static parse(text) {
|
|
171
|
-
const parser = new JsonParser(text);
|
|
172
|
-
const r = parser.readValue();
|
|
173
|
-
if (r === undefined) {
|
|
174
|
-
throw new Error('Not a valid JSON');
|
|
175
|
-
}
|
|
176
|
-
return r;
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
10
|
export function parseJSON(text) {
|
|
180
11
|
text = text.trim();
|
|
181
12
|
try {
|
|
@@ -184,7 +15,7 @@ export function parseJSON(text) {
|
|
|
184
15
|
catch (err) {
|
|
185
16
|
// use a relaxed parser
|
|
186
17
|
try {
|
|
187
|
-
return
|
|
18
|
+
return JSON.parse(jsonrepair(text));
|
|
188
19
|
}
|
|
189
20
|
catch (err2) { // throw the original error
|
|
190
21
|
throw err;
|
package/lib/esm/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/json.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/json.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,SAAS,mBAAmB,CAAC,IAAY;IACrC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC5C,OAAO,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IAClC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IACnB,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAChB,uBAAuB;QACvB,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,IAAS,EAAE,CAAC,CAAC,2BAA2B;YAC7C,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;AACL,CAAC"}
|