@blockml/parser 0.9.0 → 0.9.1

package/blocks/org/blockml/bml/compiler/parser/Library.bml

@@ -43,7 +43,7 @@
     (@blockml/bom). Membership is defined exclusively by this blocks list.
   </documentation>
 
-  <version>0.9.0</version>
+  <version>0.9.1</version>
 
   <language>
     <English />
@@ -96,11 +96,14 @@
         <parcap:MapTypeReferenceEntityInstance />
         <parcap:BuildSubBlockIndex />
         <parcap:ParseTypeExpression />
+        <parcap:ParseGenericArgumentList />
         <parcap:InferCardinality />
         <parcap:TypeExpressionToString />
         <parcap:ParseMemberValue />
+        <parcap:ContainsUnescapedInterpolation />
         <parcap:ExpressionFromRaw />
         <parcap:ParseDirectives />
+        <parcap:ParseGenericsBinding />
         <parcap:ParseBmlMeta />
         <parcap:ParseVisibilityFromName />
         <parcap:VisibilityPrefix />

package/blocks/org/blockml/bml/compiler/parser/capability/ContainsUnescapedInterpolation.bml

@@ -0,0 +1,53 @@
+<!--
+  Parser Capability — ContainsUnescapedInterpolation
+  FQN: org.blockml.bml.compiler.parser.capability.ContainsUnescapedInterpolation
+-->
+<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: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:parser="org.blockml.bml.compiler.parser"
+  xmlns:parcap="org.blockml.bml.compiler.parser.capability"
+  xmlns:parconfig="org.blockml.bml.compiler.parser.config"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:parmap="org.blockml.bml.compiler.parser.map"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:bomcap="org.blockml.bml.bom.capability"
+  xmlns:serdocumentation="org.blockml.bml.compiler.serializer.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>ContainsUnescapedInterpolation</name>
+  <type>parcap:ContainsUnescapedInterpolation</type>
+  <baseType>core:Capability</baseType>
+  <is>Detect unescaped ${…} interpolation in raw text</is>
+
+  <documentation>True when raw contains ${ not preceded by a backslash. Used by ParseMemberValue and ParseDirectives to choose InterpolatedTextValue over a JSON-like literal.</documentation>
+
+  <references>
+    <see type="pardocumentation:ExpressionCapture" relation="SeeAlso" />
+    <see type="parcap:ParseMemberValue" relation="SeeAlso" />
+  </references>
+
+  <properties>
+    <raw type="type:Text">
+      <documentation>raw. TS type: type:Text. (required)</documentation>
+    </raw>
+    <result type="type:Boolean">
+      <documentation>result. TS type: type:Boolean. (required)</documentation>
+    </result>
+  </properties>
+
+</block>

package/blocks/org/blockml/bml/compiler/parser/capability/ParseDirectives.bml

@@ -34,7 +34,8 @@
   <baseType>core:Capability</baseType>
   <is>Parse bml:each/if/unless/with directive attributes</is>
 
-  <documentation>Parse bml:each/if/unless/with directive attributes</documentation>
+  <documentation>Parse bml:each/if/unless/with directive attributes.
+    bml:generics is composition meta (ParseGenericsBinding), not a flow-control directive.</documentation>
 
   <references>
     <see type="pardocumentation:AttributeClassification" relation="SeeAlso" />

package/blocks/org/blockml/bml/compiler/parser/capability/ParseGenericArgumentList.bml

@@ -0,0 +1,57 @@
+<!--
+  Parser Capability — ParseGenericArgumentList
+  FQN: org.blockml.bml.compiler.parser.capability.ParseGenericArgumentList
+-->
+<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: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:parser="org.blockml.bml.compiler.parser"
+  xmlns:parcap="org.blockml.bml.compiler.parser.capability"
+  xmlns:parconfig="org.blockml.bml.compiler.parser.config"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:parmap="org.blockml.bml.compiler.parser.map"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:bomcap="org.blockml.bml.bom.capability"
+  xmlns:serdocumentation="org.blockml.bml.compiler.serializer.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>ParseGenericArgumentList</name>
+  <type>parcap:ParseGenericArgumentList</type>
+  <baseType>core:Capability</baseType>
+  <is>Parse a parenthesized TypeExpression list for bml:generics</is>
+
+  <documentation>Parse a parenthesized TypeExpression list for bml:generics.
+    Outer parentheses are required. Reuses the TypeExpression parser used by
+    baseType generic applications, without a leading type name.</documentation>
+
+  <references>
+    <see type="parcap:ParseTypeExpression" relation="SeeAlso" />
+  </references>
+
+  <properties>
+    <raw type="type:Text">
+      <documentation>raw. TS type: type:Text. (required)</documentation>
+    </raw>
+    <bindings type="type:Text">
+      <documentation>xmlns prefix bindings. (required)</documentation>
+    </bindings>
+    <arguments type="bomtype:TypeExpression[]">
+      <documentation>arguments. TS type: bomtype:TypeExpression[]. (required)</documentation>
+    </arguments>
+  </properties>
+
+</block>

package/blocks/org/blockml/bml/compiler/parser/capability/ParseGenericsBinding.bml

@@ -0,0 +1,58 @@
+<!--
+  Parser Capability — ParseGenericsBinding
+  FQN: org.blockml.bml.compiler.parser.capability.ParseGenericsBinding
+-->
+<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: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:parser="org.blockml.bml.compiler.parser"
+  xmlns:parcap="org.blockml.bml.compiler.parser.capability"
+  xmlns:parconfig="org.blockml.bml.compiler.parser.config"
+  xmlns:pardocumentation="org.blockml.bml.compiler.parser.documentation"
+  xmlns:parmap="org.blockml.bml.compiler.parser.map"
+  xmlns:type="org.blockml.bml.type"
+  xmlns:bomdocumentation="org.blockml.bml.bom.documentation"
+  xmlns:bomcap="org.blockml.bml.bom.capability"
+  xmlns:serdocumentation="org.blockml.bml.compiler.serializer.documentation"
+  xmlns:valdocumentation="org.blockml.bml.compiler.validator.documentation">
+
+  <name>ParseGenericsBinding</name>
+  <type>parcap:ParseGenericsBinding</type>
+  <baseType>core:Capability</baseType>
+  <is>Parse bml:generics attribute or child element into GenericsBinding</is>
+
+  <documentation>Parse bml:generics as attribute or child element. Attribute form wins.
+    Stores lossless raw plus parsed TypeExpression arguments when parentheses
+    are present and well-formed.</documentation>
+
+  <references>
+    <see type="parcap:ParseGenericArgumentList" relation="SeeAlso" />
+    <see type="pardocumentation:AttributeClassification" relation="SeeAlso" />
+  </references>
+
+  <properties>
+    <element type="parmap:XmlDomNode">
+      <documentation>element. TS type: parmap:XmlDomNode. (required)</documentation>
+    </element>
+    <ctx type="parmap:MapContext">
+      <documentation>ctx. TS type: parmap:MapContext. (required)</documentation>
+    </ctx>
+    <binding type="bomcomp:GenericsBinding">
+      <documentation>binding. TS type: bomcomp:GenericsBinding. (optional)</documentation>
+    </binding>
+  </properties>
+
+</block>

package/blocks/org/blockml/bml/compiler/parser/documentation/ArchitectureOverview.bml

@@ -54,7 +54,7 @@
     • map/map-block.ts → parcap:MapDocumentBlock, MapBlock
     • map/map-composition.ts → composition tree mapping
     • map/type-expression.ts → parcap:ParseTypeExpression
-    • map/member-value.ts → parcap:ParseMemberValue
+    • map/member-value.ts → parcap:ParseMemberValue, ContainsUnescapedInterpolation, ExpressionFromRaw
     • map/directives.ts → parcap:ParseDirectives, ParseBmlMeta
     • util/* → visibility, boolean, qname, xml helpers]]></documentation>
 

package/blocks/org/blockml/bml/compiler/parser/documentation/AttributeClassification.bml

@@ -43,7 +43,7 @@
     • other xsi:* → ignore (not memberValues)
 
     Rule 2 — bml:* attributes:
-    • Composition meta (bml:id, bml:version, …) → BlockInstance fields
+    • Composition meta (bml:id, bml:version, bml:generics, …) → BlockInstance fields
     • Directives (bml:each, bml:if, …) → directives[]
     • Unknown bml:* → BML_UNKNOWN_DIRECTIVE (error at map time — B2)
 

package/blocks/org/blockml/bml/compiler/parser/documentation/ExpressionCapture.bml

@@ -36,10 +36,12 @@
   <is>Raw expression storage — no AST in Urmodell (B4)</is>
 
   <documentation>${ … } attribute/element values → ExpressionValue { raw, source }.
+    Mixed text with ${ … } holes → InterpolatedTextValue { raw, source }.
     Implementation CDATA → embeddedExpressions[] with source offsets.
 
     Parser step [5] captures raw text only. AST construction via parseExpression()
-    in @blockml/framework (Stage 2 utility) — never stored on Urmodell.
+    / parseInterpolatedText() in @blockml/framework (Stage 2 utility) — never stored
+    on Urmodell.
 
     inputType/outputType on capabilities → TypeExpression at map time (B3).</documentation>
 

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { parse } from "./parse.js";
 export { isWellKnownTypeFqn, resolveTypeName, type ImplicitNamespaceContext, } from "./util/qname.js";
+export { parseTypeExpression, parseGenericArgumentList, type ParseGenericArgumentListResult, type TypeExpressionResolveOptions, } from "./map/type-expression.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,KAAK,wBAAwB,GAC9B,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,KAAK,wBAAwB,GAC9B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,KAAK,8BAA8B,EACnC,KAAK,4BAA4B,GAClC,MAAM,0BAA0B,CAAC"}

package/dist/index.js

@@ -1,3 +1,4 @@
 export { parse } from "./parse.js";
 export { isWellKnownTypeFqn, resolveTypeName, } from "./util/qname.js";
+export { parseTypeExpression, parseGenericArgumentList, } from "./map/type-expression.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,eAAe,GAEhB,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,eAAe,GAEhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,mBAAmB,EACnB,wBAAwB,GAGzB,MAAM,0BAA0B,CAAC"}

package/dist/map/directives.d.ts

@@ -1,23 +1,50 @@
-import type { DirectiveAttribute, ExpressionValue } from "@blockml/bom";
+import type { DirectiveAttribute, ExpressionValue, GenericsBinding } from "@blockml/bom";
 import type { Element } from "@xmldom/xmldom";
 import type { SourceLocation } from "@blockml/bom";
 import type { MapContext } from "./context.js";
+import { type TypeExpressionResolveOptions } from "./type-expression.js";
+export declare const isGenericsDirectiveElement: (element: Element) => boolean;
+export declare function parseGenericsBinding(element: Element, ctx: MapContext, options?: TypeExpressionResolveOptions): GenericsBinding | undefined;
 export declare function parseDirectives(element: Element, loc: SourceLocation, ctx?: MapContext): DirectiveAttribute[];
 export declare function parseBmlMeta(element: Element, typeFqn: string, file: string, loc: SourceLocation): {
     id: ExpressionValue | {
+        kind: "interpolated";
+        raw: string;
+        source: SourceLocation;
+        value?: never;
+        typeFqn?: never;
+    } | {
         kind: "literal";
         value: string;
         typeFqn: string;
+        raw?: never;
+        source?: never;
     } | undefined;
     version: ExpressionValue | {
+        kind: "interpolated";
+        raw: string;
+        source: SourceLocation;
+        value?: never;
+        typeFqn?: never;
+    } | {
         kind: "literal";
         value: string;
         typeFqn: string;
+        raw?: never;
+        source?: never;
     } | undefined;
     bean: ExpressionValue | {
+        kind: "interpolated";
+        raw: string;
+        source: SourceLocation;
+        value?: never;
+        typeFqn?: never;
+    } | {
         kind: "literal";
         value: string;
         typeFqn: string;
+        raw?: never;
+        source?: never;
     } | undefined;
     scope: "local" | "context" | undefined;
 };

package/dist/map/directives.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"directives.d.ts","sourceRoot":"","sources":["../../src/map/directives.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAElB,eAAe,EAKhB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAG9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAY/C,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,cAAc,EACnB,GAAG,CAAC,EAAE,UAAU,GACf,kBAAkB,EAAE,CAgEtB;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,cAAc;;;;;;;;;;;;;;;;;EAiBpB"}
+{"version":3,"file":"directives.d.ts","sourceRoot":"","sources":["../../src/map/directives.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAElB,eAAe,EACf,eAAe,EAKhB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAS9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,sBAAsB,CAAC;AAY9B,eAAO,MAAM,0BAA0B,GAAI,SAAS,OAAO,KAAG,OAI7D,CAAC;AAEF,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,UAAU,EACf,OAAO,CAAC,EAAE,4BAA4B,GACrC,eAAe,GAAG,SAAS,CAoC7B;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,cAAc,EACnB,GAAG,CAAC,EAAE,UAAU,GACf,kBAAkB,EAAE,CAgEtB;AAED,wBAAgB,YAAY,CAC1B,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBpB"}

package/dist/map/directives.js

@@ -1,11 +1,53 @@
-import { expressionFromRaw } from "./member-value.js";
-import { getAttribute } from "../util/xml.js";
-import { collectUnknownBmlAttributes } from "./structural.js";
+import { containsUnescapedInterpolation, expressionFromRaw } from "./member-value.js";
+import { elementChildren, elementLocalName, elementPrefix, getAttribute, getCharacterData, } from "../util/xml.js";
+import { collectUnknownBmlAttributes, reportDiagnostic } from "./structural.js";
+import { parseGenericArgumentList, } from "./type-expression.js";
+import { attributeValueLoc, elementSourceLoc } from "../util/qname.js";
 const BML_NS = "http://blockml.org/bml";
 function bmlAttr(element, local) {
     return (getAttribute(element, `bml:${local}`) ??
         getAttribute(element, `${BML_NS}:${local}`));
 }
+export const isGenericsDirectiveElement = (element) => {
+    const local = elementLocalName(element);
+    const prefix = elementPrefix(element);
+    return (prefix === "bml" && local === "generics") || local === "bml:generics";
+};
+export function parseGenericsBinding(element, ctx, options) {
+    const loc = elementSourceLoc(ctx.filePath, ctx.source, element);
+    const attr = bmlAttr(element, "generics");
+    const child = elementChildren(element).find(isGenericsDirectiveElement);
+    let raw;
+    let authoredPlacement;
+    let source = loc;
+    if (attr !== undefined) {
+        raw = attr;
+        authoredPlacement = "attribute";
+        source =
+            attributeValueLoc(ctx.filePath, ctx.source, element, "bml:generics", attr) ?? loc;
+    }
+    else if (child) {
+        raw = getCharacterData(child).text;
+        authoredPlacement = "element";
+        source = elementSourceLoc(ctx.filePath, ctx.source, child);
+    }
+    else {
+        return undefined;
+    }
+    const binding = {
+        raw,
+        authoredPlacement,
+        source,
+    };
+    const parsed = parseGenericArgumentList(raw, ctx.bindings, "type", options);
+    if (parsed.ok) {
+        binding.arguments = parsed.arguments;
+    }
+    else if (parsed.code === "BML_INVALID_TYPE_REFERENCE") {
+        reportDiagnostic(ctx, parsed.code, parsed.message, source);
+    }
+    return binding;
+}
 export function parseDirectives(element, loc, ctx) {
     const directives = [];
     if (ctx) {
@@ -84,6 +126,15 @@ function parseMetaValue(raw, typeFqn, file, loc) {
     if (raw.startsWith("${") && raw.endsWith("}")) {
         return expressionFromRaw(raw, loc);
     }
+    const trimmed = raw.trim();
+    const looksLikeJson = trimmed.startsWith("[") || trimmed.startsWith("{");
+    if (!looksLikeJson && containsUnescapedInterpolation(raw)) {
+        return {
+            kind: "interpolated",
+            raw,
+            source: loc,
+        };
+    }
     return {
         kind: "literal",
         value: raw,

package/dist/map/directives.js.map

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

package/dist/map/map-block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-block.d.ts","sourceRoot":"","sources":["../../src/map/map-block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,eAAe,EAKf,UAAU,EAkBX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAgtCjE,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,GAAG,eAAe,CAE3E;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,WAAW,GAAE,UAAU,EAAO,GAC7B,eAAe,CAGjB"}
+{"version":3,"file":"map-block.d.ts","sourceRoot":"","sources":["../../src/map/map-block.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,eAAe,EAKf,UAAU,EAkBX,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAmzCjE,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,GAAG,eAAe,CAE3E;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAChC,WAAW,GAAE,UAAU,EAAO,GAC7B,eAAe,CAGjB"}

package/dist/map/map-block.js

@@ -2,6 +2,7 @@ import { createMapContext } from "./context.js";
 import { mapBlockInstanceNode, mapCompositionTemplate, mapTypeReferenceEntityInstance, isTypeReferenceEntitySugar, buildSubBlockIndex, } from "./map-composition.js";
 import { parseTypeExpression, inferCardinality, } from "./type-expression.js";
 import { parseMemberValue } from "./member-value.js";
+import { parseGenericsBinding, isGenericsDirectiveElement } from "./directives.js";
 import { elementChildren, elementLocalName, elementPrefix, getAttribute, getCharacterData, xmlTriviaFromElement, } from "../util/xml.js";
 import { parseVisibilityFromName } from "../util/visibility.js";
 import { parseBooleanAttribute, isBooleanLiteral } from "../util/boolean.js";
@@ -32,6 +33,10 @@ function mapBlockDefinition(element, ctx, parentType) {
     if (unknownAttrs) {
         block.unknownAttributes = unknownAttrs;
     }
+    const blockGenerics = parseGenericsBinding(element, ctx, typeResolveOptions(ctx));
+    if (blockGenerics) {
+        block.generics = blockGenerics;
+    }
     const childElements = elementChildren(element);
     const subBlocksRaw = [];
     const embeddedRaw = [];
@@ -81,6 +86,7 @@ function mapBlockDefinition(element, ctx, parentType) {
     if (unknownElements.length > 0) {
         block.unknownElements = unknownElements;
     }
+    seedSubBlockIndex(element, block, ctx, parentType, subBlocksRaw);
     mapMetadataFields(element, block, ctx);
     if (!block.name) {
         block.name = block.type.split(".").pop() ?? "Block";
@@ -159,6 +165,8 @@ const MEMBER_CHILD_METADATA = new Set([
     "throws",
     "bml:xml",
     "xml",
+    "generics",
+    "bml:generics",
     "abstract",
     "final",
     "language",
@@ -170,7 +178,7 @@ function isMemberMetadataChild(element) {
     if (MEMBER_CHILD_METADATA.has(local)) {
         return true;
     }
-    if (prefix === "bml" && (local === "xml" || local === "container")) {
+    if (prefix === "bml" && (local === "xml" || local === "container" || local === "generics")) {
         return true;
     }
     return false;
@@ -361,6 +369,10 @@ function mapMemberBase(element, name, visibility, namespace, ctx) {
         const { text } = getCharacterData(xmlEl);
         base.xmlRendering = parseMemberXmlRendering(text, "element");
     }
+    const memberGenerics = parseGenericsBinding(element, ctx, typeResolveOptions(ctx));
+    if (memberGenerics) {
+        base.generics = memberGenerics;
+    }
     mapMemberDocumentation(element, base, ctx);
     mapMemberConstraints(element, base, ctx);
     return base;
@@ -405,6 +417,12 @@ function mapMetadataFields(element, block, ctx) {
         if (extraAttrs) {
             block.unknownAttributes = { ...block.unknownAttributes, ...extraAttrs };
         }
+        if (MEMBER_SECTIONS.has(elementLocalName(child)) && !block.generics) {
+            const sectionGenerics = parseGenericsBinding(child, ctx, typeResolveOptions(ctx));
+            if (sectionGenerics) {
+                block.generics = sectionGenerics;
+            }
+        }
         const local = elementLocalName(child);
         switch (local) {
             case "name":
@@ -505,6 +523,15 @@ function mapMetadataFields(element, block, ctx) {
                 block.xmlRendering = { raw: text };
                 break;
             }
+            case "bml:generics":
+            case "generics":
+                if (isGenericsDirectiveElement(child) && !block.generics) {
+                    const fromChild = parseGenericsBinding(element, ctx, typeResolveOptions(ctx));
+                    if (fromChild) {
+                        block.generics = fromChild;
+                    }
+                }
+                break;
             default:
                 break;
         }
@@ -514,6 +541,59 @@ function mapMetadataFields(element, block, ctx) {
         block.xmlRendering = { raw: xmlAttr };
     }
 }
+function seedSubBlockIndex(element, block, ctx, parentType, subBlocksRaw) {
+    if (subBlocksRaw.length === 0) {
+        return;
+    }
+    let peekedName = block.name;
+    let peekedType = block.type;
+    for (const child of elementChildren(element)) {
+        const local = elementLocalName(child);
+        if (local === "name") {
+            peekedName = getTextOrAttr(child) ?? peekedName;
+        }
+        else if (local === "type") {
+            const typeText = getTextOrAttr(child);
+            if (typeText) {
+                peekedType = resolveBlockReference(typeText, ctx.bindings, ctx.subBlockIndex, parentType);
+            }
+        }
+    }
+    if (!peekedType && parentType && peekedName) {
+        peekedType = `${parentType}.${peekedName}`;
+    }
+    if (!peekedType) {
+        return;
+    }
+    const peeked = subBlocksRaw
+        .map((el) => peekSubBlock(el, peekedType, ctx, parentType))
+        .filter((entry) => entry !== undefined);
+    if (peeked.length === 0) {
+        return;
+    }
+    ctx.subBlockIndex = buildSubBlockIndex(peeked, peekedType);
+    ctx.parentBlockType = peekedType;
+}
+function peekSubBlock(element, parentType, ctx, enclosingParent) {
+    let name = getAttribute(element, "name");
+    let typeText;
+    for (const child of elementChildren(element)) {
+        const local = elementLocalName(child);
+        if (local === "name" && !name) {
+            name = getTextOrAttr(child);
+        }
+        else if (local === "type") {
+            typeText = getTextOrAttr(child);
+        }
+    }
+    if (!name) {
+        return undefined;
+    }
+    const type = typeText
+        ? resolveBlockReference(typeText, ctx.bindings, ctx.subBlockIndex, enclosingParent ?? parentType)
+        : `${parentType}.${name}`;
+    return { name, type };
+}
 function getTextOrAttr(element, tag) {
     const el = tag
         ? elementChildren(element).find((c) => elementLocalName(c) === tag) ?? element