@blockml/framework 0.9.0 → 0.9.2
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/framework/Library.bml +8 -1
- package/blocks/org/blockml/bml/framework/capability/EvaluateExpression.bml +50 -0
- package/blocks/org/blockml/bml/framework/capability/EvaluateInterpolatedText.bml +50 -0
- package/blocks/org/blockml/bml/framework/capability/EvaluateParseValue.bml +68 -0
- package/blocks/org/blockml/bml/framework/capability/FindLocalMember.bml +58 -0
- package/blocks/org/blockml/bml/framework/capability/ForkBom.bml +1 -1
- package/blocks/org/blockml/bml/framework/capability/ParseInterpolatedText.bml +54 -0
- package/blocks/org/blockml/bml/framework/capability/TypeRegistry.bml +10 -1
- package/blocks/org/blockml/bml/framework/capability/ValidateGenerics.bml +66 -0
- package/blocks/org/blockml/bml/framework/capability/ValidateTypes.bml +19 -1
- package/blocks/org/blockml/bml/framework/config/FrameworkDiagnosticCodes.bml +1 -1
- package/blocks/org/blockml/bml/framework/documentation/Diagnostics.bml +22 -3
- package/blocks/org/blockml/bml/framework/documentation/EffectiveMembers.bml +2 -0
- package/blocks/org/blockml/bml/framework/documentation/ExpressionParsing.bml +6 -3
- package/blocks/org/blockml/bml/framework/documentation/PublicApi.bml +7 -1
- package/blocks/org/blockml/bml/framework/documentation/TypeRegistryBootstrap.bml +8 -7
- package/blocks/org/blockml/bml/framework/expression/ExpressionNode.bml +1 -1
- package/blocks/org/blockml/bml/framework/expression/InterpolatedStringNode.bml +51 -0
- package/dist/expression/evaluate-expression.d.ts +9 -0
- package/dist/expression/evaluate-expression.d.ts.map +1 -0
- package/dist/expression/evaluate-expression.js +124 -0
- package/dist/expression/evaluate-expression.js.map +1 -0
- package/dist/expression/parse-interpolated-text.d.ts +3 -0
- package/dist/expression/parse-interpolated-text.d.ts.map +1 -0
- package/dist/expression/parse-interpolated-text.js +80 -0
- package/dist/expression/parse-interpolated-text.js.map +1 -0
- package/dist/expression/restricted.d.ts +5 -0
- package/dist/expression/restricted.d.ts.map +1 -0
- package/dist/expression/restricted.js +65 -0
- package/dist/expression/restricted.js.map +1 -0
- package/dist/expression/types.d.ts +5 -1
- package/dist/expression/types.d.ts.map +1 -1
- package/dist/index.d.ts +8 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -1
- package/dist/index.js.map +1 -1
- package/dist/registry/bootstrap.d.ts.map +1 -1
- package/dist/registry/bootstrap.js +12 -2
- package/dist/registry/bootstrap.js.map +1 -1
- package/dist/registry/library-bootstrap.d.ts.map +1 -1
- package/dist/registry/library-bootstrap.js +14 -3
- package/dist/registry/library-bootstrap.js.map +1 -1
- package/dist/registry/package-paths.d.ts +2 -0
- package/dist/registry/package-paths.d.ts.map +1 -1
- package/dist/registry/package-paths.js +7 -0
- package/dist/registry/package-paths.js.map +1 -1
- package/dist/registry/type-registry.d.ts +5 -0
- package/dist/registry/type-registry.d.ts.map +1 -1
- package/dist/registry/type-registry.js +25 -1
- package/dist/registry/type-registry.js.map +1 -1
- package/dist/resolve/resolve-generic-application.d.ts +18 -0
- package/dist/resolve/resolve-generic-application.d.ts.map +1 -0
- package/dist/resolve/resolve-generic-application.js +129 -0
- package/dist/resolve/resolve-generic-application.js.map +1 -0
- package/dist/resolve/satisfies-type-bound.d.ts +4 -0
- package/dist/resolve/satisfies-type-bound.d.ts.map +1 -0
- package/dist/resolve/satisfies-type-bound.js +20 -0
- package/dist/resolve/satisfies-type-bound.js.map +1 -0
- package/dist/validate/evaluate-parse-value.d.ts +13 -0
- package/dist/validate/evaluate-parse-value.d.ts.map +1 -0
- package/dist/validate/evaluate-parse-value.js +138 -0
- package/dist/validate/evaluate-parse-value.js.map +1 -0
- package/dist/validate/instance-ids.d.ts +10 -0
- package/dist/validate/instance-ids.d.ts.map +1 -0
- package/dist/validate/instance-ids.js +57 -0
- package/dist/validate/instance-ids.js.map +1 -0
- package/dist/validate/reference-kinds.d.ts +50 -0
- package/dist/validate/reference-kinds.d.ts.map +1 -0
- package/dist/validate/reference-kinds.js +111 -0
- package/dist/validate/reference-kinds.js.map +1 -0
- package/dist/validate/validate-generics.d.ts +4 -0
- package/dist/validate/validate-generics.d.ts.map +1 -0
- package/dist/validate/validate-generics.js +141 -0
- package/dist/validate/validate-generics.js.map +1 -0
- package/dist/validate/validate-instances.d.ts.map +1 -1
- package/dist/validate/validate-instances.js +1 -61
- package/dist/validate/validate-instances.js.map +1 -1
- package/dist/validate/validate-parse-values.d.ts +4 -0
- package/dist/validate/validate-parse-values.d.ts.map +1 -0
- package/dist/validate/validate-parse-values.js +181 -0
- package/dist/validate/validate-parse-values.js.map +1 -0
- package/dist/validate/validate-references.d.ts +5 -0
- package/dist/validate/validate-references.d.ts.map +1 -0
- package/dist/validate/validate-references.js +392 -0
- package/dist/validate/validate-references.js.map +1 -0
- package/dist/validate/validate-types.d.ts.map +1 -1
- package/dist/validate/validate-types.js +117 -129
- package/dist/validate/validate-types.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,113 +1,60 @@
|
|
|
1
1
|
import { parseExpression } from "../expression/parse-expression.js";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
2
|
+
import { parseInterpolatedText } from "../expression/parse-interpolated-text.js";
|
|
3
|
+
import { INTERPOLATION_NOT_ALLOWED } from "../expression/restricted.js";
|
|
4
|
+
import { memberIdentityKey, resolveEffectiveMembers, } from "../resolve/resolve-effective-members.js";
|
|
5
|
+
import { validateParseValues } from "./validate-parse-values.js";
|
|
6
|
+
import { validateReferences } from "./validate-references.js";
|
|
7
|
+
const TEXT_TYPE_FQN = "org.blockml.bml.type.Text";
|
|
8
|
+
function containsUnescapedInterpolation(raw) {
|
|
9
|
+
for (let i = 0; i < raw.length - 1; i++) {
|
|
10
|
+
if (raw[i] === "$" && raw[i + 1] === "{") {
|
|
11
|
+
if (i === 0 || raw[i - 1] !== "\\") {
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
12
15
|
}
|
|
13
|
-
|
|
14
|
-
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
18
|
+
function namedTypeFqn(expr, fallback) {
|
|
19
|
+
if (expr?.kind === "named") {
|
|
20
|
+
return expr.fqn;
|
|
15
21
|
}
|
|
16
|
-
|
|
22
|
+
if (expr?.kind === "grouped") {
|
|
23
|
+
return namedTypeFqn(expr.expression, fallback);
|
|
24
|
+
}
|
|
25
|
+
return fallback;
|
|
17
26
|
}
|
|
18
|
-
function
|
|
19
|
-
return
|
|
27
|
+
function isTextType(expr, fallback) {
|
|
28
|
+
return namedTypeFqn(expr, fallback) === TEXT_TYPE_FQN && !hasMultiplicity(expr);
|
|
20
29
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
function satisfiesTypeBound(typeFqn, boundFqn, registry) {
|
|
24
|
-
if (typeFqn === boundFqn) {
|
|
25
|
-
return true;
|
|
26
|
-
}
|
|
27
|
-
const start = registry.get(typeFqn)?.block;
|
|
28
|
-
if (!start) {
|
|
30
|
+
function isTextListType(expr, fallback) {
|
|
31
|
+
if (namedTypeFqn(expr, fallback) !== TEXT_TYPE_FQN) {
|
|
29
32
|
return false;
|
|
30
33
|
}
|
|
31
|
-
|
|
32
|
-
return true;
|
|
33
|
-
}
|
|
34
|
-
const chain = collectBaseTypeChain(start, registry);
|
|
35
|
-
if (chain.some((b) => b.type === boundFqn)) {
|
|
36
|
-
return true;
|
|
37
|
-
}
|
|
38
|
-
return chain[0]?.baseType === boundFqn;
|
|
34
|
+
return hasMultiplicity(expr);
|
|
39
35
|
}
|
|
40
|
-
function
|
|
36
|
+
function hasMultiplicity(expr) {
|
|
41
37
|
if (!expr) {
|
|
42
|
-
return;
|
|
38
|
+
return false;
|
|
43
39
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
visit(expr.fqn);
|
|
47
|
-
for (const arg of expr.typeArguments ?? []) {
|
|
48
|
-
walkNamedTypes(arg, visit);
|
|
49
|
-
}
|
|
50
|
-
break;
|
|
51
|
-
case "union":
|
|
52
|
-
for (const alt of expr.alternatives) {
|
|
53
|
-
walkNamedTypes(alt, visit);
|
|
54
|
-
}
|
|
55
|
-
break;
|
|
56
|
-
case "grouped":
|
|
57
|
-
walkNamedTypes(expr.expression, visit);
|
|
58
|
-
break;
|
|
59
|
-
case "anonymousStruct":
|
|
60
|
-
for (const field of expr.fields) {
|
|
61
|
-
walkNamedTypes(field.type, visit);
|
|
62
|
-
}
|
|
63
|
-
break;
|
|
64
|
-
default:
|
|
65
|
-
break;
|
|
40
|
+
if (expr.kind === "named" || expr.kind === "grouped") {
|
|
41
|
+
return expr.multiplicity !== undefined;
|
|
66
42
|
}
|
|
43
|
+
return false;
|
|
67
44
|
}
|
|
68
|
-
function
|
|
69
|
-
const
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
45
|
+
function diag(code, message, file, loc) {
|
|
46
|
+
const source = {
|
|
47
|
+
file: loc?.file ?? file,
|
|
48
|
+
line: loc?.line ?? 1,
|
|
49
|
+
column: loc?.column ?? 1,
|
|
74
50
|
};
|
|
75
|
-
if (
|
|
76
|
-
|
|
77
|
-
walkNamedTypes(member.type, report);
|
|
78
|
-
}
|
|
79
|
-
else if (member.typeFqn) {
|
|
80
|
-
report(member.typeFqn);
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
else if (member.kind === "aggregation" || member.kind === "association") {
|
|
84
|
-
walkNamedTypes(member.type, report);
|
|
51
|
+
if (loc?.endLine !== undefined) {
|
|
52
|
+
source.endLine = loc.endLine;
|
|
85
53
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
report(member.typeFqn);
|
|
89
|
-
}
|
|
90
|
-
walkNamedTypes(member.inputType, (fqn) => {
|
|
91
|
-
if (!typeIsKnown(fqn, registry)) {
|
|
92
|
-
diagnostics.push(diag("BML_UNKNOWN_TYPE", `Unknown type: ${fqn}`, file, member.inputTypeSource ?? loc));
|
|
93
|
-
}
|
|
94
|
-
});
|
|
95
|
-
walkNamedTypes(member.outputType, (fqn) => {
|
|
96
|
-
if (!typeIsKnown(fqn, registry)) {
|
|
97
|
-
diagnostics.push(diag("BML_UNKNOWN_TYPE", `Unknown type: ${fqn}`, file, member.outputTypeSource ?? loc));
|
|
98
|
-
}
|
|
99
|
-
});
|
|
100
|
-
for (const thrown of member.throws ?? []) {
|
|
101
|
-
const fqn = thrown.value;
|
|
102
|
-
if (!typeIsKnown(fqn, registry)) {
|
|
103
|
-
diagnostics.push(diag("BML_UNKNOWN_TYPE", `Unknown type: ${fqn}`, file, loc));
|
|
104
|
-
continue;
|
|
105
|
-
}
|
|
106
|
-
if (!satisfiesTypeBound(fqn, CORE_EXCEPTION, registry)) {
|
|
107
|
-
diagnostics.push(diag("BML_TYPE_BOUND_NOT_SATISFIED", `Type ${fqn} does not satisfy bound ${CORE_EXCEPTION}`, file, loc));
|
|
108
|
-
}
|
|
109
|
-
}
|
|
54
|
+
if (loc?.endColumn !== undefined) {
|
|
55
|
+
source.endColumn = loc.endColumn;
|
|
110
56
|
}
|
|
57
|
+
return { severity: "error", code, message, source };
|
|
111
58
|
}
|
|
112
59
|
function literalNumber(val) {
|
|
113
60
|
if (!val || val.kind !== "literal") {
|
|
@@ -116,14 +63,6 @@ function literalNumber(val) {
|
|
|
116
63
|
return typeof val.value === "number" ? val.value : undefined;
|
|
117
64
|
}
|
|
118
65
|
function validateBlockDefinition(block, registry, file, diagnostics) {
|
|
119
|
-
if (block.baseType && !registry.has(block.baseType)) {
|
|
120
|
-
diagnostics.push(diag("BML_UNKNOWN_BASE_TYPE", `Unknown baseType: ${block.baseType}`, file, block.baseTypeSource ?? block.source));
|
|
121
|
-
}
|
|
122
|
-
for (const ref of block.contracts ?? []) {
|
|
123
|
-
if (!registry.has(ref.value)) {
|
|
124
|
-
diagnostics.push(diag("BML_UNKNOWN_CONTRACT", `Unknown contract: ${ref.value}`, file, block.source));
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
66
|
const effective = resolveEffectiveMembers(block, registry);
|
|
128
67
|
const seen = new Set();
|
|
129
68
|
for (const member of effective) {
|
|
@@ -134,7 +73,6 @@ function validateBlockDefinition(block, registry, file, diagnostics) {
|
|
|
134
73
|
seen.add(key);
|
|
135
74
|
}
|
|
136
75
|
for (const member of block.members) {
|
|
137
|
-
validateMemberTypes(member, registry, file, diagnostics);
|
|
138
76
|
const skipOverrideCheck = member.kind === "aggregation" &&
|
|
139
77
|
(member.composition !== undefined || member.default === true);
|
|
140
78
|
if (member.override) {
|
|
@@ -158,51 +96,99 @@ function validateBlockDefinition(block, registry, file, diagnostics) {
|
|
|
158
96
|
if (member.kind === "property") {
|
|
159
97
|
validatePropertyExpressions(member, file, diagnostics);
|
|
160
98
|
}
|
|
99
|
+
if (member.kind === "aggregation" && member.composition) {
|
|
100
|
+
walkCompositionNodes(member.composition.children, registry, file, diagnostics);
|
|
101
|
+
}
|
|
161
102
|
}
|
|
162
103
|
for (const sub of block.subBlocks) {
|
|
163
104
|
validateBlockDefinition(sub, registry, file, diagnostics);
|
|
164
105
|
}
|
|
165
106
|
}
|
|
166
|
-
function
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
107
|
+
function interpolationParseCode(message) {
|
|
108
|
+
if (message === INTERPOLATION_NOT_ALLOWED) {
|
|
109
|
+
return "BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION";
|
|
110
|
+
}
|
|
111
|
+
if (message === "Unclosed interpolation") {
|
|
112
|
+
return "BML_EXPR_SYNTAX_ERROR";
|
|
113
|
+
}
|
|
114
|
+
return "BML_EXPRESSION_PARSE_ERROR";
|
|
115
|
+
}
|
|
116
|
+
function validateInterpolatedRaw(raw, label, file, diagnostics, loc) {
|
|
117
|
+
const parsed = parseInterpolatedText(raw);
|
|
118
|
+
if (!parsed.ok) {
|
|
119
|
+
diagnostics.push(diag(interpolationParseCode(parsed.error.message), `${label}: ${parsed.error.message}`, file, loc));
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
function validateTextListLeaves(value, label, file, diagnostics, loc) {
|
|
123
|
+
if (!Array.isArray(value)) {
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
for (const item of value) {
|
|
127
|
+
if (typeof item === "string" && containsUnescapedInterpolation(item)) {
|
|
128
|
+
validateInterpolatedRaw(item, label, file, diagnostics, loc);
|
|
170
129
|
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
function validateMemberValueExpressions(val, label, file, diagnostics, type, typeFqn) {
|
|
133
|
+
if (!val) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
if (val.kind === "expression") {
|
|
171
137
|
const expr = val;
|
|
172
138
|
const parsed = parseExpression(expr.raw);
|
|
173
139
|
if (!parsed.ok) {
|
|
174
140
|
diagnostics.push(diag("BML_EXPRESSION_PARSE_ERROR", `${label}: ${parsed.error.message}`, file, expr.source));
|
|
175
141
|
}
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
if (val.kind === "interpolated") {
|
|
145
|
+
const interpolated = val;
|
|
146
|
+
if (type !== undefined || typeFqn !== undefined) {
|
|
147
|
+
if (!isTextType(type, typeFqn)) {
|
|
148
|
+
diagnostics.push(diag("BML_EXPR_TYPE_MISMATCH", `${label}: interpolated text is only allowed on type:Text`, file, interpolated.source));
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
validateInterpolatedRaw(interpolated.raw, label, file, diagnostics, interpolated.source);
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
if (val.kind === "literal" && isTextListType(type, typeFqn)) {
|
|
156
|
+
validateTextListLeaves(val.value, label, file, diagnostics);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
function validatePropertyExpressions(prop, file, diagnostics) {
|
|
160
|
+
const checkVal = (val) => {
|
|
161
|
+
validateMemberValueExpressions(val, prop.name, file, diagnostics, prop.type, prop.typeFqn);
|
|
176
162
|
};
|
|
177
|
-
checkVal(prop.value
|
|
163
|
+
checkVal(prop.value);
|
|
178
164
|
for (const entry of prop.values ?? []) {
|
|
179
|
-
checkVal(entry.value
|
|
165
|
+
checkVal(entry.value);
|
|
180
166
|
}
|
|
181
167
|
}
|
|
182
|
-
function validateInstanceExpressions(instance, file, diagnostics) {
|
|
168
|
+
function validateInstanceExpressions(instance, registry, file, diagnostics) {
|
|
169
|
+
const typeBlock = registry.get(instance.typeFqn)?.block;
|
|
170
|
+
const members = typeBlock ? resolveEffectiveMembers(typeBlock, registry) : [];
|
|
183
171
|
for (const [name, val] of Object.entries(instance.memberValues)) {
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
172
|
+
const prop = members.find((member) => member.kind === "property" && member.name === name);
|
|
173
|
+
validateMemberValueExpressions(val, name, file, diagnostics, prop?.type, prop?.typeFqn);
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
function walkCompositionNodes(nodes, registry, file, diagnostics) {
|
|
177
|
+
for (const child of nodes) {
|
|
178
|
+
if (child.kind === "blockInstance") {
|
|
179
|
+
validateInstanceExpressions(child.instance, registry, file, diagnostics);
|
|
180
|
+
for (const agg of child.instance.aggregationCompositions ?? []) {
|
|
181
|
+
walkCompositionNodes(agg.composition.children, registry, file, diagnostics);
|
|
188
182
|
}
|
|
189
183
|
}
|
|
184
|
+
else {
|
|
185
|
+
walkCompositionNodes(child.children, registry, file, diagnostics);
|
|
186
|
+
}
|
|
190
187
|
}
|
|
191
188
|
}
|
|
192
|
-
function walkCompositions(block, file, diagnostics) {
|
|
189
|
+
function walkCompositions(block, registry, file, diagnostics) {
|
|
193
190
|
for (const template of block.compositions) {
|
|
194
|
-
|
|
195
|
-
if (child.kind === "blockInstance") {
|
|
196
|
-
validateInstanceExpressions(child.instance, file, diagnostics);
|
|
197
|
-
}
|
|
198
|
-
else {
|
|
199
|
-
for (const nested of child.children) {
|
|
200
|
-
if (nested.kind === "blockInstance") {
|
|
201
|
-
validateInstanceExpressions(nested.instance, file, diagnostics);
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
}
|
|
205
|
-
}
|
|
191
|
+
walkCompositionNodes(template.children, registry, file, diagnostics);
|
|
206
192
|
}
|
|
207
193
|
}
|
|
208
194
|
export function validateTypes(document, registry) {
|
|
@@ -211,8 +197,10 @@ export function validateTypes(document, registry) {
|
|
|
211
197
|
if (document.block.type && !registry.has(document.block.type)) {
|
|
212
198
|
registry.register(document);
|
|
213
199
|
}
|
|
200
|
+
diagnostics.push(...validateReferences(document, registry));
|
|
201
|
+
diagnostics.push(...validateParseValues(document, registry));
|
|
214
202
|
validateBlockDefinition(document.block, registry, file, diagnostics);
|
|
215
|
-
walkCompositions(document.block, file, diagnostics);
|
|
203
|
+
walkCompositions(document.block, registry, file, diagnostics);
|
|
216
204
|
return diagnostics;
|
|
217
205
|
}
|
|
218
206
|
export function getLiteralNumericValue(val) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-types.js","sourceRoot":"","sources":["../../src/validate/validate-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate-types.js","sourceRoot":"","sources":["../../src/validate/validate-types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blockml/framework",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.2",
|
|
4
4
|
"description": "BlockML framework — TypeRegistry, fork/resolve, parseExpression, validateTypes",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"test": "vitest run packages/framework/test"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@blockml/bom": "^0.9.
|
|
36
|
-
"@blockml/core": "^1.
|
|
37
|
-
"@blockml/parser": "^0.9.
|
|
35
|
+
"@blockml/bom": "^0.9.2",
|
|
36
|
+
"@blockml/core": "^1.1.1",
|
|
37
|
+
"@blockml/parser": "^0.9.2"
|
|
38
38
|
},
|
|
39
39
|
"engines": {
|
|
40
40
|
"node": ">=20"
|