@zenithbuild/cli 0.6.10 → 0.6.12

package/dist/build.js

@@ -18,6 +18,7 @@ import { basename, dirname, extname, join, relative, resolve } from 'node:path';
 import { generateManifest } from './manifest.js';
 import { buildComponentRegistry, expandComponents, extractTemplate, isDocumentMode } from './resolve-components.js';
 import { collectExpandedComponentOccurrences } from './component-occurrences.js';
+import { findNextKnownComponentTag } from './component-tag-parser.js';
 import { applyOccurrenceRewritePlans, cloneComponentIrForInstance } from './component-instance-ir.js';
 import { resolveBundlerBin } from './toolchain-paths.js';
 import { createBundlerToolchain, createCompilerToolchain, ensureToolchainCompatibility, getActiveToolchainCandidate, runToolchainSync } from './toolchain-runner.js';
@@ -1056,7 +1057,6 @@ function extractServerScript(source, sourceFile, compilerOpts = {}) {
         }
     };
 }
-const OPEN_COMPONENT_TAG_RE = /<([A-Z][a-zA-Z0-9]*)(\s[^<>]*?)?\s*(\/?)>/g;
 /**
  * Collect original attribute strings for component usages in a page source.
  *
@@ -1067,18 +1067,19 @@ const OPEN_COMPONENT_TAG_RE = /<([A-Z][a-zA-Z0-9]*)(\s[^<>]*?)?\s*(\/?)>/g;
  */
 function collectComponentUsageAttrs(source, registry, ownerPath = null) {
     const out = new Map();
-    OPEN_COMPONENT_TAG_RE.lastIndex = 0;
-    let match;
-    while ((match = OPEN_COMPONENT_TAG_RE.exec(source)) !== null) {
-        const name = match[1];
-        if (!registry.has(name)) {
-            continue;
+    let cursor = 0;
+    while (cursor < source.length) {
+        const tag = findNextKnownComponentTag(source, registry, cursor);
+        if (!tag) {
+            break;
         }
-        const attrs = String(match[2] || '').trim();
+        const name = tag.name;
+        const attrs = String(tag.attrs || '').trim();
         if (!out.has(name)) {
             out.set(name, []);
         }
         out.get(name).push({ attrs, ownerPath });
+        cursor = tag.end;
     }
     return out;
 }
@@ -1774,6 +1775,82 @@ function rewritePropsExpression(expr, rewriteContext = null) {
     }
     return `${rewrittenRoot}${rootMatch[2]}`;
 }
+/**
+ * Translate compiler `compiled_expr` output into module-scope JS for props
+ * preludes. Expression bindings use `signalMap.get(i)` at hydrate-time, but
+ * component props need direct access to the already-hoisted scoped symbols.
+ *
+ * @param {string | null | undefined} compiledExpr
+ * @param {{
+ *   signals?: Array<{ state_index?: number }>,
+ *   stateBindings?: Array<{ key?: string }>
+ * } | null | undefined} expressionRewrite
+ * @returns {string | null}
+ */
+function resolveCompiledPropsExpression(compiledExpr, expressionRewrite = null) {
+    const source = typeof compiledExpr === 'string' ? compiledExpr.trim() : '';
+    if (!source) {
+        return null;
+    }
+    const signals = Array.isArray(expressionRewrite?.signals) ? expressionRewrite.signals : [];
+    const stateBindings = Array.isArray(expressionRewrite?.stateBindings) ? expressionRewrite.stateBindings : [];
+    return source.replace(/signalMap\.get\((\d+)\)(?:\.get\(\))?/g, (full, rawIndex) => {
+        const signalIndex = Number.parseInt(rawIndex, 10);
+        if (!Number.isInteger(signalIndex)) {
+            return full;
+        }
+        const signal = signals[signalIndex];
+        const stateIndex = signal?.state_index;
+        const stateKey = Number.isInteger(stateIndex) ? stateBindings[stateIndex]?.key : null;
+        if (typeof stateKey !== 'string' || stateKey.length === 0) {
+            return full;
+        }
+        return full.endsWith('.get()') ? `${stateKey}.get()` : stateKey;
+    });
+}
+/**
+ * Resolve a raw component prop expression to the same scoped symbol/expression
+ * contract used by the compiler rename pass.
+ *
+ * @param {string} expr
+ * @param {{
+ *   expressionRewrite?: {
+ *     map?: Map<string, string>,
+ *     bindings?: Map<string, {
+ *       compiled_expr?: string | null
+ *     }>,
+ *     ambiguous?: Set<string>,
+ *     signals?: Array<{ state_index?: number }>,
+ *     stateBindings?: Array<{ key?: string }>
+ *   } | null,
+ *   scopeRewrite?: { map?: Map<string, string>, ambiguous?: Set<string> } | null
+ * } | null} rewriteContext
+ * @returns {string}
+ */
+function resolvePropsValueCode(expr, rewriteContext = null) {
+    const trimmed = String(expr || '').trim();
+    if (!trimmed) {
+        return trimmed;
+    }
+    const expressionRewrite = rewriteContext?.expressionRewrite;
+    const expressionAmbiguous = expressionRewrite?.ambiguous;
+    if (!(expressionAmbiguous instanceof Set && expressionAmbiguous.has(trimmed))) {
+        const binding = expressionRewrite?.bindings instanceof Map
+            ? expressionRewrite.bindings.get(trimmed)
+            : null;
+        const compiled = resolveCompiledPropsExpression(binding?.compiled_expr, expressionRewrite);
+        if (typeof compiled === 'string' && compiled.length > 0) {
+            return compiled;
+        }
+        const exact = expressionRewrite?.map instanceof Map
+            ? expressionRewrite.map.get(trimmed)
+            : null;
+        if (typeof exact === 'string' && exact.length > 0) {
+            return exact;
+        }
+    }
+    return rewritePropsExpression(trimmed, rewriteContext);
+}
 /**
  * @param {string} attrs
  * @param {{
@@ -1807,7 +1884,7 @@ function renderPropsLiteralFromAttrs(attrs, rewriteContext = null) {
         }
         else if (expressionValue !== undefined) {
             const trimmed = String(expressionValue).trim();
-            valueCode = trimmed.length > 0 ? rewritePropsExpression(trimmed, rewriteContext) : 'undefined';
+            valueCode = trimmed.length > 0 ? resolvePropsValueCode(trimmed, rewriteContext) : 'undefined';
         }
         entries.push(`${renderObjectKey(rawName)}: ${valueCode}`);
     }
@@ -2039,6 +2116,7 @@ export async function build(options) {
         const sourceFile = join(pagesDir, entry.file);
         const rawSource = readFileSync(sourceFile, 'utf8');
         const componentOccurrences = collectExpandedComponentOccurrences(rawSource, registry, sourceFile);
+        const pageOwnerSource = extractServerScript(rawSource, sourceFile, compilerOpts).source;
         const baseName = sourceFile.slice(0, -extname(sourceFile).length);
         let adjacentGuard = null;
         let adjacentLoad = null;
@@ -2098,7 +2176,18 @@ export async function build(options) {
         const pageAmbiguousExpressionMap = new Set();
         const knownRefKeys = new Set();
         const componentOccurrencePlans = [];
-        const pageScopeRewrite = buildScopedIdentifierRewrite(pageIr);
+        const pageOwnerIr = componentOccurrences.length > 0
+            ? runCompiler(sourceFile, pageOwnerSource, compilerOpts, {
+                suppressWarnings: true,
+                compilerToolchain: compilerBin
+            })
+            : null;
+        const pageOwnerExpressionRewrite = pageOwnerIr
+            ? buildComponentExpressionRewrite(sourceFile, pageOwnerSource, pageOwnerIr, compilerOpts, compilerBin)
+            : { map: new Map(), bindings: new Map(), signals: [], stateBindings: [], ambiguous: new Set(), sequence: [] };
+        const pageOwnerScopeRewrite = pageOwnerIr
+            ? buildScopedIdentifierRewrite(pageOwnerIr)
+            : { map: new Map(), ambiguous: new Set() };
         const pageSelfExpressionRewrite = buildComponentExpressionRewrite(sourceFile, compileSource, pageIr, compilerOpts, compilerBin);
         mergeExpressionRewriteMaps(pageExpressionRewriteMap, pageExpressionBindingMap, pageAmbiguousExpressionMap, pageSelfExpressionRewrite, pageIr);
         const componentScopeRewriteCache = new Map();
@@ -2133,8 +2222,8 @@ export async function build(options) {
                 expressionRewrite = buildComponentExpressionRewrite(compPath, componentSource, compIr, compilerOpts, compilerBin);
                 componentExpressionRewriteCache.set(compPath, expressionRewrite);
             }
-            let attrExpressionRewrite = pageSelfExpressionRewrite;
-            let attrScopeRewrite = pageScopeRewrite;
+            let attrExpressionRewrite = pageOwnerExpressionRewrite;
+            let attrScopeRewrite = pageOwnerScopeRewrite;
             const ownerPath = typeof occurrence.ownerPath === 'string' && occurrence.ownerPath.length > 0
                 ? occurrence.ownerPath
                 : sourceFile;

package/dist/component-occurrences.js

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs';
+import { findMatchingComponentClose, findNextKnownComponentTag } from './component-tag-parser.js';
 import { extractTemplate, isDocumentMode } from './resolve-components.js';
-const OPEN_COMPONENT_TAG_RE = /<([A-Z][a-zA-Z0-9]*)(\s[^<>]*?)?\s*(\/?)>/g;
 export function collectExpandedComponentOccurrences(source, registry, sourceFile) {
     /** @type {Array<{ name: string, attrs: string, ownerPath: string, componentPath: string }>} */
     const occurrences = [];
@@ -10,14 +10,14 @@ export function collectExpandedComponentOccurrences(source, registry, sourceFile
 function walkSource(source, registry, sourceFile, chain, occurrences) {
     let cursor = 0;
     while (cursor < source.length) {
-        const tag = findNextKnownTag(source, registry, cursor);
+        const tag = findNextKnownComponentTag(source, registry, cursor);
         if (!tag) {
             return;
         }
         let children = '';
         let replaceEnd = tag.end;
         if (!tag.selfClosing) {
-            const close = findMatchingClose(source, tag.name, tag.end);
+            const close = findMatchingComponentClose(source, tag.name, tag.end);
             if (!close) {
                 throw new Error(`Unclosed component tag <${tag.name}> in ${sourceFile} at offset ${tag.start}`);
             }
@@ -61,66 +61,6 @@ function materializeTemplate(componentSource, name, children, componentPath) {
     }
     return template;
 }
-function findNextKnownTag(source, registry, startIndex) {
-    OPEN_COMPONENT_TAG_RE.lastIndex = startIndex;
-    let match;
-    while ((match = OPEN_COMPONENT_TAG_RE.exec(source)) !== null) {
-        const name = match[1];
-        if (!registry.has(name)) {
-            continue;
-        }
-        if (isInsideExpressionScope(source, match.index)) {
-            continue;
-        }
-        return {
-            name,
-            attrs: String(match[2] || ''),
-            start: match.index,
-            end: OPEN_COMPONENT_TAG_RE.lastIndex,
-            selfClosing: match[3] === '/'
-        };
-    }
-    return null;
-}
-function isInsideExpressionScope(source, index) {
-    let depth = 0;
-    for (let i = 0; i < index; i++) {
-        if (source[i] === '{') {
-            depth += 1;
-        }
-        else if (source[i] === '}') {
-            depth = Math.max(0, depth - 1);
-        }
-    }
-    return depth > 0;
-}
-function findMatchingClose(source, tagName, startAfterOpen) {
-    let depth = 1;
-    const escapedName = tagName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const tagRe = new RegExp(`<(/?)${escapedName}(?:\\s[^<>]*?)?\\s*(/?)>`, 'g');
-    tagRe.lastIndex = startAfterOpen;
-    let match;
-    while ((match = tagRe.exec(source)) !== null) {
-        const isClose = match[1] === '/';
-        const isSelfClose = match[2] === '/';
-        if (isSelfClose && !isClose) {
-            continue;
-        }
-        if (isClose) {
-            depth -= 1;
-            if (depth === 0) {
-                return {
-                    contentEnd: match.index,
-                    tagEnd: match.index + match[0].length
-                };
-            }
-        }
-        else {
-            depth += 1;
-        }
-    }
-    return null;
-}
 function countSlots(template) {
     const matches = template.match(/<slot\s*>\s*<\/slot>|<slot\s*\/>|<slot\s*>/gi);
     return matches ? matches.length : 0;

package/dist/component-tag-parser.d.ts

@@ -0,0 +1,13 @@
+export function isInsideExpressionScope(source: any, index: any): boolean;
+export function findNextKnownComponentTag(source: any, registry: any, startIndex?: number): {
+    name: any;
+    attrs: any;
+    start: any;
+    end: any;
+    isClose: boolean;
+    selfClosing: any;
+} | null;
+export function findMatchingComponentClose(source: any, tagName: any, startAfterOpen: any): {
+    contentEnd: any;
+    tagEnd: any;
+} | null;

package/dist/component-tag-parser.js

@@ -0,0 +1,240 @@
+function isNameStart(ch) {
+    return /[A-Z]/.test(ch);
+}
+function isNameChar(ch) {
+    return /[a-zA-Z0-9]/.test(ch);
+}
+export function isInsideExpressionScope(source, index) {
+    let depth = 0;
+    let mode = 'code';
+    let escaped = false;
+    const lower = source.toLowerCase();
+    for (let i = 0; i < index; i++) {
+        if (mode === 'code') {
+            if (lower.startsWith('<script', i)) {
+                const close = lower.indexOf('</script>', i + 7);
+                if (close < 0 || close >= index) {
+                    return false;
+                }
+                i = close + '</script>'.length - 1;
+                continue;
+            }
+            if (lower.startsWith('<style', i)) {
+                const close = lower.indexOf('</style>', i + 6);
+                if (close < 0 || close >= index) {
+                    return false;
+                }
+                i = close + '</style>'.length - 1;
+                continue;
+            }
+        }
+        const ch = source[i];
+        const next = i + 1 < index ? source[i + 1] : '';
+        if (mode === 'line-comment') {
+            if (ch === '\n') {
+                mode = 'code';
+            }
+            continue;
+        }
+        if (mode === 'block-comment') {
+            if (ch === '*' && next === '/') {
+                mode = 'code';
+                i += 1;
+            }
+            continue;
+        }
+        if (mode === 'single-quote' || mode === 'double-quote' || mode === 'template') {
+            if (escaped) {
+                escaped = false;
+                continue;
+            }
+            if (ch === '\\') {
+                escaped = true;
+                continue;
+            }
+            if ((mode === 'single-quote' && ch === "'") ||
+                (mode === 'double-quote' && ch === '"') ||
+                (mode === 'template' && ch === '`')) {
+                mode = 'code';
+            }
+            continue;
+        }
+        if (ch === '/' && next === '/') {
+            mode = 'line-comment';
+            i += 1;
+            continue;
+        }
+        if (ch === '/' && next === '*') {
+            mode = 'block-comment';
+            i += 1;
+            continue;
+        }
+        if (ch === "'") {
+            mode = 'single-quote';
+            continue;
+        }
+        if (ch === '"') {
+            mode = 'double-quote';
+            continue;
+        }
+        if (ch === '`') {
+            mode = 'template';
+            continue;
+        }
+        if (ch === '{') {
+            depth += 1;
+            continue;
+        }
+        if (ch === '}') {
+            depth = Math.max(0, depth - 1);
+        }
+    }
+    return depth > 0;
+}
+function parseComponentTagAt(source, index) {
+    if (source[index] !== '<') {
+        return null;
+    }
+    let cursor = index + 1;
+    let isClose = false;
+    if (source[cursor] === '/') {
+        isClose = true;
+        cursor += 1;
+    }
+    const nameStart = cursor;
+    if (!isNameStart(source[cursor] || '')) {
+        return null;
+    }
+    cursor += 1;
+    while (isNameChar(source[cursor] || '')) {
+        cursor += 1;
+    }
+    const name = source.slice(nameStart, cursor);
+    const attrStart = cursor;
+    let mode = 'code';
+    let escaped = false;
+    let exprDepth = 0;
+    for (; cursor < source.length; cursor += 1) {
+        const ch = source[cursor];
+        const next = source[cursor + 1] || '';
+        if (mode === 'line-comment') {
+            if (ch === '\n') {
+                mode = 'code';
+            }
+            continue;
+        }
+        if (mode === 'block-comment') {
+            if (ch === '*' && next === '/') {
+                mode = 'code';
+                cursor += 1;
+            }
+            continue;
+        }
+        if (mode === 'single-quote' || mode === 'double-quote' || mode === 'template') {
+            if (escaped) {
+                escaped = false;
+                continue;
+            }
+            if (ch === '\\') {
+                escaped = true;
+                continue;
+            }
+            if ((mode === 'single-quote' && ch === "'") ||
+                (mode === 'double-quote' && ch === '"') ||
+                (mode === 'template' && ch === '`')) {
+                mode = 'code';
+            }
+            continue;
+        }
+        if (exprDepth > 0 && ch === '/' && next === '/') {
+            mode = 'line-comment';
+            cursor += 1;
+            continue;
+        }
+        if (exprDepth > 0 && ch === '/' && next === '*') {
+            mode = 'block-comment';
+            cursor += 1;
+            continue;
+        }
+        if (ch === "'") {
+            mode = 'single-quote';
+            continue;
+        }
+        if (ch === '"') {
+            mode = 'double-quote';
+            continue;
+        }
+        if (ch === '`') {
+            mode = 'template';
+            continue;
+        }
+        if (ch === '{') {
+            exprDepth += 1;
+            continue;
+        }
+        if (ch === '}') {
+            exprDepth = Math.max(0, exprDepth - 1);
+            continue;
+        }
+        if (exprDepth === 0 && ch === '>') {
+            const rawAttrs = source.slice(attrStart, cursor);
+            const trimmed = rawAttrs.trimEnd();
+            const selfClosing = !isClose && trimmed.endsWith('/');
+            const attrs = selfClosing ? trimmed.slice(0, -1) : rawAttrs;
+            return {
+                name,
+                attrs,
+                start: index,
+                end: cursor + 1,
+                isClose,
+                selfClosing
+            };
+        }
+    }
+    return null;
+}
+export function findNextKnownComponentTag(source, registry, startIndex = 0) {
+    for (let index = startIndex; index < source.length; index += 1) {
+        if (source[index] !== '<') {
+            continue;
+        }
+        const tag = parseComponentTagAt(source, index);
+        if (!tag || tag.isClose || !registry.has(tag.name)) {
+            continue;
+        }
+        if (isInsideExpressionScope(source, index)) {
+            continue;
+        }
+        return tag;
+    }
+    return null;
+}
+export function findMatchingComponentClose(source, tagName, startAfterOpen) {
+    let depth = 1;
+    for (let index = startAfterOpen; index < source.length; index += 1) {
+        if (source[index] !== '<') {
+            continue;
+        }
+        const tag = parseComponentTagAt(source, index);
+        if (!tag || tag.name !== tagName) {
+            continue;
+        }
+        if (isInsideExpressionScope(source, index)) {
+            continue;
+        }
+        if (tag.isClose) {
+            depth -= 1;
+            if (depth === 0) {
+                return {
+                    contentEnd: index,
+                    tagEnd: tag.end
+                };
+            }
+            continue;
+        }
+        if (!tag.selfClosing) {
+            depth += 1;
+        }
+    }
+    return null;
+}

package/dist/resolve-components.js

@@ -10,6 +10,7 @@
 // ---------------------------------------------------------------------------
 import { readdirSync, readFileSync, statSync } from 'node:fs';
 import { basename, extname, join } from 'node:path';
+import { findMatchingComponentClose, findNextKnownComponentTag } from './component-tag-parser.js';
 // ---------------------------------------------------------------------------
 // Registry: Map<PascalCaseName, absolutePath>
 // ---------------------------------------------------------------------------
@@ -127,7 +128,6 @@ export function isDocumentMode(template) {
 // ---------------------------------------------------------------------------
 // Component expansion
 // ---------------------------------------------------------------------------
-const OPEN_COMPONENT_TAG_RE = /<([A-Z][a-zA-Z0-9]*)(\s[^<>]*?)?\s*(\/?)>/g;
 /**
  * Recursively expand PascalCase component tags in `source`.
  *
@@ -164,14 +164,14 @@ function expandSource(source, registry, sourceFile, chain, usedComponents) {
     const MAX_ITERATIONS = 10_000;
     while (iterations < MAX_ITERATIONS) {
         iterations += 1;
-        const tag = findNextKnownTag(output, registry, 0);
+        const tag = findNextKnownComponentTag(output, registry, 0);
         if (!tag) {
             return output;
         }
         let children = '';
         let replaceEnd = tag.end;
         if (!tag.selfClosing) {
-            const close = findMatchingClose(output, tag.name, tag.end);
+            const close = findMatchingComponentClose(output, tag.name, tag.end);
             if (!close) {
                 throw new Error(`Unclosed component tag <${tag.name}> in ${sourceFile} at offset ${tag.start}`);
             }
@@ -183,168 +183,6 @@ function expandSource(source, registry, sourceFile, chain, usedComponents) {
     }
     throw new Error(`Component expansion exceeded ${MAX_ITERATIONS} replacements in ${sourceFile}.`);
 }
-/**
- * Find the next component opening tag that exists in the registry.
- *
- * @param {string} source
- * @param {Map<string, string>} registry
- * @param {number} startIndex
- * @returns {{ name: string, start: number, end: number, selfClosing: boolean } | null}
- */
-function findNextKnownTag(source, registry, startIndex) {
-    OPEN_COMPONENT_TAG_RE.lastIndex = startIndex;
-    let match;
-    while ((match = OPEN_COMPONENT_TAG_RE.exec(source)) !== null) {
-        const name = match[1];
-        if (!registry.has(name)) {
-            continue;
-        }
-        if (isInsideExpressionScope(source, match.index)) {
-            continue;
-        }
-        return {
-            name,
-            start: match.index,
-            end: OPEN_COMPONENT_TAG_RE.lastIndex,
-            selfClosing: match[3] === '/',
-        };
-    }
-    return null;
-}
-/**
- * Detect whether `index` is inside a `{ ... }` expression scope.
- *
- * This prevents component macro expansion inside embedded markup expressions,
- * which must remain expression-local so the compiler can lower them safely.
- *
- * @param {string} source
- * @param {number} index
- * @returns {boolean}
- */
-function isInsideExpressionScope(source, index) {
-    let depth = 0;
-    let mode = 'code';
-    let escaped = false;
-    const lower = source.toLowerCase();
-    for (let i = 0; i < index; i++) {
-        if (mode === 'code') {
-            if (lower.startsWith('<script', i)) {
-                const close = lower.indexOf('</script>', i + 7);
-                if (close < 0 || close >= index) {
-                    return false;
-                }
-                i = close + '</script>'.length - 1;
-                continue;
-            }
-            if (lower.startsWith('<style', i)) {
-                const close = lower.indexOf('</style>', i + 6);
-                if (close < 0 || close >= index) {
-                    return false;
-                }
-                i = close + '</style>'.length - 1;
-                continue;
-            }
-        }
-        const ch = source[i];
-        const next = i + 1 < index ? source[i + 1] : '';
-        if (mode === 'line-comment') {
-            if (ch === '\n') {
-                mode = 'code';
-            }
-            continue;
-        }
-        if (mode === 'block-comment') {
-            if (ch === '*' && next === '/') {
-                mode = 'code';
-                i += 1;
-            }
-            continue;
-        }
-        if (mode === 'single-quote' || mode === 'double-quote' || mode === 'template') {
-            if (escaped) {
-                escaped = false;
-                continue;
-            }
-            if (ch === '\\') {
-                escaped = true;
-                continue;
-            }
-            if ((mode === 'single-quote' && ch === "'") ||
-                (mode === 'double-quote' && ch === '"') ||
-                (mode === 'template' && ch === '`')) {
-                mode = 'code';
-            }
-            continue;
-        }
-        if (ch === '/' && next === '/') {
-            mode = 'line-comment';
-            i += 1;
-            continue;
-        }
-        if (ch === '/' && next === '*') {
-            mode = 'block-comment';
-            i += 1;
-            continue;
-        }
-        if (ch === "'") {
-            mode = 'single-quote';
-            continue;
-        }
-        if (ch === '"') {
-            mode = 'double-quote';
-            continue;
-        }
-        if (ch === '`') {
-            mode = 'template';
-            continue;
-        }
-        if (ch === '{') {
-            depth += 1;
-            continue;
-        }
-        if (ch === '}') {
-            depth = Math.max(0, depth - 1);
-        }
-    }
-    return depth > 0;
-}
-/**
- * Find the matching </Name> for an opening tag, accounting for nested
- * tags with the same name.
- *
- * @param {string} source — full source
- * @param {string} tagName — tag name to match
- * @param {number} startAfterOpen — position after the opening tag's `>`
- * @returns {{ contentEnd: number, tagEnd: number } | null}
- */
-function findMatchingClose(source, tagName, startAfterOpen) {
-    let depth = 1;
-    const escapedName = tagName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const tagRe = new RegExp(`<(/?)${escapedName}(?:\\s[^<>]*?)?\\s*(/?)>`, 'g');
-    tagRe.lastIndex = startAfterOpen;
-    let match;
-    while ((match = tagRe.exec(source)) !== null) {
-        const isClose = match[1] === '/';
-        const isSelfClose = match[2] === '/';
-        if (isSelfClose && !isClose) {
-            // Self-closing <Name />, doesn't affect depth.
-            continue;
-        }
-        if (isClose) {
-            depth--;
-            if (depth === 0) {
-                return {
-                    contentEnd: match.index,
-                    tagEnd: match.index + match[0].length,
-                };
-            }
-        }
-        else {
-            depth++;
-        }
-    }
-    return null;
-}
 /**
  * Expand a single component tag into its template HTML.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenithbuild/cli",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "Deterministic project orchestrator for Zenith framework",
   "license": "MIT",
   "type": "module",
@@ -34,7 +34,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@zenithbuild/compiler": "0.6.10",
+    "@zenithbuild/compiler": "0.6.12",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {