@blockml/framework 0.3.0 → 0.5.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/framework/Library.bml +1 -1
- package/blocks/org/blockml/bml/framework/capability/ValidateInstances.bml +4 -1
- package/blocks/org/blockml/bml/framework/config/FrameworkDiagnosticCodes.bml +1 -1
- package/blocks/org/blockml/bml/framework/documentation/Diagnostics.bml +6 -1
- package/dist/validate/validate-instances.d.ts +1 -1
- package/dist/validate/validate-instances.d.ts.map +1 -1
- package/dist/validate/validate-instances.js +54 -7
- package/dist/validate/validate-instances.js.map +1 -1
- package/dist/validate/validate-types.d.ts.map +1 -1
- package/dist/validate/validate-types.js +87 -9
- package/dist/validate/validate-types.js.map +1 -1
- package/package.json +4 -4
|
@@ -17,7 +17,10 @@
|
|
|
17
17
|
<name>ValidateInstances</name>
|
|
18
18
|
<type>fwcap:ValidateInstances</type>
|
|
19
19
|
<baseType>core:Capability</baseType>
|
|
20
|
-
<is>Instance id and cross-reference rules</is>
|
|
20
|
+
<is>Instance type, member, id, and cross-reference rules</is>
|
|
21
|
+
|
|
22
|
+
<documentation>Unknown instance typeFqn → BML_UNKNOWN_TYPE. memberValues keys not in
|
|
23
|
+
resolveEffectiveMembers → BML_UNKNOWN_PROPERTY. Unresolved refs and missing bml:id on bml:each remain.</documentation>
|
|
21
24
|
|
|
22
25
|
<properties>
|
|
23
26
|
<document type="bomdoc:BomDocument">
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
|
|
38
38
|
<properties>
|
|
39
39
|
<codes type="type:Text[]">
|
|
40
|
-
<documentation>Ordered: BML_UNKNOWN_BASE_TYPE, BML_UNKNOWN_CONTRACT, BML_MEMBER_COLLISION, BML_OVERRIDE_WITHOUT_PARENT, BML_OVERRIDE_REQUIRED, BML_EXPRESSION_PARSE_ERROR, BML_CONSTRAINT_VIOLATION, BML_CONSTRAINT_WARNING, BML_CONSTRAINT_INFORMATION, BML_CONSTRAINT_UNKNOWN, BML_CONSTRAINT_TARGET_MISMATCH, BML_EMBEDDED_BLOCKS_ON_SUBBLOCK, BML_NESTED_EMBEDDED_BLOCKS, BML_DUPLICATE_EMBEDDED_BLOCK, BML_SUBBLOCK_TYPE_MISMATCH, BML_MISSING_ID, BML_UNRESOLVABLE_INSTANCE_REF, BML_PRESET_CYCLE, BML_UNKNOWN_PROPERTY, BML_DUPLICATE_MEMBER_VISIBILITY_VARIANT, BML_VISIBILITY_PRIVATE_OVERRIDE, BML_READONLY_MEMBER_WRITE, BML_MISSING_VERSION, BML_UNKNOWN_VERSION, BML_LIBRARY_RESOLVE_ERROR, BML_LIBRARY_NESTING_VIOLATION, BML_BOOTSTRAP_READ_ERROR (required)</documentation>
|
|
40
|
+
<documentation>Ordered: BML_UNKNOWN_BASE_TYPE, BML_UNKNOWN_TYPE, BML_UNKNOWN_CONTRACT, BML_MEMBER_COLLISION, BML_OVERRIDE_WITHOUT_PARENT, BML_OVERRIDE_REQUIRED, BML_EXPRESSION_PARSE_ERROR, BML_CONSTRAINT_VIOLATION, BML_CONSTRAINT_WARNING, BML_CONSTRAINT_INFORMATION, BML_CONSTRAINT_UNKNOWN, BML_CONSTRAINT_TARGET_MISMATCH, BML_EMBEDDED_BLOCKS_ON_SUBBLOCK, BML_NESTED_EMBEDDED_BLOCKS, BML_DUPLICATE_EMBEDDED_BLOCK, BML_SUBBLOCK_TYPE_MISMATCH, BML_MISSING_ID, BML_UNRESOLVABLE_INSTANCE_REF, BML_PRESET_CYCLE, BML_UNKNOWN_PROPERTY, BML_DUPLICATE_MEMBER_VISIBILITY_VARIANT, BML_VISIBILITY_PRIVATE_OVERRIDE, BML_READONLY_MEMBER_WRITE, BML_MISSING_VERSION, BML_UNKNOWN_VERSION, BML_LIBRARY_RESOLVE_ERROR, BML_LIBRARY_NESTING_VIOLATION, BML_BOOTSTRAP_READ_ERROR (required)</documentation>
|
|
41
41
|
</codes>
|
|
42
42
|
</properties>
|
|
43
43
|
|
|
@@ -37,13 +37,18 @@
|
|
|
37
37
|
<documentation>Diagnostic codes emitted by framework utilities (see fwconfig:FrameworkDiagnosticCodes):
|
|
38
38
|
|
|
39
39
|
validateTypes:
|
|
40
|
-
• BML_UNKNOWN_BASE_TYPE — baseType FQN not in TypeRegistry
|
|
40
|
+
• BML_UNKNOWN_BASE_TYPE — baseType FQN not in TypeRegistry (at baseTypeSource)
|
|
41
41
|
• BML_UNKNOWN_CONTRACT — contracts[] FQN not in TypeRegistry
|
|
42
|
+
• BML_UNKNOWN_TYPE — named type FQN not in TypeRegistry and not a well-known primitive (member types at typeSource; instance typeFqn on the instance)
|
|
42
43
|
• BML_MEMBER_COLLISION — duplicate member identity in effective set
|
|
43
44
|
• BML_OVERRIDE_WITHOUT_PARENT — override without resolvable base member
|
|
44
45
|
• BML_OVERRIDE_REQUIRED — override on non-overridable member
|
|
45
46
|
• BML_EXPRESSION_PARSE_ERROR — parseExpression failed on ExpressionValue.raw
|
|
46
47
|
|
|
48
|
+
validateInstances:
|
|
49
|
+
• BML_UNKNOWN_TYPE — composition instance typeFqn not in TypeRegistry
|
|
50
|
+
• BML_UNKNOWN_PROPERTY — instance memberValues key not in effective members (error)
|
|
51
|
+
|
|
47
52
|
validateVersions:
|
|
48
53
|
• BML_MISSING_VERSION — standalone root block missing effective version (non-framework convention)
|
|
49
54
|
• BML_UNKNOWN_VERSION — bml:version pin does not match registered block version
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { BomDocument, Diagnostic } from "@blockml/bom";
|
|
2
2
|
import type { TypeRegistry } from "../registry/type-registry.js";
|
|
3
|
-
export declare function validateInstances(document: BomDocument,
|
|
3
|
+
export declare function validateInstances(document: BomDocument, registry: TypeRegistry): Diagnostic[];
|
|
4
4
|
//# sourceMappingURL=validate-instances.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-instances.d.ts","sourceRoot":"","sources":["../../src/validate/validate-instances.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,WAAW,
|
|
1
|
+
{"version":3,"file":"validate-instances.d.ts","sourceRoot":"","sources":["../../src/validate/validate-instances.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,WAAW,EAEX,UAAU,EAEX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AA4PjE,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,YAAY,GACrB,UAAU,EAAE,CAMd"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { resolveEffectiveMembers } from "../resolve/resolve-effective-members.js";
|
|
1
2
|
function diag(code, message, file, line = 1, column = 1) {
|
|
2
3
|
return { severity: "error", code, message, source: { file, line, column } };
|
|
3
4
|
}
|
|
@@ -53,6 +54,24 @@ function resolveInstanceRef(token, ids) {
|
|
|
53
54
|
}
|
|
54
55
|
return ids.has(token);
|
|
55
56
|
}
|
|
57
|
+
function validateInstanceSemantics(instance, registry, file, diagnostics) {
|
|
58
|
+
if (!instance.typeFqn) {
|
|
59
|
+
diagnostics.push(diag("BML_UNKNOWN_TYPE", "Unknown type: (missing instance typeFqn)", file, instance.source?.line, instance.source?.column));
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const typeDoc = registry.get(instance.typeFqn);
|
|
63
|
+
if (!typeDoc) {
|
|
64
|
+
diagnostics.push(diag("BML_UNKNOWN_TYPE", `Unknown type: ${instance.typeFqn}`, file, instance.source?.line, instance.source?.column));
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
const effective = resolveEffectiveMembers(typeDoc.block, registry);
|
|
68
|
+
const names = new Set(effective.map((m) => m.name));
|
|
69
|
+
for (const key of Object.keys(instance.memberValues)) {
|
|
70
|
+
if (!names.has(key)) {
|
|
71
|
+
diagnostics.push(diag("BML_UNKNOWN_PROPERTY", `Unknown property: ${key} on ${instance.typeFqn}`, file, instance.source?.line, instance.source?.column));
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
56
75
|
function validateInstanceRefs(instance, ids, file, diagnostics) {
|
|
57
76
|
if (instance.basePresets && !resolveInstanceRef(instance.basePresets, ids)) {
|
|
58
77
|
diagnostics.push(diag("BML_UNRESOLVABLE_INSTANCE_REF", `Unresolved basePresets reference: ${instance.basePresets}`, file, instance.source?.line, instance.source?.column));
|
|
@@ -74,16 +93,17 @@ function validateInstanceRefs(instance, ids, file, diagnostics) {
|
|
|
74
93
|
}
|
|
75
94
|
}
|
|
76
95
|
}
|
|
77
|
-
function validateCompositionNodes(nodes, ids, file, diagnostics) {
|
|
96
|
+
function validateCompositionNodes(nodes, ids, registry, file, diagnostics) {
|
|
78
97
|
for (const node of nodes) {
|
|
79
98
|
if (node.kind === "blockInstance") {
|
|
80
99
|
const hasEach = node.directives?.some((d) => d.type === "each");
|
|
81
100
|
if (hasEach && !instanceId(node.instance)) {
|
|
82
101
|
diagnostics.push(diag("BML_MISSING_ID", "bml:each requires explicit bml:id on the block instance", file, node.source?.line ?? node.instance.source?.line, node.source?.column ?? node.instance.source?.column));
|
|
83
102
|
}
|
|
103
|
+
validateInstanceSemantics(node.instance, registry, file, diagnostics);
|
|
84
104
|
validateInstanceRefs(node.instance, ids, file, diagnostics);
|
|
85
105
|
for (const agg of node.instance.aggregationCompositions ?? []) {
|
|
86
|
-
validateCompositionNodes(agg.composition.children, ids, file, diagnostics);
|
|
106
|
+
validateCompositionNodes(agg.composition.children, ids, registry, file, diagnostics);
|
|
87
107
|
}
|
|
88
108
|
}
|
|
89
109
|
else {
|
|
@@ -91,17 +111,44 @@ function validateCompositionNodes(nodes, ids, file, diagnostics) {
|
|
|
91
111
|
if (hasEach) {
|
|
92
112
|
diagnostics.push(diag("BML_MISSING_ID", "bml:each requires explicit bml:id on the container element", file, node.source?.line, node.source?.column));
|
|
93
113
|
}
|
|
94
|
-
validateCompositionNodes(node.children, ids, file, diagnostics);
|
|
114
|
+
validateCompositionNodes(node.children, ids, registry, file, diagnostics);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
function walkBlockInstances(block, registry, file, ids, diagnostics) {
|
|
119
|
+
for (const template of block.compositions) {
|
|
120
|
+
validateCompositionNodes(template.children, ids, registry, file, diagnostics);
|
|
121
|
+
}
|
|
122
|
+
for (const instance of block.constraints ?? []) {
|
|
123
|
+
validateInstanceSemantics(instance, registry, file, diagnostics);
|
|
124
|
+
validateInstanceRefs(instance, ids, file, diagnostics);
|
|
125
|
+
for (const agg of instance.aggregationCompositions ?? []) {
|
|
126
|
+
validateCompositionNodes(agg.composition.children, ids, registry, file, diagnostics);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
for (const member of block.members) {
|
|
130
|
+
for (const instance of member.constraints ?? []) {
|
|
131
|
+
validateInstanceSemantics(instance, registry, file, diagnostics);
|
|
132
|
+
validateInstanceRefs(instance, ids, file, diagnostics);
|
|
133
|
+
}
|
|
134
|
+
if (member.kind === "property") {
|
|
135
|
+
for (const instance of member.suggestions ?? []) {
|
|
136
|
+
validateInstanceSemantics(instance, registry, file, diagnostics);
|
|
137
|
+
}
|
|
95
138
|
}
|
|
96
139
|
}
|
|
140
|
+
for (const sub of block.subBlocks) {
|
|
141
|
+
walkBlockInstances(sub, registry, file, ids, diagnostics);
|
|
142
|
+
}
|
|
143
|
+
for (const embedded of block.embeddedBlocks) {
|
|
144
|
+
walkBlockInstances(embedded, registry, file, ids, diagnostics);
|
|
145
|
+
}
|
|
97
146
|
}
|
|
98
|
-
export function validateInstances(document,
|
|
147
|
+
export function validateInstances(document, registry) {
|
|
99
148
|
const diagnostics = [];
|
|
100
149
|
const file = document.source.filePath ?? "<memory>";
|
|
101
150
|
const ids = collectDocumentInstanceIds(document.block, file);
|
|
102
|
-
|
|
103
|
-
validateCompositionNodes(template.children, ids, file, diagnostics);
|
|
104
|
-
}
|
|
151
|
+
walkBlockInstances(document.block, registry, file, ids, diagnostics);
|
|
105
152
|
return diagnostics;
|
|
106
153
|
}
|
|
107
154
|
//# sourceMappingURL=validate-instances.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-instances.js","sourceRoot":"","sources":["../../src/validate/validate-instances.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate-instances.js","sourceRoot":"","sources":["../../src/validate/validate-instances.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-types.d.ts","sourceRoot":"","sources":["../../src/validate/validate-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,WAAW,EACX,UAAU,EAEV,YAAY,EAEZ,WAAW,EACX,kBAAkB,
|
|
1
|
+
{"version":3,"file":"validate-types.d.ts","sourceRoot":"","sources":["../../src/validate/validate-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,WAAW,EACX,UAAU,EAEV,YAAY,EAEZ,WAAW,EACX,kBAAkB,EAGnB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAqRjE,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,YAAY,GACrB,UAAU,EAAE,CAYd;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,WAAW,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAEvF;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS,CAYpF;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,WAAW,GAAG,SAAS,GAAG,GAAG,IAAI,YAAY,CAEhF"}
|
|
@@ -1,7 +1,84 @@
|
|
|
1
1
|
import { parseExpression } from "../expression/parse-expression.js";
|
|
2
2
|
import { memberIdentityKey, resolveEffectiveMembers, } from "../resolve/resolve-effective-members.js";
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import { isWellKnownTypeFqn } from "@blockml/parser";
|
|
4
|
+
function diag(code, message, file, loc) {
|
|
5
|
+
const source = {
|
|
6
|
+
file: loc?.file ?? file,
|
|
7
|
+
line: loc?.line ?? 1,
|
|
8
|
+
column: loc?.column ?? 1,
|
|
9
|
+
};
|
|
10
|
+
if (loc?.endLine !== undefined) {
|
|
11
|
+
source.endLine = loc.endLine;
|
|
12
|
+
}
|
|
13
|
+
if (loc?.endColumn !== undefined) {
|
|
14
|
+
source.endColumn = loc.endColumn;
|
|
15
|
+
}
|
|
16
|
+
return { severity: "error", code, message, source };
|
|
17
|
+
}
|
|
18
|
+
function typeIsKnown(fqn, registry) {
|
|
19
|
+
return registry.has(fqn) || isWellKnownTypeFqn(fqn);
|
|
20
|
+
}
|
|
21
|
+
function walkNamedTypes(expr, visit) {
|
|
22
|
+
if (!expr) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
switch (expr.kind) {
|
|
26
|
+
case "named":
|
|
27
|
+
visit(expr.fqn);
|
|
28
|
+
for (const arg of expr.typeArguments ?? []) {
|
|
29
|
+
walkNamedTypes(arg, visit);
|
|
30
|
+
}
|
|
31
|
+
break;
|
|
32
|
+
case "union":
|
|
33
|
+
for (const alt of expr.alternatives) {
|
|
34
|
+
walkNamedTypes(alt, visit);
|
|
35
|
+
}
|
|
36
|
+
break;
|
|
37
|
+
case "grouped":
|
|
38
|
+
walkNamedTypes(expr.expression, visit);
|
|
39
|
+
break;
|
|
40
|
+
case "anonymousStruct":
|
|
41
|
+
for (const field of expr.fields) {
|
|
42
|
+
walkNamedTypes(field.type, visit);
|
|
43
|
+
}
|
|
44
|
+
break;
|
|
45
|
+
default:
|
|
46
|
+
break;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
function validateMemberTypes(member, registry, file, diagnostics) {
|
|
50
|
+
const loc = member.typeSource ?? member.source;
|
|
51
|
+
const report = (fqn) => {
|
|
52
|
+
if (!typeIsKnown(fqn, registry)) {
|
|
53
|
+
diagnostics.push(diag("BML_UNKNOWN_TYPE", `Unknown type: ${fqn}`, file, loc));
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
if (member.kind === "property") {
|
|
57
|
+
if (member.type) {
|
|
58
|
+
walkNamedTypes(member.type, report);
|
|
59
|
+
}
|
|
60
|
+
else if (member.typeFqn) {
|
|
61
|
+
report(member.typeFqn);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
else if (member.kind === "aggregation" || member.kind === "association") {
|
|
65
|
+
walkNamedTypes(member.type, report);
|
|
66
|
+
}
|
|
67
|
+
else if (member.kind === "capability") {
|
|
68
|
+
if (member.typeFqn) {
|
|
69
|
+
report(member.typeFqn);
|
|
70
|
+
}
|
|
71
|
+
walkNamedTypes(member.inputType, (fqn) => {
|
|
72
|
+
if (!typeIsKnown(fqn, registry)) {
|
|
73
|
+
diagnostics.push(diag("BML_UNKNOWN_TYPE", `Unknown type: ${fqn}`, file, member.inputTypeSource ?? loc));
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
walkNamedTypes(member.outputType, (fqn) => {
|
|
77
|
+
if (!typeIsKnown(fqn, registry)) {
|
|
78
|
+
diagnostics.push(diag("BML_UNKNOWN_TYPE", `Unknown type: ${fqn}`, file, member.outputTypeSource ?? loc));
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
}
|
|
5
82
|
}
|
|
6
83
|
function literalNumber(val) {
|
|
7
84
|
if (!val || val.kind !== "literal") {
|
|
@@ -11,11 +88,11 @@ function literalNumber(val) {
|
|
|
11
88
|
}
|
|
12
89
|
function validateBlockDefinition(block, registry, file, diagnostics) {
|
|
13
90
|
if (block.baseType && !registry.has(block.baseType)) {
|
|
14
|
-
diagnostics.push(diag("BML_UNKNOWN_BASE_TYPE", `Unknown baseType: ${block.baseType}`, file, block.
|
|
91
|
+
diagnostics.push(diag("BML_UNKNOWN_BASE_TYPE", `Unknown baseType: ${block.baseType}`, file, block.baseTypeSource ?? block.source));
|
|
15
92
|
}
|
|
16
93
|
for (const ref of block.contracts ?? []) {
|
|
17
94
|
if (!registry.has(ref.value)) {
|
|
18
|
-
diagnostics.push(diag("BML_UNKNOWN_CONTRACT", `Unknown contract: ${ref.value}`, file, block.source
|
|
95
|
+
diagnostics.push(diag("BML_UNKNOWN_CONTRACT", `Unknown contract: ${ref.value}`, file, block.source));
|
|
19
96
|
}
|
|
20
97
|
}
|
|
21
98
|
const effective = resolveEffectiveMembers(block, registry);
|
|
@@ -23,11 +100,12 @@ function validateBlockDefinition(block, registry, file, diagnostics) {
|
|
|
23
100
|
for (const member of effective) {
|
|
24
101
|
const key = memberIdentityKey(member);
|
|
25
102
|
if (seen.has(key)) {
|
|
26
|
-
diagnostics.push(diag("BML_MEMBER_COLLISION", `Duplicate effective member identity: ${key}`, file, member.source
|
|
103
|
+
diagnostics.push(diag("BML_MEMBER_COLLISION", `Duplicate effective member identity: ${key}`, file, member.source));
|
|
27
104
|
}
|
|
28
105
|
seen.add(key);
|
|
29
106
|
}
|
|
30
107
|
for (const member of block.members) {
|
|
108
|
+
validateMemberTypes(member, registry, file, diagnostics);
|
|
31
109
|
const skipOverrideCheck = member.kind === "aggregation" &&
|
|
32
110
|
(member.composition !== undefined || member.default === true);
|
|
33
111
|
if (member.override) {
|
|
@@ -37,7 +115,7 @@ function validateBlockDefinition(block, registry, file, diagnostics) {
|
|
|
37
115
|
: [];
|
|
38
116
|
const hasParent = parentMembers.some((m) => memberIdentityKey(m) === memberIdentityKey(member) && m.kind === member.kind);
|
|
39
117
|
if (block.baseType && registry.has(block.baseType) && !hasParent) {
|
|
40
|
-
diagnostics.push(diag("BML_OVERRIDE_WITHOUT_PARENT", `override without parent member: ${member.name}`, file, member.source
|
|
118
|
+
diagnostics.push(diag("BML_OVERRIDE_WITHOUT_PARENT", `override without parent member: ${member.name}`, file, member.source));
|
|
41
119
|
}
|
|
42
120
|
}
|
|
43
121
|
else if (block.baseType && registry.has(block.baseType) && !skipOverrideCheck) {
|
|
@@ -45,7 +123,7 @@ function validateBlockDefinition(block, registry, file, diagnostics) {
|
|
|
45
123
|
const parentDirect = parentBlock?.members ?? [];
|
|
46
124
|
const hasParent = parentDirect.some((m) => memberIdentityKey(m) === memberIdentityKey(member) && m.kind === member.kind);
|
|
47
125
|
if (hasParent && !member.override) {
|
|
48
|
-
diagnostics.push(diag("BML_OVERRIDE_REQUIRED", `override required for redeclared member: ${member.name}`, file, member.source
|
|
126
|
+
diagnostics.push(diag("BML_OVERRIDE_REQUIRED", `override required for redeclared member: ${member.name}`, file, member.source));
|
|
49
127
|
}
|
|
50
128
|
}
|
|
51
129
|
if (member.kind === "property") {
|
|
@@ -64,7 +142,7 @@ function validatePropertyExpressions(prop, file, diagnostics) {
|
|
|
64
142
|
const expr = val;
|
|
65
143
|
const parsed = parseExpression(expr.raw);
|
|
66
144
|
if (!parsed.ok) {
|
|
67
|
-
diagnostics.push(diag("BML_EXPRESSION_PARSE_ERROR", `${label}: ${parsed.error.message}`, file, expr.source
|
|
145
|
+
diagnostics.push(diag("BML_EXPRESSION_PARSE_ERROR", `${label}: ${parsed.error.message}`, file, expr.source));
|
|
68
146
|
}
|
|
69
147
|
};
|
|
70
148
|
checkVal(prop.value, prop.name);
|
|
@@ -77,7 +155,7 @@ function validateInstanceExpressions(instance, file, diagnostics) {
|
|
|
77
155
|
if (val.kind === "expression") {
|
|
78
156
|
const parsed = parseExpression(val.raw);
|
|
79
157
|
if (!parsed.ok) {
|
|
80
|
-
diagnostics.push(diag("BML_EXPRESSION_PARSE_ERROR", `${name}: ${parsed.error.message}`, file, val.source
|
|
158
|
+
diagnostics.push(diag("BML_EXPRESSION_PARSE_ERROR", `${name}: ${parsed.error.message}`, file, val.source));
|
|
81
159
|
}
|
|
82
160
|
}
|
|
83
161
|
}
|
|
@@ -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.
|
|
3
|
+
"version": "0.5.0",
|
|
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.
|
|
36
|
-
"@blockml/core": "^1.0.
|
|
37
|
-
"@blockml/parser": "^0.
|
|
35
|
+
"@blockml/bom": "^0.5.0",
|
|
36
|
+
"@blockml/core": "^1.0.5",
|
|
37
|
+
"@blockml/parser": "^0.5.0"
|
|
38
38
|
},
|
|
39
39
|
"engines": {
|
|
40
40
|
"node": ">=20"
|