@blockml/framework 0.8.1 → 0.9.1

package/blocks/org/blockml/bml/framework/Library.bml

@@ -49,7 +49,7 @@
     Membership is defined exclusively by this blocks list.
   </documentation>
 
-  <version>0.8.1</version>
+  <version>0.9.1</version>
 
   <language>
     <English />
@@ -87,6 +87,7 @@
         <fwexpression:PropertyExpressionNode />
         <fwexpression:CallExpressionNode />
         <fwexpression:BinaryExpressionNode />
+        <fwexpression:InterpolatedStringNode />
         <fwexpression:ParseExpressionResult />
         <fwexpression:ParseExpressionError />
         <fwexpression:ParseExpressionOutcome />
@@ -106,7 +107,11 @@
         <fwcap:ResolveEffectiveMembers />
         <fwcap:CollectBaseTypeChain />
         <fwcap:MemberIdentityKey />
+        <fwcap:FindLocalMember />
         <fwcap:ParseExpression />
+        <fwcap:ParseInterpolatedText />
+        <fwcap:EvaluateExpression />
+        <fwcap:EvaluateInterpolatedText />
         <fwcap:ValidateTypes />
         <fwcap:ValidateConstraints />
         <fwcap:ValidateVersions />
@@ -116,6 +121,7 @@
         <fwcap:PeekLibraryTypeFqn />
         <fwcap:ValidateEmbeddedBlocks />
         <fwcap:ValidateInstances />
+        <fwcap:ValidateGenerics />
         <fwcap:ValidatePresets />
         <fwcap:ValidateVisibility />
         <fwcap:ValidateReadOnly />

package/blocks/org/blockml/bml/framework/capability/EvaluateExpression.bml

@@ -0,0 +1,50 @@
+<!--
+  Framework Capability — EvaluateExpression
+  FQN: org.blockml.bml.framework.capability.EvaluateExpression
+-->
+<block
+  xmlns="http://blockml.org/bml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://blockml.org/bml https://blockml.org/schemas/bml.xsd
+                      "
+  xmlns:blockml="org.blockml.bml"
+  xmlns:bom="org.blockml.bml.bom"
+  xmlns:bomapi="org.blockml.bml.bom.api"
+  xmlns:bomblock="org.blockml.bml.bom.block"
+  xmlns:bomcommon="org.blockml.bml.bom.common"
+  xmlns:bomcomp="org.blockml.bml.bom.composition"
+  xmlns:bomdoc="org.blockml.bml.bom.document"
+  xmlns:bommember="org.blockml.bml.bom.member"
+  xmlns:bomtype="org.blockml.bml.bom.type"
+  xmlns:bomvalue="org.blockml.bml.bom.value"
+  xmlns:core="org.blockml.bml.core"
+  xmlns:def="org.blockml.bml.definition"
+  xmlns:framework="org.blockml.bml.framework"
+  xmlns:fwcap="org.blockml.bml.framework.capability"
+  xmlns:fwconfig="org.blockml.bml.framework.config"
+  xmlns:fwdocumentation="org.blockml.bml.framework.documentation"
+  xmlns:fwexpression="org.blockml.bml.framework.expression"
+  xmlns:fwregistry="org.blockml.bml.framework.registry"
+  xmlns:parser="org.blockml.bml.compiler.parser"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>EvaluateExpression</name>
+  <type>fwcap:EvaluateExpression</type>
+  <baseType>core:Capability</baseType>
+  <is>Evaluate a restricted expression AST against the #this scope</is>
+
+  <documentation>#this is the outer Block property map. Same lookup as full expressions: size ≡ #this.size, this ≡ #this.this, this.x ≡ #this.this.x. Restricted profile only.</documentation>
+
+  <properties>
+    <node type="fwexpression:ExpressionNode">
+      <documentation>node. TS type: fwexpression:ExpressionNode. (required)</documentation>
+    </node>
+    <value type="type:Text">
+      <documentation>BML type gap: TS unknown evaluation result. (required)</documentation>
+    </value>
+  </properties>
+
+</block>

package/blocks/org/blockml/bml/framework/capability/EvaluateInterpolatedText.bml

@@ -0,0 +1,50 @@
+<!--
+  Framework Capability — EvaluateInterpolatedText
+  FQN: org.blockml.bml.framework.capability.EvaluateInterpolatedText
+-->
+<block
+  xmlns="http://blockml.org/bml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://blockml.org/bml https://blockml.org/schemas/bml.xsd
+                      "
+  xmlns:blockml="org.blockml.bml"
+  xmlns:bom="org.blockml.bml.bom"
+  xmlns:bomapi="org.blockml.bml.bom.api"
+  xmlns:bomblock="org.blockml.bml.bom.block"
+  xmlns:bomcommon="org.blockml.bml.bom.common"
+  xmlns:bomcomp="org.blockml.bml.bom.composition"
+  xmlns:bomdoc="org.blockml.bml.bom.document"
+  xmlns:bommember="org.blockml.bml.bom.member"
+  xmlns:bomtype="org.blockml.bml.bom.type"
+  xmlns:bomvalue="org.blockml.bml.bom.value"
+  xmlns:core="org.blockml.bml.core"
+  xmlns:def="org.blockml.bml.definition"
+  xmlns:framework="org.blockml.bml.framework"
+  xmlns:fwcap="org.blockml.bml.framework.capability"
+  xmlns:fwconfig="org.blockml.bml.framework.config"
+  xmlns:fwdocumentation="org.blockml.bml.framework.documentation"
+  xmlns:fwexpression="org.blockml.bml.framework.expression"
+  xmlns:fwregistry="org.blockml.bml.framework.registry"
+  xmlns:parser="org.blockml.bml.compiler.parser"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>EvaluateInterpolatedText</name>
+  <type>fwcap:EvaluateInterpolatedText</type>
+  <baseType>core:Capability</baseType>
+  <is>Evaluate interpolated text against the #this scope</is>
+
+  <documentation>Parses holes then evaluates them with the same #this lookup as full expressions. Result is concatenated Text.</documentation>
+
+  <properties>
+    <source type="type:Text">
+      <documentation>source. TS type: type:Text. (required)</documentation>
+    </source>
+    <value type="type:Text">
+      <documentation>value. TS type: type:Text. (required)</documentation>
+    </value>
+  </properties>
+
+</block>

package/blocks/org/blockml/bml/framework/capability/FindLocalMember.bml

@@ -0,0 +1,58 @@
+<!--
+  Framework Capability — FindLocalMember
+  FQN: org.blockml.bml.framework.capability.FindLocalMember
+-->
+<block
+  xmlns="http://blockml.org/bml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://blockml.org/bml https://blockml.org/schemas/bml.xsd
+                      "
+  xmlns:blockml="org.blockml.bml"
+  xmlns:bom="org.blockml.bml.bom"
+  xmlns:bomapi="org.blockml.bml.bom.api"
+  xmlns:bomblock="org.blockml.bml.bom.block"
+  xmlns:bomcommon="org.blockml.bml.bom.common"
+  xmlns:bomcomp="org.blockml.bml.bom.composition"
+  xmlns:bomdoc="org.blockml.bml.bom.document"
+  xmlns:bommember="org.blockml.bml.bom.member"
+  xmlns:bomtype="org.blockml.bml.bom.type"
+  xmlns:bomvalue="org.blockml.bml.bom.value"
+  xmlns:core="org.blockml.bml.core"
+  xmlns:def="org.blockml.bml.definition"
+  xmlns:framework="org.blockml.bml.framework"
+  xmlns:fwcap="org.blockml.bml.framework.capability"
+  xmlns:fwconfig="org.blockml.bml.framework.config"
+  xmlns:fwdocumentation="org.blockml.bml.framework.documentation"
+  xmlns:fwexpression="org.blockml.bml.framework.expression"
+  xmlns:fwregistry="org.blockml.bml.framework.registry"
+  xmlns:parser="org.blockml.bml.compiler.parser"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>FindLocalMember</name>
+  <type>fwcap:FindLocalMember</type>
+  <baseType>core:Capability</baseType>
+  <is>Find a member declared on this block, not inherited</is>
+
+  <documentation>Looks up memberIdentityKey(member) in block.members only. Returns the local declaration, or undefined when the member is inherited or absent.</documentation>
+
+  <references>
+    <see type="fwcap:MemberIdentityKey" relation="SeeAlso" />
+    <see type="fwcap:ResolveEffectiveMembers" relation="SeeAlso" />
+  </references>
+
+  <properties>
+    <block type="bomblock:BlockDefinition">
+      <documentation>block. TS type: bomblock:BlockDefinition. (required)</documentation>
+    </block>
+    <member type="bommember:MemberDefinition">
+      <documentation>member. TS type: bommember:MemberDefinition. (required)</documentation>
+    </member>
+    <local type="bommember:MemberDefinition">
+      <documentation>Declared member on this block, or undefined. (optional)</documentation>
+    </local>
+  </properties>
+
+</block>

package/blocks/org/blockml/bml/framework/capability/ParseInterpolatedText.bml

@@ -0,0 +1,54 @@
+<!--
+  Framework Capability — ParseInterpolatedText
+  FQN: org.blockml.bml.framework.capability.ParseInterpolatedText
+-->
+<block
+  xmlns="http://blockml.org/bml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://blockml.org/bml https://blockml.org/schemas/bml.xsd
+                      "
+  xmlns:blockml="org.blockml.bml"
+  xmlns:bom="org.blockml.bml.bom"
+  xmlns:bomapi="org.blockml.bml.bom.api"
+  xmlns:bomblock="org.blockml.bml.bom.block"
+  xmlns:bomcommon="org.blockml.bml.bom.common"
+  xmlns:bomcomp="org.blockml.bml.bom.composition"
+  xmlns:bomdoc="org.blockml.bml.bom.document"
+  xmlns:bommember="org.blockml.bml.bom.member"
+  xmlns:bomtype="org.blockml.bml.bom.type"
+  xmlns:bomvalue="org.blockml.bml.bom.value"
+  xmlns:core="org.blockml.bml.core"
+  xmlns:def="org.blockml.bml.definition"
+  xmlns:framework="org.blockml.bml.framework"
+  xmlns:fwcap="org.blockml.bml.framework.capability"
+  xmlns:fwconfig="org.blockml.bml.framework.config"
+  xmlns:fwdocumentation="org.blockml.bml.framework.documentation"
+  xmlns:fwexpression="org.blockml.bml.framework.expression"
+  xmlns:fwregistry="org.blockml.bml.framework.registry"
+  xmlns:parser="org.blockml.bml.compiler.parser"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>ParseInterpolatedText</name>
+  <type>fwcap:ParseInterpolatedText</type>
+  <baseType>core:Capability</baseType>
+  <is>Parse interpolated text into an InterpolatedStringNode AST</is>
+
+  <documentation>Scan authored text for ${} holes. Restricted profile — same #this lookup as full expressions; no @model, @bean, or capability calls.</documentation>
+
+  <references>
+    <see type="fwdocumentation:ExpressionParsing" relation="SeeAlso" />
+  </references>
+
+  <properties>
+    <source type="type:Text">
+      <documentation>source. TS type: type:Text. (required)</documentation>
+    </source>
+    <outcome type="fwexpression:ParseExpressionOutcome">
+      <documentation>outcome. TS type: fwexpression:ParseExpressionOutcome. (required)</documentation>
+    </outcome>
+  </properties>
+
+</block>

package/blocks/org/blockml/bml/framework/capability/ValidateGenerics.bml

@@ -0,0 +1,66 @@
+<!--
+  Framework Capability — ValidateGenerics
+  FQN: org.blockml.bml.framework.capability.ValidateGenerics
+-->
+<block
+  xmlns="http://blockml.org/bml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://blockml.org/bml https://blockml.org/schemas/bml.xsd
+                      "
+  xmlns:blockml="org.blockml.bml"
+  xmlns:bom="org.blockml.bml.bom"
+  xmlns:bomapi="org.blockml.bml.bom.api"
+  xmlns:bomblock="org.blockml.bml.bom.block"
+  xmlns:bomcommon="org.blockml.bml.bom.common"
+  xmlns:bomcomp="org.blockml.bml.bom.composition"
+  xmlns:bomdoc="org.blockml.bml.bom.document"
+  xmlns:bommember="org.blockml.bml.bom.member"
+  xmlns:bomtype="org.blockml.bml.bom.type"
+  xmlns:bomvalue="org.blockml.bml.bom.value"
+  xmlns:core="org.blockml.bml.core"
+  xmlns:def="org.blockml.bml.definition"
+  xmlns:framework="org.blockml.bml.framework"
+  xmlns:fwcap="org.blockml.bml.framework.capability"
+  xmlns:fwconfig="org.blockml.bml.framework.config"
+  xmlns:fwdocumentation="org.blockml.bml.framework.documentation"
+  xmlns:fwexpression="org.blockml.bml.framework.expression"
+  xmlns:fwregistry="org.blockml.bml.framework.registry"
+  xmlns:parser="org.blockml.bml.compiler.parser"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>ValidateGenerics</name>
+  <type>fwcap:ValidateGenerics</type>
+  <baseType>core:Capability</baseType>
+  <is>Open generic instance and bml:generics placement checks</is>
+
+  <documentation>Open generic instance and bml:generics placement checks against
+    TypeRegistry. Emits BML_OPEN_GENERIC_INSTANCE, BML_GENERICS_DIRECTIVE_NOT_ALLOWED,
+    BML_GENERICS_ARGUMENT_MISMATCH, and reuses BML_GENERIC_CONSTRAINT_VIOLATION /
+    BML_MISSING_GENERIC_TYPE_ARGUMENT.
+
+    bml:generics is allowed whenever the instance type declares genericTypes.
+    Open parameters require a binding. Parameters with defaultType may omit it;
+    authored arguments override defaultType.
+
+    BML_OPEN_GENERIC_INSTANCE applies only to domain Block instances. Children of a
+    TypeReferenceEntity aggregation (Library blocks, contracts, …) are type
+    references — empty QName sugar or explicit TypeReferenceEntity — not instances
+    of the named type. They must not carry bml:generics; if present, emit
+    BML_GENERICS_DIRECTIVE_NOT_ALLOWED.</documentation>
+
+  <properties>
+    <document type="bomdoc:BomDocument">
+      <documentation>document. TS type: bomdoc:BomDocument. (required)</documentation>
+    </document>
+    <registry type="fwcap:TypeRegistry">
+      <documentation>registry. TS type: fwcap:TypeRegistry. (required)</documentation>
+    </registry>
+    <diagnostics type="bomcommon:Diagnostic[]">
+      <documentation>diagnostics. TS type: bomcommon:Diagnostic[]. (required)</documentation>
+    </diagnostics>
+  </properties>
+
+</block>

package/blocks/org/blockml/bml/framework/config/FrameworkDiagnosticCodes.bml

@@ -40,7 +40,7 @@
 
   <properties>
     <codes type="type:Text[]">
-      <documentation>Ordered: BML_BOOTSTRAP_READ_ERROR, BML_CONSTRAINT_INFORMATION, BML_CONSTRAINT_TARGET_MISMATCH, BML_CONSTRAINT_UNKNOWN, BML_CONSTRAINT_VIOLATION, BML_CONSTRAINT_WARNING, BML_DUPLICATE_EMBEDDED_BLOCK, BML_DUPLICATE_MEMBER_VISIBILITY_VARIANT, BML_EMBEDDED_BLOCKS_ON_SUBBLOCK, BML_EXPRESSION_PARSE_ERROR, BML_LIBRARY_NESTING_VIOLATION, BML_LIBRARY_RESOLVE_ERROR, BML_MEMBER_COLLISION, BML_MISSING_ID, BML_MISSING_VERSION, BML_NESTED_EMBEDDED_BLOCKS, BML_OVERRIDE_REQUIRED, BML_OVERRIDE_WITHOUT_PARENT, BML_PRESET_CYCLE, BML_READONLY_MEMBER_WRITE, BML_SUBBLOCK_TYPE_MISMATCH, BML_UNRESOLVABLE_INSTANCE_REF, BML_UNKNOWN_BASE_TYPE, BML_UNKNOWN_CONTRACT, BML_UNKNOWN_TYPE, BML_UNKNOWN_PROPERTY, BML_UNKNOWN_VERSION, BML_VISIBILITY_PRIVATE_OVERRIDE (required)</documentation>
+      <documentation>Ordered: BML_BOOTSTRAP_READ_ERROR, BML_CONSTRAINT_INFORMATION, BML_CONSTRAINT_TARGET_MISMATCH, BML_CONSTRAINT_UNKNOWN, BML_CONSTRAINT_VIOLATION, BML_CONSTRAINT_WARNING, BML_DUPLICATE_EMBEDDED_BLOCK, BML_DUPLICATE_MEMBER_VISIBILITY_VARIANT, BML_EMBEDDED_BLOCKS_ON_SUBBLOCK, BML_EXPRESSION_PARSE_ERROR, BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION, BML_EXPR_SYNTAX_ERROR, BML_EXPR_TYPE_MISMATCH, BML_GENERIC_CONSTRAINT_VIOLATION, BML_GENERICS_ARGUMENT_MISMATCH, BML_GENERICS_DIRECTIVE_NOT_ALLOWED, BML_LIBRARY_NESTING_VIOLATION, BML_LIBRARY_RESOLVE_ERROR, BML_MEMBER_COLLISION, BML_MISSING_GENERIC_TYPE_ARGUMENT, BML_MISSING_ID, BML_MISSING_VERSION, BML_NESTED_EMBEDDED_BLOCKS, BML_OPEN_GENERIC_INSTANCE, BML_OVERRIDE_REQUIRED, BML_OVERRIDE_WITHOUT_PARENT, BML_PRESET_CYCLE, BML_READONLY_MEMBER_WRITE, BML_SUBBLOCK_TYPE_MISMATCH, BML_TYPE_BOUND_NOT_SATISFIED, BML_UNRESOLVABLE_INSTANCE_REF, BML_UNKNOWN_BASE_TYPE, BML_UNKNOWN_CONTRACT, BML_UNKNOWN_TYPE, BML_UNKNOWN_PROPERTY, BML_UNKNOWN_VERSION, BML_VISIBILITY_PRIVATE_OVERRIDE (required)</documentation>
     </codes>
   </properties>
 

package/blocks/org/blockml/bml/framework/documentation/Diagnostics.bml

@@ -43,15 +43,26 @@
     • BML_UNKNOWN_BASE_TYPE — baseType FQN not in TypeRegistry (at baseTypeSource)
     • BML_UNKNOWN_CONTRACT — contracts[] FQN not in TypeRegistry
     • BML_UNKNOWN_TYPE — named type FQN not in TypeRegistry and not a well-known primitive (member types at typeSource; instance typeFqn on the instance)
+    • BML_TYPE_BOUND_NOT_SATISFIED — capability throws[] type is not core:Exception (baseType chain or direct contracts[])
     • BML_MEMBER_COLLISION — duplicate member identity in effective set
     • BML_OVERRIDE_WITHOUT_PARENT — override without resolvable base member
     • BML_OVERRIDE_REQUIRED — override on non-overridable member
     • BML_EXPRESSION_PARSE_ERROR — parseExpression failed on ExpressionValue.raw
+    • BML_EXPR_SYNTAX_ERROR — unclosed ${} in interpolated text
+    • BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION — hole uses @model, @bean, or a forbidden call
+    • BML_EXPR_TYPE_MISMATCH — interpolated text on a non-Text member
 
     validateInstances:
     • BML_UNKNOWN_TYPE — composition instance typeFqn not in TypeRegistry
     • BML_UNKNOWN_PROPERTY — instance memberValues key not in effective members (error)
 
+    validateGenerics:
+    • BML_OPEN_GENERIC_INSTANCE — aggregated domain Block instance still has open genericTypes without bml:generics (not TypeReferenceEntity sugar)
+    • BML_GENERICS_DIRECTIVE_NOT_ALLOWED — bml:generics not on a Block instance (including TypeReferenceEntity QName sugar)
+    • BML_GENERICS_ARGUMENT_MISMATCH — bml:generics does not match declared genericTypes (including on a non-generic type)
+    • BML_MISSING_GENERIC_TYPE_ARGUMENT — directive present but a required argument has no defaultType
+    • BML_GENERIC_CONSTRAINT_VIOLATION — argument fails parameter baseType via satisfiesTypeBound
+
     validateVersions:
     • BML_MISSING_VERSION — standalone root block missing effective version (non-framework convention)
     • BML_UNKNOWN_VERSION — bml:version pin does not match registered block version

package/blocks/org/blockml/bml/framework/documentation/EffectiveMembers.bml

@@ -48,6 +48,7 @@
     resolveContracts resolves each contracts[] FQN via TypeRegistry; unknown contract →
     BML_UNKNOWN_CONTRACT (validateTypes).
     memberIdentityKey(member) = (namespace ?? "") + ":" + name — collision detection key.
+    findLocalMember(block, member) looks up that key in block.members only (not inherited).
 
     Partial merge: later layer replaces only explicitly authored attributes on the member.
     Used by validateTypes (member collision, override rules) and validateConstraints (effective
@@ -59,6 +60,7 @@
     <see type="fwdocumentation:ExpressionParsing" relation="ReadNext" />
     <see type="fwcap:ResolveEffectiveMembers" relation="Defines" />
     <see type="fwcap:ResolveContracts" relation="SeeAlso" />
+    <see type="fwcap:FindLocalMember" relation="SeeAlso" />
   </references>
 
 </block>

package/blocks/org/blockml/bml/framework/documentation/ExpressionParsing.bml

@@ -38,12 +38,15 @@
   <is>parseExpression AST — no Urmodell writeback (B4)</is>
 
   <documentation>parseExpression(source) parses expression text into an ExpressionNode AST.
+    parseInterpolatedText(source) scans Text for ${} holes (restricted profile).
+    Lookup is the same as full expressions: size ≡ #this.size, this ≡ #this.this.
     Returns ParseExpressionOutcome: { ok: true, result } | { ok: false, error }.
 
-    Parser stores ExpressionValue.raw only (B4). validateTypes re-parses expressions
-    at validation time and emits BML_EXPRESSION_PARSE_ERROR on failure.
+    Parser stores ExpressionValue.raw / InterpolatedTextValue.raw only (B4).
+    validateTypes re-parses at validation time and emits BML_EXPRESSION_PARSE_ERROR
+    or BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION on failure.
 
-    AST node kinds: literal, array, object, property, call, binary.
+    AST node kinds: literal, array, object, property, call, binary, interpolated.
     Optional resultTypeFqn on ParseExpressionResult for typed expression metadata.
 
     Expression AST is a Stage-2 utility — never written back to Urmodell member values.</documentation>

package/blocks/org/blockml/bml/framework/documentation/PublicApi.bml

@@ -58,9 +58,15 @@
     resolveContracts(block, registry) → MemberDefinition[] (contract slice; used by resolveEffectiveMembers)
     collectBaseTypeChain(block, registry) → BlockDefinition[]
     memberIdentityKey(member) → string
+    findLocalMember(block, member) → MemberDefinition | undefined
     parseExpression(source) → ParseExpressionOutcome
+    parseInterpolatedText(source) → ParseExpressionOutcome
+    evaluateExpression(node, scope) → value
+    evaluateInterpolatedText(source, scope) → Text
     validateTypes(document, registry) → Diagnostic[]
     validateVersions(document, registry) → Diagnostic[]
+    validateInstances(document, registry) → Diagnostic[]
+    validateGenerics(document, registry) → Diagnostic[]
     validateConstraints(document, registry) → Diagnostic[]
     getPropertyNumericValue(property) → number | undefined
     isLiteralValue(value) → boolean

package/blocks/org/blockml/bml/framework/documentation/TypeRegistryBootstrap.bml

@@ -61,7 +61,7 @@
     extras (config.libraries / --libraries), deduped by realpath.
 
     bootstrapFullProjectRegistry({ rootDir, srcDir?, libraries? }) is the shared
-    entry point for `blockml validate --all` and `@blockml/search`. It sets
+    entry point for `blockml validate --all`, `@blockml/search`, and `@blockml/graph`. It sets
     corpus paths to projectSourceRoots (this package srcDir plus local packages/*
     BlockML modules) and library seeds to resolveLibrarySeeds, then calls
     bootstrapTypeRegistry. The resulting registry is the effective BML corpus:

package/blocks/org/blockml/bml/framework/expression/ExpressionNode.bml

@@ -36,7 +36,7 @@
   <baseType>framework:FrameworkType</baseType>
   <is>Abstract union of expression AST node variants</is>
 
-  <documentation>Discriminated by kind: literal | array | object | property | call | binary.</documentation>
+  <documentation>Discriminated by kind: literal | array | object | property | call | binary | interpolated.</documentation>
 
   <references>
     <see type="fwexpression:LiteralExpressionNode" relation="SeeAlso" />

package/blocks/org/blockml/bml/framework/expression/InterpolatedStringNode.bml

@@ -0,0 +1,51 @@
+<!--
+  Framework — InterpolatedStringNode
+  FQN: org.blockml.bml.framework.expression.InterpolatedStringNode
+-->
+<block
+  xmlns="http://blockml.org/bml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://blockml.org/bml https://blockml.org/schemas/bml.xsd
+                      "
+  xmlns:blockml="org.blockml.bml"
+  xmlns:bom="org.blockml.bml.bom"
+  xmlns:bomapi="org.blockml.bml.bom.api"
+  xmlns:bomblock="org.blockml.bml.bom.block"
+  xmlns:bomcommon="org.blockml.bml.bom.common"
+  xmlns:bomcomp="org.blockml.bml.bom.composition"
+  xmlns:bomdoc="org.blockml.bml.bom.document"
+  xmlns:bommember="org.blockml.bml.bom.member"
+  xmlns:bomtype="org.blockml.bml.bom.type"
+  xmlns:bomvalue="org.blockml.bml.bom.value"
+  xmlns:core="org.blockml.bml.core"
+  xmlns:def="org.blockml.bml.definition"
+  xmlns:framework="org.blockml.bml.framework"
+  xmlns:fwcap="org.blockml.bml.framework.capability"
+  xmlns:fwconfig="org.blockml.bml.framework.config"
+  xmlns:fwdocumentation="org.blockml.bml.framework.documentation"
+  xmlns:fwexpression="org.blockml.bml.framework.expression"
+  xmlns:fwregistry="org.blockml.bml.framework.registry"
+  xmlns:parser="org.blockml.bml.compiler.parser"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>InterpolatedStringNode</name>
+  <type>fwexpression:InterpolatedStringNode</type>
+  <baseType>fwexpression:ExpressionNode</baseType>
+  <is>Interpolated text AST node</is>
+
+  <documentation>kind: interpolated. parts: literal and hole ExpressionNode[].</documentation>
+
+  <properties>
+    <kind type="type:Text">
+      <documentation>kind. TS type: type:Text. (required)</documentation>
+      <value>interpolated</value>
+    </kind>
+    <parts type="fwexpression:ExpressionNode[]">
+      <documentation>parts. TS type: fwexpression:ExpressionNode[]. (required)</documentation>
+    </parts>
+  </properties>
+
+</block>

package/dist/expression/evaluate-expression.d.ts

@@ -0,0 +1,9 @@
+import type { ExpressionNode } from "./types.js";
+export type ExpressionScope = Record<string, unknown>;
+export declare class ExpressionEvaluationError extends Error {
+    readonly code: string;
+    constructor(code: string, message: string);
+}
+export declare function evaluateExpression(node: ExpressionNode, scope: ExpressionScope): unknown;
+export declare function evaluateInterpolatedText(raw: string, scope: ExpressionScope): string;
+//# sourceMappingURL=evaluate-expression.d.ts.map

package/dist/expression/evaluate-expression.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"evaluate-expression.d.ts","sourceRoot":"","sources":["../../src/expression/evaluate-expression.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEtD,qBAAa,yBAA0B,SAAQ,KAAK;IAClD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAEV,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAK1C;AA2ED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,eAAe,GACrB,OAAO,CAiDT;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,eAAe,GACrB,MAAM,CAWR"}

package/dist/expression/evaluate-expression.js

@@ -0,0 +1,124 @@
+import { parseInterpolatedText } from "./parse-interpolated-text.js";
+import { INTERPOLATION_NOT_ALLOWED, restrictedExpressionError, } from "./restricted.js";
+export class ExpressionEvaluationError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.name = "ExpressionEvaluationError";
+        this.code = code;
+    }
+}
+function asRecord(value) {
+    if (typeof value === "object" && value !== null && !Array.isArray(value)) {
+        return value;
+    }
+    return undefined;
+}
+function lookupPath(scope, path) {
+    const segments = path.flatMap((seg) => seg.split(".")).filter(Boolean);
+    let i = 0;
+    if (segments[0] === "#this") {
+        i = 1;
+    }
+    let current = scope;
+    for (; i < segments.length; i++) {
+        const key = segments[i];
+        const record = asRecord(current);
+        if (!record || !(key in record)) {
+            throw new ExpressionEvaluationError("BML_EXPR_UNKNOWN_PROPERTY", `Unknown property ${segments.join(".")}`);
+        }
+        current = record[key];
+    }
+    return current;
+}
+function stringifyValue(value) {
+    if (value === null || value === undefined) {
+        return "";
+    }
+    if (typeof value === "string") {
+        return value;
+    }
+    if (typeof value === "number" || typeof value === "boolean") {
+        return String(value);
+    }
+    return JSON.stringify(value);
+}
+function evalBuiltin(callee, args) {
+    switch (callee) {
+        case "#strings.concat":
+            return args.map(stringifyValue).join("");
+        case "#strings.trim":
+            return stringifyValue(args[0]).trim();
+        case "#strings.length":
+            return stringifyValue(args[0]).length;
+        case "#strings.toUpperCase":
+            return stringifyValue(args[0]).toUpperCase();
+        case "#strings.toLowerCase":
+            return stringifyValue(args[0]).toLowerCase();
+        case "#math.min":
+            return Math.min(Number(args[0]), Number(args[1]));
+        case "#math.max":
+            return Math.max(Number(args[0]), Number(args[1]));
+        case "#math.abs":
+            return Math.abs(Number(args[0]));
+        case "#math.floor":
+            return Math.floor(Number(args[0]));
+        case "#math.ceil":
+            return Math.ceil(Number(args[0]));
+        case "#math.round":
+            return Math.round(Number(args[0]));
+        default:
+            throw new ExpressionEvaluationError("BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION", INTERPOLATION_NOT_ALLOWED);
+    }
+}
+export function evaluateExpression(node, scope) {
+    const restricted = restrictedExpressionError(node);
+    if (restricted) {
+        throw new ExpressionEvaluationError("BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION", restricted);
+    }
+    switch (node.kind) {
+        case "literal":
+            return node.value;
+        case "property":
+            return lookupPath(scope, node.path);
+        case "binary": {
+            const left = evaluateExpression(node.left, scope);
+            const right = evaluateExpression(node.right, scope);
+            if (node.operator === "+") {
+                if (typeof left === "number" && typeof right === "number") {
+                    return left + right;
+                }
+                return stringifyValue(left) + stringifyValue(right);
+            }
+            throw new ExpressionEvaluationError("BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION", INTERPOLATION_NOT_ALLOWED);
+        }
+        case "call":
+            return evalBuiltin(node.callee, node.args.map((arg) => evaluateExpression(arg, scope)));
+        case "array":
+            return node.elements.map((el) => evaluateExpression(el, scope));
+        case "object": {
+            const out = {};
+            for (const [key, value] of Object.entries(node.entries)) {
+                out[key] = evaluateExpression(value, scope);
+            }
+            return out;
+        }
+        case "interpolated":
+            return node.parts.map((part) => stringifyValue(evaluateExpression(part, scope))).join("");
+        default:
+            throw new ExpressionEvaluationError("BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION", INTERPOLATION_NOT_ALLOWED);
+    }
+}
+export function evaluateInterpolatedText(raw, scope) {
+    const parsed = parseInterpolatedText(raw);
+    if (!parsed.ok) {
+        const code = parsed.error.message === INTERPOLATION_NOT_ALLOWED
+            ? "BML_EXPR_NOT_ALLOWED_IN_INTERPOLATION"
+            : parsed.error.message === "Unclosed interpolation"
+                ? "BML_EXPR_SYNTAX_ERROR"
+                : "BML_EXPRESSION_PARSE_ERROR";
+        throw new ExpressionEvaluationError(code, parsed.error.message);
+    }
+    return stringifyValue(evaluateExpression(parsed.result.ast, scope));
+}
+//# sourceMappingURL=evaluate-expression.js.map

package/dist/expression/evaluate-expression.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"evaluate-expression.js","sourceRoot":"","sources":["../../src/expression/evaluate-expression.ts"],"names":[],"mappings":"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"}

package/dist/expression/parse-interpolated-text.d.ts

@@ -0,0 +1,3 @@
+import type { ParseExpressionOutcome } from "./types.js";
+export declare function parseInterpolatedText(raw: string): ParseExpressionOutcome;
+//# sourceMappingURL=parse-interpolated-text.d.ts.map

package/dist/expression/parse-interpolated-text.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-interpolated-text.d.ts","sourceRoot":"","sources":["../../src/expression/parse-interpolated-text.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAkB,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAiCzE,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CA6CzE"}