@blockml/parser 0.2.0 → 0.4.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/blocks/org/blockml/bml/compiler/parser/Library.bml +1 -1
- package/blocks/org/blockml/bml/compiler/parser/capability/ParseXmlDom.bml +3 -0
- package/blocks/org/blockml/bml/compiler/parser/config/MapTimeDiagnosticCodes.bml +1 -1
- package/blocks/org/blockml/bml/compiler/parser/documentation/Diagnostics.bml +4 -0
- package/blocks/org/blockml/bml/compiler/parser/documentation/PublicApi.bml +3 -1
- package/blocks/org/blockml/bml/compiler/parser/documentation/TypeDescriptorParsing.bml +2 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/map/map-block.d.ts.map +1 -1
- package/dist/map/map-block.js +52 -31
- package/dist/map/map-block.js.map +1 -1
- package/dist/map/map-composition.d.ts.map +1 -1
- package/dist/map/map-composition.js +4 -14
- package/dist/map/map-composition.js.map +1 -1
- package/dist/map/type-expression.d.ts +5 -1
- package/dist/map/type-expression.d.ts.map +1 -1
- package/dist/map/type-expression.js +99 -34
- package/dist/map/type-expression.js.map +1 -1
- package/dist/parse.d.ts.map +1 -1
- package/dist/parse.js +35 -13
- package/dist/parse.js.map +1 -1
- package/dist/pipeline/xml-dom.d.ts +10 -1
- package/dist/pipeline/xml-dom.d.ts.map +1 -1
- package/dist/pipeline/xml-dom.js +55 -3
- package/dist/pipeline/xml-dom.js.map +1 -1
- package/dist/util/mapping-error.d.ts +17 -0
- package/dist/util/mapping-error.d.ts.map +1 -0
- package/dist/util/mapping-error.js +110 -0
- package/dist/util/mapping-error.js.map +1 -0
- package/dist/util/qname.d.ts +14 -0
- package/dist/util/qname.d.ts.map +1 -1
- package/dist/util/qname.js +64 -2
- package/dist/util/qname.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,4 +1,14 @@
|
|
|
1
1
|
import { resolveTypeName, splitQName, } from "../util/qname.js";
|
|
2
|
+
function formatMultiplicity(m) {
|
|
3
|
+
const { min, max } = m;
|
|
4
|
+
if (min === 0 && max === "*") {
|
|
5
|
+
return "[]";
|
|
6
|
+
}
|
|
7
|
+
if (min === max) {
|
|
8
|
+
return `[${min}]`;
|
|
9
|
+
}
|
|
10
|
+
return `[${min}..${max}]`;
|
|
11
|
+
}
|
|
2
12
|
function parseMultiplicity(input) {
|
|
3
13
|
const arrayMatch = input.match(/^(.+?)\[\s*(\d+)\s*\.\.\s*(\d+|n|\*)\s*\]\s*$/);
|
|
4
14
|
if (arrayMatch) {
|
|
@@ -24,6 +34,38 @@ function parseMultiplicity(input) {
|
|
|
24
34
|
}
|
|
25
35
|
return { expr: input.trim() };
|
|
26
36
|
}
|
|
37
|
+
function hasMultiplicitySuffix(input) {
|
|
38
|
+
return parseMultiplicity(input).multiplicity !== undefined;
|
|
39
|
+
}
|
|
40
|
+
function isFullyParenthesized(input) {
|
|
41
|
+
if (!input.startsWith("(") || !input.endsWith(")")) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
let depth = 0;
|
|
45
|
+
for (let i = 0; i < input.length; i++) {
|
|
46
|
+
const ch = input[i];
|
|
47
|
+
if (ch === "(") {
|
|
48
|
+
depth++;
|
|
49
|
+
}
|
|
50
|
+
else if (ch === ")") {
|
|
51
|
+
depth--;
|
|
52
|
+
if (depth === 0) {
|
|
53
|
+
return i === input.length - 1;
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
function applyMultiplicity(expr, m) {
|
|
60
|
+
if (expr.kind === "named" && !expr.multiplicity) {
|
|
61
|
+
return { ...expr, multiplicity: m };
|
|
62
|
+
}
|
|
63
|
+
return {
|
|
64
|
+
kind: "grouped",
|
|
65
|
+
expression: expr,
|
|
66
|
+
multiplicity: m,
|
|
67
|
+
};
|
|
68
|
+
}
|
|
27
69
|
function parseInstanceConfig(input, ctx) {
|
|
28
70
|
const braceIdx = input.indexOf("{");
|
|
29
71
|
if (braceIdx === -1) {
|
|
@@ -141,63 +183,90 @@ function parseTypeExpressionInternal(raw, ctx) {
|
|
|
141
183
|
if (!input) {
|
|
142
184
|
throw new Error("BML_UNKNOWN_TYPE: empty");
|
|
143
185
|
}
|
|
144
|
-
if (/^[a-z][a-z0-9]*(\.[a-z][a-z0-9]*)+$/i.test(input)) {
|
|
145
|
-
const named = { kind: "named", fqn: input };
|
|
146
|
-
return named;
|
|
147
|
-
}
|
|
148
|
-
if (input === "bml:Self") {
|
|
149
|
-
return { kind: "self" };
|
|
150
|
-
}
|
|
151
186
|
if (input.startsWith("{") && input.endsWith("}")) {
|
|
152
187
|
return parseAnonymousStruct(input, ctx);
|
|
153
188
|
}
|
|
154
189
|
if (input.includes("|")) {
|
|
155
190
|
const alts = splitTopLevel(input, "|");
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
191
|
+
if (alts.length > 1) {
|
|
192
|
+
return {
|
|
193
|
+
kind: "union",
|
|
194
|
+
alternatives: alts.map((a) => parseTypeExpressionInternal(a.trim(), ctx)),
|
|
195
|
+
};
|
|
196
|
+
}
|
|
160
197
|
}
|
|
161
198
|
const { expr, multiplicity } = parseMultiplicity(input);
|
|
162
|
-
|
|
199
|
+
if (multiplicity) {
|
|
200
|
+
if (hasMultiplicitySuffix(expr) && !isFullyParenthesized(expr)) {
|
|
201
|
+
throw new Error(`BML_INVALID_TYPE_REFERENCE: ${input}`);
|
|
202
|
+
}
|
|
203
|
+
return applyMultiplicity(parseTypeExpressionInternal(expr, ctx), multiplicity);
|
|
204
|
+
}
|
|
205
|
+
// Package FQNs start with a lowercase segment (com.foo.Bar). Do not treat
|
|
206
|
+
// Type.Member (Boolean.False) as an already-resolved FQN.
|
|
207
|
+
if (/^[a-z][a-z0-9]*(\.[A-Za-z0-9]+)+$/.test(input)) {
|
|
208
|
+
const named = { kind: "named", fqn: input };
|
|
209
|
+
return named;
|
|
210
|
+
}
|
|
211
|
+
if (input === "bml:Self") {
|
|
212
|
+
return { kind: "self" };
|
|
213
|
+
}
|
|
214
|
+
const { base, config } = parseInstanceConfig(input, ctx);
|
|
163
215
|
const genericMatch = base.match(/^(.+?)\((.+)\)$/);
|
|
164
|
-
if (genericMatch) {
|
|
216
|
+
if (genericMatch && !isFullyParenthesized(base)) {
|
|
165
217
|
const ref = parseGenericApplication(genericMatch[1].trim(), genericMatch[2].trim(), ctx);
|
|
166
|
-
if (multiplicity) {
|
|
167
|
-
ref.multiplicity = multiplicity;
|
|
168
|
-
}
|
|
169
218
|
if (config) {
|
|
170
219
|
ref.instanceConfiguration = config;
|
|
171
220
|
}
|
|
172
221
|
return ref;
|
|
173
222
|
}
|
|
174
|
-
if (
|
|
223
|
+
if (isFullyParenthesized(input)) {
|
|
224
|
+
return parseTypeExpressionInternal(input.slice(1, -1).trim(), ctx);
|
|
225
|
+
}
|
|
226
|
+
if (/^[A-Z]$/.test(base) || (/^[A-Z][a-zA-Z0-9]*$/.test(base) && !base.includes("."))) {
|
|
175
227
|
const { prefix } = splitQName(base);
|
|
176
228
|
if (!prefix && base.length <= 2) {
|
|
177
229
|
return { kind: "genericParam", name: base };
|
|
178
230
|
}
|
|
179
231
|
}
|
|
232
|
+
const { prefix, local } = splitQName(base);
|
|
233
|
+
if (!prefix) {
|
|
234
|
+
const nested = ctx.subBlockIndex?.get(local);
|
|
235
|
+
if (nested) {
|
|
236
|
+
const namedNested = { kind: "named", fqn: nested };
|
|
237
|
+
if (config) {
|
|
238
|
+
namedNested.instanceConfiguration = config;
|
|
239
|
+
}
|
|
240
|
+
return namedNested;
|
|
241
|
+
}
|
|
242
|
+
const selfLocal = ctx.currentTypeFqn?.split(".").pop();
|
|
243
|
+
if (ctx.currentTypeFqn && selfLocal === local) {
|
|
244
|
+
const namedSelf = { kind: "named", fqn: ctx.currentTypeFqn };
|
|
245
|
+
if (config) {
|
|
246
|
+
namedSelf.instanceConfiguration = config;
|
|
247
|
+
}
|
|
248
|
+
return namedSelf;
|
|
249
|
+
}
|
|
250
|
+
}
|
|
180
251
|
const named = {
|
|
181
252
|
kind: "named",
|
|
182
253
|
fqn: resolveTypeName(base, ctx.bindings, ctx.implicit),
|
|
183
254
|
};
|
|
184
|
-
if (multiplicity) {
|
|
185
|
-
named.multiplicity = multiplicity;
|
|
186
|
-
}
|
|
187
255
|
if (config) {
|
|
188
256
|
named.instanceConfiguration = config;
|
|
189
257
|
}
|
|
190
258
|
return named;
|
|
191
259
|
}
|
|
192
|
-
export function parseTypeExpression(raw, bindings, implicit = "type") {
|
|
193
|
-
return parseTypeExpressionInternal(raw, { bindings, implicit });
|
|
260
|
+
export function parseTypeExpression(raw, bindings, implicit = "type", options) {
|
|
261
|
+
return parseTypeExpressionInternal(raw, { bindings, implicit, ...options });
|
|
194
262
|
}
|
|
195
263
|
export function inferCardinality(type) {
|
|
196
264
|
if (!type) {
|
|
197
265
|
return undefined;
|
|
198
266
|
}
|
|
199
|
-
|
|
200
|
-
|
|
267
|
+
const multiplicity = type.kind === "named" || type.kind === "grouped" ? type.multiplicity : undefined;
|
|
268
|
+
if (multiplicity) {
|
|
269
|
+
const { min, max } = multiplicity;
|
|
201
270
|
if (min === 0 && max === "*") {
|
|
202
271
|
return "0..n";
|
|
203
272
|
}
|
|
@@ -226,6 +295,11 @@ export function typeExpressionToString(type) {
|
|
|
226
295
|
return `{ ${type.fields.map((f) => `${f.name}: ${typeExpressionToString(f.type)}`).join(", ")} }`;
|
|
227
296
|
case "union":
|
|
228
297
|
return type.alternatives.map(typeExpressionToString).join(" | ");
|
|
298
|
+
case "grouped": {
|
|
299
|
+
const inner = typeExpressionToString(type.expression);
|
|
300
|
+
const suffix = type.multiplicity ? formatMultiplicity(type.multiplicity) : "";
|
|
301
|
+
return `(${inner})${suffix}`;
|
|
302
|
+
}
|
|
229
303
|
case "named": {
|
|
230
304
|
let s = type.fqn;
|
|
231
305
|
if (type.typeArguments?.length) {
|
|
@@ -239,16 +313,7 @@ export function typeExpressionToString(type) {
|
|
|
239
313
|
s += `{${type.instanceConfiguration.positional.map(memberValueToConfig).join(", ")}}`;
|
|
240
314
|
}
|
|
241
315
|
if (type.multiplicity) {
|
|
242
|
-
|
|
243
|
-
if (min === 0 && max === "*") {
|
|
244
|
-
s += "[]";
|
|
245
|
-
}
|
|
246
|
-
else if (min === max) {
|
|
247
|
-
s += `[${min}]`;
|
|
248
|
-
}
|
|
249
|
-
else {
|
|
250
|
-
s += `[${min}..${max}]`;
|
|
251
|
-
}
|
|
316
|
+
s += formatMultiplicity(type.multiplicity);
|
|
252
317
|
}
|
|
253
318
|
return s;
|
|
254
319
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-expression.js","sourceRoot":"","sources":["../../src/map/type-expression.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"type-expression.js","sourceRoot":"","sources":["../../src/map/type-expression.ts"],"names":[],"mappings":"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"}
|
package/dist/parse.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,YAAY,EACZ,WAAW,
|
|
1
|
+
{"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,YAAY,EACZ,WAAW,EAEZ,MAAM,cAAc,CAAC;AA4CtB,wBAAgB,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,WAAW,CA6F7E"}
|
package/dist/parse.js
CHANGED
|
@@ -3,12 +3,28 @@ import { documentElement, getParseErrors, parseXmlDom } from "./pipeline/xml-dom
|
|
|
3
3
|
import { assertBlockRoot } from "./pipeline/root-type.js";
|
|
4
4
|
import { extractNamespaceBindings, mergeSourceInfo, } from "./pipeline/namespaces.js";
|
|
5
5
|
import { mapDocumentBlock } from "./map/map-block.js";
|
|
6
|
-
|
|
6
|
+
import { MappingError } from "./util/mapping-error.js";
|
|
7
|
+
function diagnostic(code, message, filePath, line = 1, column = 1, endLine, endColumn) {
|
|
8
|
+
const source = { file: filePath, line, column };
|
|
9
|
+
if (endLine !== undefined) {
|
|
10
|
+
source.endLine = endLine;
|
|
11
|
+
}
|
|
12
|
+
if (endColumn !== undefined) {
|
|
13
|
+
source.endColumn = endColumn;
|
|
14
|
+
}
|
|
7
15
|
return {
|
|
8
16
|
severity: "error",
|
|
9
17
|
code,
|
|
10
18
|
message,
|
|
11
|
-
source
|
|
19
|
+
source,
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
function diagnosticAt(code, message, loc) {
|
|
23
|
+
return {
|
|
24
|
+
severity: "error",
|
|
25
|
+
code,
|
|
26
|
+
message,
|
|
27
|
+
source: loc,
|
|
12
28
|
};
|
|
13
29
|
}
|
|
14
30
|
export function parse(source, options = {}) {
|
|
@@ -21,21 +37,22 @@ export function parse(source, options = {}) {
|
|
|
21
37
|
return { document: null, diagnostics, success: false };
|
|
22
38
|
}
|
|
23
39
|
let doc;
|
|
24
|
-
|
|
25
|
-
|
|
40
|
+
const parsed = parseXmlDom(source, filePath);
|
|
41
|
+
doc = parsed.document;
|
|
42
|
+
for (const err of parsed.errors) {
|
|
43
|
+
diagnostics.push(diagnostic("BML_MALFORMED_XML", err.message, filePath, err.line, err.column));
|
|
26
44
|
}
|
|
27
|
-
|
|
28
|
-
diagnostics.push(diagnostic("BML_MALFORMED_XML", e instanceof Error ? e.message : String(e), filePath));
|
|
45
|
+
if (!doc) {
|
|
29
46
|
return { document: null, diagnostics, success: false };
|
|
30
47
|
}
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
48
|
+
const seen = new Set(diagnostics.map((d) => d.message));
|
|
49
|
+
for (const err of getParseErrors(doc)) {
|
|
50
|
+
if (!seen.has(err)) {
|
|
34
51
|
diagnostics.push(diagnostic("BML_MALFORMED_XML", err, filePath));
|
|
35
52
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
53
|
+
}
|
|
54
|
+
if (diagnostics.some((d) => d.code === "BML_MALFORMED_XML") && !continueOnError) {
|
|
55
|
+
return { document: null, diagnostics, success: false };
|
|
39
56
|
}
|
|
40
57
|
const root = documentElement(doc);
|
|
41
58
|
if (!root) {
|
|
@@ -57,7 +74,12 @@ export function parse(source, options = {}) {
|
|
|
57
74
|
block = mapDocumentBlock(root, filePath, source, bindings);
|
|
58
75
|
}
|
|
59
76
|
catch (e) {
|
|
60
|
-
|
|
77
|
+
if (e instanceof MappingError) {
|
|
78
|
+
diagnostics.push(diagnosticAt(e.code, e.message, e.source));
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
diagnostics.push(diagnostic("BML_MAP_ERROR", e instanceof Error ? e.message : String(e), filePath));
|
|
82
|
+
}
|
|
61
83
|
if (!continueOnError) {
|
|
62
84
|
return { document: null, diagnostics, success: false };
|
|
63
85
|
}
|
package/dist/parse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parse.js","sourceRoot":"","sources":["../src/parse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import { type Document, type Element } from "@xmldom/xmldom";
|
|
2
|
-
export
|
|
2
|
+
export interface XmlParseError {
|
|
3
|
+
level: "warning" | "error" | "fatalError";
|
|
4
|
+
message: string;
|
|
5
|
+
line: number;
|
|
6
|
+
column: number;
|
|
7
|
+
}
|
|
8
|
+
export declare function parseXmlDom(source: string, _filePath?: string): {
|
|
9
|
+
document: Document | null;
|
|
10
|
+
errors: XmlParseError[];
|
|
11
|
+
};
|
|
3
12
|
export declare function getParseErrors(doc: Document): string[];
|
|
4
13
|
export declare function documentElement(doc: Document): Element | null;
|
|
5
14
|
//# sourceMappingURL=xml-dom.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml-dom.d.ts","sourceRoot":"","sources":["../../src/pipeline/xml-dom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAExE,
|
|
1
|
+
{"version":3,"file":"xml-dom.d.ts","sourceRoot":"","sources":["../../src/pipeline/xml-dom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAExE,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,SAAS,GAAG,OAAO,GAAG,YAAY,CAAC;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AA+BD,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB;IAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,CAkCxD;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM,EAAE,CAUtD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,GAAG,IAAI,CAE7D"}
|
package/dist/pipeline/xml-dom.js
CHANGED
|
@@ -1,7 +1,59 @@
|
|
|
1
1
|
import { DOMParser } from "@xmldom/xmldom";
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
2
|
+
const LOCATION_SUFFIX = /@[^[]*\[line:(\d+),col:(\d+)\]\s*$/;
|
|
3
|
+
function locationFromMessage(msg) {
|
|
4
|
+
const match = msg.match(LOCATION_SUFFIX);
|
|
5
|
+
if (!match) {
|
|
6
|
+
return { message: msg.trim(), line: 1, column: 1 };
|
|
7
|
+
}
|
|
8
|
+
return {
|
|
9
|
+
message: msg.slice(0, match.index).trim(),
|
|
10
|
+
line: Number(match[1]),
|
|
11
|
+
column: Number(match[2]),
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
function locationFromContext(msg, context) {
|
|
15
|
+
const fromMsg = locationFromMessage(msg);
|
|
16
|
+
const locator = context?.locator ?? context;
|
|
17
|
+
const line = locator?.lineNumber ?? fromMsg.line;
|
|
18
|
+
const column = locator?.columnNumber ?? fromMsg.column;
|
|
19
|
+
return { message: fromMsg.message, line, column };
|
|
20
|
+
}
|
|
21
|
+
export function parseXmlDom(source, _filePath) {
|
|
22
|
+
const errors = [];
|
|
23
|
+
const parser = new DOMParser({
|
|
24
|
+
locator: true,
|
|
25
|
+
onError(level, msg, context) {
|
|
26
|
+
const loc = locationFromContext(String(msg), context);
|
|
27
|
+
errors.push({
|
|
28
|
+
level,
|
|
29
|
+
message: loc.message,
|
|
30
|
+
line: loc.line,
|
|
31
|
+
column: loc.column,
|
|
32
|
+
});
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
try {
|
|
36
|
+
const document = parser.parseFromString(source, "text/xml");
|
|
37
|
+
return { document, errors };
|
|
38
|
+
}
|
|
39
|
+
catch (e) {
|
|
40
|
+
const loc = e
|
|
41
|
+
.locator;
|
|
42
|
+
if (errors.length === 0) {
|
|
43
|
+
const fromMsg = locationFromMessage(e instanceof Error ? e.message : String(e));
|
|
44
|
+
errors.push({
|
|
45
|
+
level: "fatalError",
|
|
46
|
+
message: fromMsg.message,
|
|
47
|
+
line: loc?.lineNumber ?? fromMsg.line,
|
|
48
|
+
column: loc?.columnNumber ?? fromMsg.column,
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
else if (loc?.lineNumber && errors[0].line <= 1) {
|
|
52
|
+
errors[0].line = loc.lineNumber;
|
|
53
|
+
errors[0].column = loc.columnNumber ?? errors[0].column;
|
|
54
|
+
}
|
|
55
|
+
return { document: null, errors };
|
|
56
|
+
}
|
|
5
57
|
}
|
|
6
58
|
export function getParseErrors(doc) {
|
|
7
59
|
const errors = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xml-dom.js","sourceRoot":"","sources":["../../src/pipeline/xml-dom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAA+B,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"xml-dom.js","sourceRoot":"","sources":["../../src/pipeline/xml-dom.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { SourceLocation } from "@blockml/bom";
|
|
2
|
+
export declare class MappingError extends Error {
|
|
3
|
+
readonly code: string;
|
|
4
|
+
readonly source: SourceLocation;
|
|
5
|
+
constructor(code: string, message: string, source: SourceLocation);
|
|
6
|
+
}
|
|
7
|
+
export interface AttrHint {
|
|
8
|
+
name: string;
|
|
9
|
+
value: string;
|
|
10
|
+
}
|
|
11
|
+
declare function withElementLocation<T>(file: string, source: string, element: {
|
|
12
|
+
nodeName: string;
|
|
13
|
+
lineNumber?: number;
|
|
14
|
+
columnNumber?: number;
|
|
15
|
+
}, fn: () => T, attr?: AttrHint): T;
|
|
16
|
+
export { withElementLocation };
|
|
17
|
+
//# sourceMappingURL=mapping-error.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mapping-error.d.ts","sourceRoot":"","sources":["../../src/util/mapping-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAOnD,qBAAa,YAAa,SAAQ,KAAK;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;gBAEpB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc;CAMlE;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AAgHD,iBAAS,mBAAmB,CAAC,CAAC,EAC5B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EACzE,EAAE,EAAE,MAAM,CAAC,EACX,IAAI,CAAC,EAAE,QAAQ,GACd,CAAC,CASH;AAED,OAAO,EAAE,mBAAmB,EAAE,CAAC"}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { attributeValueLoc, elementSourceLoc, locateNeedleNearElement, } from "./qname.js";
|
|
2
|
+
export class MappingError extends Error {
|
|
3
|
+
code;
|
|
4
|
+
source;
|
|
5
|
+
constructor(code, message, source) {
|
|
6
|
+
super(message);
|
|
7
|
+
this.name = "MappingError";
|
|
8
|
+
this.code = code;
|
|
9
|
+
this.source = source;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
const CODE_PREFIX = /^(BML_[A-Z0-9_]+)(?::\s*(.*))?$/s;
|
|
13
|
+
function mappingErrorFromUnknown(err, source) {
|
|
14
|
+
if (err instanceof MappingError) {
|
|
15
|
+
return err;
|
|
16
|
+
}
|
|
17
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
18
|
+
const match = message.match(CODE_PREFIX);
|
|
19
|
+
const code = match?.[1] ?? "BML_MAP_ERROR";
|
|
20
|
+
return new MappingError(code, message, source);
|
|
21
|
+
}
|
|
22
|
+
function needleFromMessage(message) {
|
|
23
|
+
const match = message.match(CODE_PREFIX);
|
|
24
|
+
const rest = match?.[2]?.trim();
|
|
25
|
+
if (!rest || rest === "empty") {
|
|
26
|
+
return undefined;
|
|
27
|
+
}
|
|
28
|
+
return rest;
|
|
29
|
+
}
|
|
30
|
+
function refineToNeedle(loc, source, needle) {
|
|
31
|
+
const start = lineColumnToOffset(source, loc.line, loc.column);
|
|
32
|
+
const end = loc.endLine !== undefined
|
|
33
|
+
? lineColumnToOffset(source, loc.endLine, loc.endColumn ?? 1)
|
|
34
|
+
: Math.min(start + 256, source.length);
|
|
35
|
+
const slice = source.slice(start, end);
|
|
36
|
+
const withColon = `${needle}:`;
|
|
37
|
+
let idx = slice.indexOf(withColon);
|
|
38
|
+
let len = withColon.length;
|
|
39
|
+
if (idx === -1) {
|
|
40
|
+
idx = slice.indexOf(needle);
|
|
41
|
+
len = needle.length;
|
|
42
|
+
}
|
|
43
|
+
if (idx === -1) {
|
|
44
|
+
return loc;
|
|
45
|
+
}
|
|
46
|
+
const abs = start + idx;
|
|
47
|
+
const s = offsetToLineCol(source, abs);
|
|
48
|
+
const e = offsetToLineCol(source, abs + len);
|
|
49
|
+
return {
|
|
50
|
+
file: loc.file,
|
|
51
|
+
line: s.line,
|
|
52
|
+
column: s.column,
|
|
53
|
+
endLine: e.line,
|
|
54
|
+
endColumn: e.column,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
function offsetToLineCol(source, offset) {
|
|
58
|
+
const clamped = Math.max(0, Math.min(offset, source.length));
|
|
59
|
+
const before = source.slice(0, clamped);
|
|
60
|
+
const line = before.split("\n").length;
|
|
61
|
+
const lastNl = before.lastIndexOf("\n");
|
|
62
|
+
const column = clamped - lastNl;
|
|
63
|
+
return { line, column };
|
|
64
|
+
}
|
|
65
|
+
function lineColumnToOffset(source, line, column) {
|
|
66
|
+
let remaining = line - 1;
|
|
67
|
+
let offset = 0;
|
|
68
|
+
while (remaining > 0) {
|
|
69
|
+
const nl = source.indexOf("\n", offset);
|
|
70
|
+
if (nl === -1) {
|
|
71
|
+
return source.length;
|
|
72
|
+
}
|
|
73
|
+
offset = nl + 1;
|
|
74
|
+
remaining--;
|
|
75
|
+
}
|
|
76
|
+
return Math.min(offset + Math.max(0, column - 1), source.length);
|
|
77
|
+
}
|
|
78
|
+
function locateMappingError(file, source, element, err, attr) {
|
|
79
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
80
|
+
const needle = needleFromMessage(message);
|
|
81
|
+
if (attr) {
|
|
82
|
+
let loc = attributeValueLoc(file, source, element, attr.name, attr.value);
|
|
83
|
+
if (loc) {
|
|
84
|
+
if (needle) {
|
|
85
|
+
loc = refineToNeedle(loc, source, needle);
|
|
86
|
+
}
|
|
87
|
+
return loc;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
if (needle) {
|
|
91
|
+
const near = locateNeedleNearElement(file, source, element, needle);
|
|
92
|
+
if (near) {
|
|
93
|
+
return near;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
return elementSourceLoc(file, source, element);
|
|
97
|
+
}
|
|
98
|
+
function withElementLocation(file, source, element, fn, attr) {
|
|
99
|
+
try {
|
|
100
|
+
return fn();
|
|
101
|
+
}
|
|
102
|
+
catch (err) {
|
|
103
|
+
if (err instanceof MappingError) {
|
|
104
|
+
throw err;
|
|
105
|
+
}
|
|
106
|
+
throw mappingErrorFromUnknown(err, locateMappingError(file, source, element, err, attr));
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
export { withElementLocation };
|
|
110
|
+
//# sourceMappingURL=mapping-error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mapping-error.js","sourceRoot":"","sources":["../../src/util/mapping-error.ts"],"names":[],"mappings":"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"}
|
package/dist/util/qname.d.ts
CHANGED
|
@@ -19,4 +19,18 @@ export declare function elementSourceLoc(file: string, source: string, element:
|
|
|
19
19
|
lineNumber?: number;
|
|
20
20
|
columnNumber?: number;
|
|
21
21
|
}): SourceLocation;
|
|
22
|
+
/** Span of an attribute value inside the element's start tag. */
|
|
23
|
+
declare function attributeValueLoc(file: string, source: string, element: {
|
|
24
|
+
nodeName: string;
|
|
25
|
+
lineNumber?: number;
|
|
26
|
+
columnNumber?: number;
|
|
27
|
+
}, attrName: string, attrValue: string): SourceLocation | undefined;
|
|
28
|
+
/** First occurrence of `needle` (or `needle:`) within the element's source span. */
|
|
29
|
+
declare function locateNeedleNearElement(file: string, source: string, element: {
|
|
30
|
+
nodeName: string;
|
|
31
|
+
lineNumber?: number;
|
|
32
|
+
columnNumber?: number;
|
|
33
|
+
}, needle: string): SourceLocation | undefined;
|
|
34
|
+
declare function isWellKnownTypeFqn(fqn: string): boolean;
|
|
35
|
+
export { attributeValueLoc, isWellKnownTypeFqn, locateNeedleNearElement };
|
|
22
36
|
//# sourceMappingURL=qname.d.ts.map
|
package/dist/util/qname.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"qname.d.ts","sourceRoot":"","sources":["../../src/util/qname.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,eAAO,MAAM,MAAM,8CAA8C,CAAC;AAClE,eAAO,MAAM,SAAS,2BAA2B,CAAC;AAClD,eAAO,MAAM,qBAAqB,6CACU,CAAC;AAU7C,MAAM,MAAM,wBAAwB,GAChC,MAAM,GACN,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,YAAY,GACZ,OAAO,GACP,UAAU,CAAC;AAsCf,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAM3E;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAgDR;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,OAAO,GAAE,wBAAiC,GACzC,MAAM,
|
|
1
|
+
{"version":3,"file":"qname.d.ts","sourceRoot":"","sources":["../../src/util/qname.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,eAAO,MAAM,MAAM,8CAA8C,CAAC;AAClE,eAAO,MAAM,SAAS,2BAA2B,CAAC;AAClD,eAAO,MAAM,qBAAqB,6CACU,CAAC;AAU7C,MAAM,MAAM,wBAAwB,GAChC,MAAM,GACN,UAAU,GACV,YAAY,GACZ,QAAQ,GACR,YAAY,GACZ,OAAO,GACP,UAAU,CAAC;AAsCf,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAM3E;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,MAAM,GAAG,SAAS,CAKpB;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAgDR;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,OAAO,GAAE,wBAAiC,GACzC,MAAM,CAqDR;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,OAAO,CAQT;AAED,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/B,MAAM,CAeR;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,UAAU,SAAI,GACb,cAAc,CAkBhB;AA8FD,kEAAkE;AAClE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,GACxE,cAAc,CAahB;AAmBD,iEAAiE;AACjE,iBAAS,iBAAiB,CACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EACzE,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,cAAc,GAAG,SAAS,CAgB5B;AAED,oFAAoF;AACpF,iBAAS,uBAAuB,CAC9B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,EACzE,MAAM,EAAE,MAAM,GACb,cAAc,GAAG,SAAS,CAe5B;AAWD,iBAAS,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,CAAC"}
|