@esportsplus/template 0.35.1 → 0.38.0

package/build/compiler/analyzer.d.ts

@@ -0,0 +1,4 @@
+import { COMPILER_TYPES } from '../constants.js';
+import { ts } from '@esportsplus/typescript';
+declare const analyze: (expr: ts.Expression, checker?: ts.TypeChecker) => COMPILER_TYPES;
+export { analyze };

package/build/compiler/{type-analyzer.js → analyzer.js}

@@ -1,6 +1,17 @@
-import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, COMPILER_TYPES, DIRECT_ATTACH_EVENTS, LIFECYCLE_EVENTS } from '../constants.js';
+import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, COMPILER_TYPES } from '../constants.js';
 import { ts } from '@esportsplus/typescript';
-function inferCOMPILER_TYPES(expr, checker) {
+function isTypeFunction(type, checker) {
+    if (type.isUnion()) {
+        for (let i = 0, n = type.types.length; i < n; i++) {
+            if (!isTypeFunction(type.types[i], checker)) {
+                return false;
+            }
+        }
+        return type.types.length > 0;
+    }
+    return type.getCallSignatures().length > 0;
+}
+const analyze = (expr, checker) => {
     while (ts.isParenthesizedExpression(expr)) {
         expr = expr.expression;
     }
@@ -30,7 +41,7 @@ function inferCOMPILER_TYPES(expr, checker) {
         return COMPILER_TYPES.Primitive;
     }
     if (ts.isConditionalExpression(expr)) {
-        let whenFalse = inferCOMPILER_TYPES(expr.whenFalse, checker), whenTrue = inferCOMPILER_TYPES(expr.whenTrue, checker);
+        let whenFalse = analyze(expr.whenFalse, checker), whenTrue = analyze(expr.whenTrue, checker);
         if (whenTrue === whenFalse) {
             return whenTrue;
         }
@@ -50,48 +61,5 @@ function inferCOMPILER_TYPES(expr, checker) {
         }
     }
     return COMPILER_TYPES.Unknown;
-}
-function isTypeFunction(type, checker) {
-    if (type.isUnion()) {
-        let allFunctions = true, hasFunction = false;
-        for (let i = 0, n = type.types.length; i < n; i++) {
-            if (isTypeFunction(type.types[i], checker)) {
-                hasFunction = true;
-            }
-            else {
-                allFunctions = false;
-            }
-        }
-        return hasFunction && allFunctions;
-    }
-    return type.getCallSignatures().length > 0;
-}
-const analyzeExpression = (expr, checker) => {
-    return inferCOMPILER_TYPES(expr, checker);
-};
-const generateAttributeBinding = (elementVar, name, expr, staticValue, addImport) => {
-    if (name.startsWith('on') && name.length > 2) {
-        let event = name.slice(2).toLowerCase(), key = name.toLowerCase();
-        if (LIFECYCLE_EVENTS.has(key)) {
-            return `${addImport(key)}(${elementVar}, ${expr});`;
-        }
-        if (DIRECT_ATTACH_EVENTS.has(key)) {
-            return `${addImport('on')}(${elementVar}, '${event}', ${expr});`;
-        }
-        return `${addImport('delegate')}(${elementVar}, '${event}', ${expr});`;
-    }
-    if (name === 'class') {
-        return `${addImport('setClass')}(${elementVar}, '${staticValue}', ${expr});`;
-    }
-    if (name === COMPILER_TYPES.Attributes) {
-        return `${addImport('setProperties')}(${elementVar}, ${expr});`;
-    }
-    if (name === 'style') {
-        return `${addImport('setStyle')}(${elementVar}, '${staticValue}', ${expr});`;
-    }
-    return `${addImport('setProperty')}(${elementVar}, '${name}', ${expr});`;
-};
-const generateSpreadBindings = (exprCode, elementVar, addImport) => {
-    return [`${addImport('setProperties')}(${elementVar}, ${exprCode});`];
 };
-export { analyzeExpression, generateAttributeBinding, generateSpreadBindings };
+export { analyze };

package/build/compiler/codegen.d.ts

@@ -1,10 +1,12 @@
+import type { ReplacementIntent } from '@esportsplus/typescript/compiler';
 import { ts } from '@esportsplus/typescript';
-import type { ReactiveCallInfo, TemplateInfo } from './ts-parser.js';
+import type { TemplateInfo } from './ts-parser.js';
 type CodegenResult = {
-    changed: boolean;
-    code: string;
+    imports: Map<string, string>;
+    prepend: string[];
+    replacements: ReplacementIntent[];
+    templates: Map<string, string>;
 };
-declare const generateCode: (templates: TemplateInfo[], originalCode: string, sourceFile: ts.SourceFile, checker?: ts.TypeChecker, existingAliases?: Map<string, string>) => CodegenResult;
-declare const generateReactiveInlining: (calls: ReactiveCallInfo[], code: string, sourceFile: ts.SourceFile, arraySlotAlias: string) => string;
-export { generateCode, generateReactiveInlining };
+declare const generateCode: (templates: TemplateInfo[], sourceFile: ts.SourceFile, checker?: ts.TypeChecker, existingAliases?: Map<string, string>) => CodegenResult;
+export { generateCode };
 export type { CodegenResult };

package/build/compiler/codegen.js

@@ -1,7 +1,7 @@
 import { ts } from '@esportsplus/typescript';
-import { ast, code as c, imports, uid } from '@esportsplus/typescript/compiler';
-import { COMPILER_ENTRYPOINT, COMPILER_TYPES, PACKAGE } from '../constants.js';
-import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } from './type-analyzer.js';
+import { ast, uid } from '@esportsplus/typescript/compiler';
+import { COMPILER_ENTRYPOINT, COMPILER_TYPES, DIRECT_ATTACH_EVENTS, LIFECYCLE_EVENTS } from '../constants.js';
+import { analyze } from './analyzer.js';
 import parser from './parser.js';
 const ARROW_EMPTY_PARAMS = /\(\s*\)\s*=>\s*$/;
 let printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
@@ -18,13 +18,32 @@ function collectNestedTemplateReplacements(ctx, node, exprStart, replacements) {
         replacements.push({
             end: node.end - exprStart,
             newText: generateNestedTemplateCode(ctx, node),
-            start: node.getStart() - exprStart
+            start: node.getStart(ctx.sourceFile) - exprStart
         });
     }
     else {
         ts.forEachChild(node, child => collectNestedTemplateReplacements(ctx, child, exprStart, replacements));
     }
 }
+function generateAttributeBinding(ctx, element, name, expr, staticValue) {
+    if (name.startsWith('on') && name.length > 2) {
+        let event = name.slice(2).toLowerCase(), key = name.toLowerCase();
+        if (LIFECYCLE_EVENTS.has(key)) {
+            return `${addImport(ctx, key)}(${element}, ${expr});`;
+        }
+        if (DIRECT_ATTACH_EVENTS.has(key)) {
+            return `${addImport(ctx, 'on')}(${element}, '${event}', ${expr});`;
+        }
+        return `${addImport(ctx, 'delegate')}(${element}, '${event}', ${expr});`;
+    }
+    if (name === 'class') {
+        return `${addImport(ctx, 'setClass')}(${element}, '${staticValue}', ${expr});`;
+    }
+    if (name === 'style') {
+        return `${addImport(ctx, 'setStyle')}(${element}, '${staticValue}', ${expr});`;
+    }
+    return `${addImport(ctx, 'setProperty')}(${element}, '${name}', ${expr});`;
+}
 function generateNestedTemplateCode(ctx, node) {
     let expressions = [], exprTexts = [], literals = [], template = node.template;
     if (ts.isNoSubstitutionTemplateLiteral(template)) {
@@ -48,7 +67,7 @@ function generateNodeBinding(ctx, anchor, exprText, exprNode) {
     if (isNestedHtmlTemplate(exprNode)) {
         return `${anchor}.parentNode.insertBefore(${generateNestedTemplateCode(ctx, exprNode)}, ${anchor});`;
     }
-    let slotType = analyzeExpression(exprNode, ctx.checker);
+    let slotType = analyze(exprNode, ctx.checker);
     switch (slotType) {
         case COMPILER_TYPES.Effect:
             return `new ${addImport(ctx, 'EffectSlot')}(${anchor}, ${exprText});`;
@@ -104,14 +123,11 @@ function generateTemplateCode(ctx, { html, slots }, exprTexts, exprNodes, isArro
             for (let j = 0, m = names.length; j < m; j++) {
                 let name = names[j];
                 if (name === COMPILER_TYPES.Attributes) {
-                    let bindings = generateSpreadBindings(exprTexts[index] || 'undefined', element, n => addImport(ctx, n));
-                    for (let k = 0, o = bindings.length; k < o; k++) {
-                        code.push(bindings[k]);
-                    }
+                    code.push(`${addImport(ctx, 'setProperties')}(${element}, ${exprTexts[index] || 'undefined'});`);
                     index++;
                 }
                 else {
-                    code.push(generateAttributeBinding(element, name, exprTexts[index++] || 'undefined', slot.attributes.statics[name] || '', n => addImport(ctx, n)));
+                    code.push(generateAttributeBinding(ctx, element, name, exprTexts[index++] || 'undefined', slot.attributes.statics[name] || ''));
                 }
             }
         }
@@ -135,6 +151,14 @@ function getOrCreateTemplateId(ctx, html) {
 function isNestedHtmlTemplate(expr) {
     return ts.isTaggedTemplateExpression(expr) && ts.isIdentifier(expr.tag) && expr.tag.text === COMPILER_ENTRYPOINT;
 }
+function replaceReverse(text, replacements) {
+    let sorted = replacements.slice().sort((a, b) => b.start - a.start);
+    for (let i = 0, n = sorted.length; i < n; i++) {
+        let r = sorted[i];
+        text = text.slice(0, r.start) + r.newText + text.slice(r.end);
+    }
+    return text;
+}
 function rewriteExpression(ctx, expr) {
     if (isNestedHtmlTemplate(expr)) {
         return generateNestedTemplateCode(ctx, expr);
@@ -143,87 +167,65 @@ function rewriteExpression(ctx, expr) {
         return ctx.printer.printNode(ts.EmitHint.Expression, expr, ctx.sourceFile);
     }
     let replacements = [];
-    collectNestedTemplateReplacements(ctx, expr, expr.getStart(), replacements);
-    return c.replaceReverse(expr.getText(ctx.sourceFile), replacements);
+    collectNestedTemplateReplacements(ctx, expr, expr.getStart(ctx.sourceFile), replacements);
+    return replaceReverse(expr.getText(ctx.sourceFile), replacements);
 }
-const generateCode = (templates, originalCode, sourceFile, checker, existingAliases) => {
+const generateCode = (templates, sourceFile, checker, existingAliases) => {
+    let result = {
+        imports: existingAliases ?? new Map(),
+        prepend: [],
+        replacements: [],
+        templates: new Map()
+    };
     if (templates.length === 0) {
-        return { changed: false, code: originalCode };
+        return result;
     }
     let ranges = [];
     for (let i = 0, n = templates.length; i < n; i++) {
         let exprs = templates[i].expressions;
         for (let j = 0, m = exprs.length; j < m; j++) {
-            ranges.push({ end: exprs[j].end, start: exprs[j].getStart() });
+            ranges.push({ end: exprs[j].end, start: exprs[j].getStart(sourceFile) });
         }
     }
-    let rootTemplates = templates.filter(t => !ast.inRange(ranges, t.start, t.end));
+    let rootTemplates = templates.filter(t => !ast.inRange(ranges, t.node.getStart(sourceFile), t.node.end));
     if (rootTemplates.length === 0) {
-        return { changed: false, code: originalCode };
+        return result;
     }
     let ctx = {
         checker,
-        templates: new Map(),
-        imports: existingAliases ?? new Map(),
+        imports: result.imports,
         printer,
-        sourceFile
-    }, replacements = [], templateAlias = addImport(ctx, 'template');
+        sourceFile,
+        templates: result.templates
+    }, templateAlias = addImport(ctx, 'template');
     for (let i = 0, n = rootTemplates.length; i < n; i++) {
-        let exprTexts = [], template = rootTemplates[i];
-        for (let j = 0, m = template.expressions.length; j < m; j++) {
-            exprTexts.push(rewriteExpression(ctx, template.expressions[j]));
-        }
-        let codeBefore = originalCode.slice(0, template.start), isArrowBody = codeBefore.trimEnd().endsWith('=>'), parsed = parser.parse(template.literals);
-        if (isArrowBody && (!parsed.slots || parsed.slots.length === 0)) {
-            let arrowMatch = codeBefore.match(ARROW_EMPTY_PARAMS);
-            if (arrowMatch) {
-                replacements.push({
-                    end: template.end,
-                    newText: getOrCreateTemplateId(ctx, parsed.html),
-                    start: template.start - arrowMatch[0].length
-                });
-                continue;
-            }
-        }
-        replacements.push({
-            end: template.end,
-            newText: generateTemplateCode(ctx, parsed, exprTexts, template.expressions, isArrowBody),
-            start: template.start
-        });
-    }
-    let changed = replacements.length > 0, code = c.replaceReverse(originalCode, replacements);
-    if (changed && ctx.templates.size > 0) {
-        let aliasedImports = [], factories = [];
-        for (let [name, alias] of ctx.imports) {
-            aliasedImports.push(`${name} as ${alias}`);
-        }
-        for (let [html, id] of ctx.templates) {
-            factories.push(`const ${id} = ${templateAlias}(\`${html}\`);`);
-        }
-        code = imports.modify(code, sourceFile, PACKAGE, {
-            add: new Set(aliasedImports),
-            remove: [COMPILER_ENTRYPOINT]
+        let template = rootTemplates[i];
+        result.replacements.push({
+            generate: (sf) => {
+                let codeBefore = sf.getFullText().slice(0, template.node.getStart(sf)), exprTexts = [], isArrowBody = codeBefore.trimEnd().endsWith('=>'), localCtx = {
+                    checker,
+                    imports: ctx.imports,
+                    printer,
+                    sourceFile: sf,
+                    templates: ctx.templates
+                }, parsed = parser.parse(template.literals);
+                for (let j = 0, m = template.expressions.length; j < m; j++) {
+                    exprTexts.push(rewriteExpression(localCtx, template.expressions[j]));
+                }
+                if (isArrowBody && (!parsed.slots || parsed.slots.length === 0)) {
+                    let arrowMatch = codeBefore.match(ARROW_EMPTY_PARAMS);
+                    if (arrowMatch) {
+                        return getOrCreateTemplateId(localCtx, parsed.html);
+                    }
+                }
+                return generateTemplateCode(localCtx, parsed, exprTexts, template.expressions, isArrowBody);
+            },
+            node: template.node
         });
-        code = factories.join('\n') + '\n\n' + code;
-    }
-    return { changed, code };
-};
-const generateReactiveInlining = (calls, code, sourceFile, arraySlotAlias) => {
-    if (calls.length === 0) {
-        return code;
     }
-    let replacements = [];
-    for (let i = 0, n = calls.length; i < n; i++) {
-        let call = calls[i];
-        replacements.push({
-            end: call.end,
-            newText: `new ${arraySlotAlias}(
-                ${printer.printNode(ts.EmitHint.Expression, call.arrayArg, sourceFile)},
-                ${printer.printNode(ts.EmitHint.Expression, call.callbackArg, sourceFile)}
-            )`,
-            start: call.start
-        });
+    for (let [html, id] of ctx.templates) {
+        result.prepend.push(`const ${id} = ${templateAlias}(\`${html}\`);`);
     }
-    return c.replaceReverse(code, replacements);
+    return result;
 };
-export { generateCode, generateReactiveInlining };
+export { generateCode };

package/build/compiler/index.d.ts

@@ -1,8 +1,5 @@
-import { ts } from '@esportsplus/typescript';
-type TransformResult = {
-    changed: boolean;
-    code: string;
-    sourceFile: ts.SourceFile;
-};
-declare const transform: (sourceFile: ts.SourceFile, program: ts.Program) => TransformResult;
-export { transform };
+import type { Plugin } from '@esportsplus/typescript/compiler';
+import reactiveInliningPlugin from './reactive-inlining.js';
+declare const templatePlugin: Plugin;
+export default templatePlugin;
+export { reactiveInliningPlugin, templatePlugin };

package/build/compiler/index.js

@@ -1,50 +1,38 @@
-import { ts } from '@esportsplus/typescript';
-import { code as c, imports, uid } from '@esportsplus/typescript/compiler';
-import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, PACKAGE } from '../constants.js';
-import { generateCode, generateReactiveInlining } from './codegen.js';
-import { findHtmlTemplates, findReactiveCalls } from './ts-parser.js';
-const PATTERNS = [`${COMPILER_ENTRYPOINT}\``, `${COMPILER_ENTRYPOINT}.${COMPILER_ENTRYPOINT_REACTIVITY}`];
-const REGEX_BACKSLASH = /\\/g;
-const REGEX_FORWARD_SLASH = /\//g;
-const transform = (sourceFile, program) => {
-    let code = sourceFile.getFullText();
-    if (!c.contains(code, { patterns: PATTERNS })) {
-        return { changed: false, code, sourceFile };
-    }
-    let checker, fileName = sourceFile.fileName, programSourceFile = program.getSourceFile(fileName)
-        || program.getSourceFile(fileName.replace(REGEX_BACKSLASH, '/'))
-        || program.getSourceFile(fileName.replace(REGEX_FORWARD_SLASH, '\\'));
-    if (programSourceFile) {
-        checker = program.getTypeChecker();
-        sourceFile = programSourceFile;
-    }
-    let changed = false, codegenChanged = false, existingAliases = new Map(), reactiveCalls = findReactiveCalls(sourceFile, checker), result = code;
-    if (reactiveCalls.length > 0) {
-        let arraySlotAlias = uid('ArraySlot');
-        changed = true;
-        existingAliases.set('ArraySlot', arraySlotAlias);
-        result = generateReactiveInlining(reactiveCalls, result, sourceFile, arraySlotAlias);
-        sourceFile = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
-    }
-    let templates = findHtmlTemplates(sourceFile, checker);
-    if (templates.length > 0) {
-        let codegenResult = generateCode(templates, result, sourceFile, checker, existingAliases);
-        if (codegenResult.changed) {
-            changed = true;
-            codegenChanged = true;
-            result = codegenResult.code;
+import { COMPILER_ENTRYPOINT, PACKAGE } from '../constants.js';
+import { generateCode } from './codegen.js';
+import reactiveInliningPlugin, { SHARED_KEY } from './reactive-inlining.js';
+import { findHtmlTemplates } from './ts-parser.js';
+const PATTERNS = [`${COMPILER_ENTRYPOINT}\``];
+const templatePlugin = {
+    patterns: PATTERNS,
+    transform: (ctx) => {
+        let templates = findHtmlTemplates(ctx.sourceFile, ctx.checker);
+        if (templates.length === 0) {
+            return {};
+        }
+        let existingAliases = new Map(), existingArraySlotAlias = ctx.shared.get(SHARED_KEY);
+        if (existingArraySlotAlias) {
+            existingAliases.set('ArraySlot', existingArraySlotAlias);
+        }
+        let result = generateCode(templates, ctx.sourceFile, ctx.checker, existingAliases);
+        if (result.replacements.length === 0) {
+            return {};
         }
-    }
-    if (existingAliases.size > 0 && !codegenChanged) {
         let aliasedImports = [];
-        for (let [name, alias] of existingAliases) {
+        for (let [name, alias] of result.imports) {
             aliasedImports.push(`${name} as ${alias}`);
         }
-        result = imports.modify(result, sourceFile, PACKAGE, { add: aliasedImports });
-    }
-    if (changed) {
-        sourceFile = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
+        let imports = [{
+                add: aliasedImports,
+                package: PACKAGE,
+                remove: [COMPILER_ENTRYPOINT]
+            }];
+        return {
+            imports,
+            prepend: result.prepend,
+            replacements: result.replacements
+        };
     }
-    return { changed, code: result, sourceFile };
 };
-export { transform };
+export default templatePlugin;
+export { reactiveInliningPlugin, templatePlugin };

package/build/compiler/plugins/tsc.js

@@ -1,3 +1,3 @@
 import { plugin } from '@esportsplus/typescript/compiler';
-import { transform } from '../index.js';
-export default plugin.tsc(transform);
+import { reactiveInliningPlugin, templatePlugin } from '../index.js';
+export default plugin.tsc([reactiveInliningPlugin, templatePlugin]);

package/build/compiler/plugins/vite.d.ts

@@ -1,13 +1,13 @@
 declare const _default: ({ root }?: {
     root?: string;
 }) => {
-    configResolved(config: import("vite").ResolvedConfig): void;
-    enforce: string;
+    configResolved: (config: unknown) => void;
+    enforce: "pre";
     name: string;
-    transform(code: string, id: string): {
+    transform: (code: string, id: string) => {
         code: string;
         map: null;
     } | null;
-    watchChange(id: string): void;
+    watchChange: (id: string) => void;
 };
 export default _default;

package/build/compiler/plugins/vite.js

@@ -1,7 +1,7 @@
 import { plugin } from '@esportsplus/typescript/compiler';
 import { PACKAGE } from '../../constants.js';
-import { transform } from '../index.js';
+import { reactiveInliningPlugin, templatePlugin } from '../index.js';
 export default plugin.vite({
     name: PACKAGE,
-    transform
+    plugins: [reactiveInliningPlugin, templatePlugin]
 });

package/build/compiler/reactive-inlining.d.ts

@@ -0,0 +1,5 @@
+import type { Plugin } from '@esportsplus/typescript/compiler';
+declare const SHARED_KEY = "template:arraySlotAlias";
+declare const plugin: Plugin;
+export default plugin;
+export { SHARED_KEY };

package/build/compiler/reactive-inlining.js

@@ -0,0 +1,75 @@
+import { ts } from '@esportsplus/typescript';
+import { uid } from '@esportsplus/typescript/compiler';
+import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, PACKAGE } from '../constants.js';
+const PATTERNS = [`${COMPILER_ENTRYPOINT}.${COMPILER_ENTRYPOINT_REACTIVITY}`];
+const SHARED_KEY = 'template:arraySlotAlias';
+let printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
+function isHtmlFromPackage(node, checker) {
+    if (node.text !== COMPILER_ENTRYPOINT) {
+        return false;
+    }
+    if (!checker) {
+        return true;
+    }
+    let symbol = checker.getSymbolAtLocation(node);
+    if (!symbol) {
+        return true;
+    }
+    if (symbol.flags & ts.SymbolFlags.Alias) {
+        symbol = checker.getAliasedSymbol(symbol);
+    }
+    let declarations = symbol.getDeclarations();
+    if (!declarations || declarations.length === 0) {
+        return true;
+    }
+    for (let i = 0, n = declarations.length; i < n; i++) {
+        let filename = declarations[i].getSourceFile().fileName;
+        if (filename.includes(PACKAGE) || filename.includes('@esportsplus/template')) {
+            return true;
+        }
+    }
+    return false;
+}
+function visit(node, calls, checker) {
+    if (ts.isCallExpression(node) &&
+        ts.isPropertyAccessExpression(node.expression) &&
+        ts.isIdentifier(node.expression.expression) &&
+        node.expression.name.text === COMPILER_ENTRYPOINT_REACTIVITY &&
+        node.arguments.length === 2 &&
+        isHtmlFromPackage(node.expression.expression, checker)) {
+        calls.push({
+            arrayArg: node.arguments[0],
+            callbackArg: node.arguments[1],
+            node
+        });
+    }
+    ts.forEachChild(node, child => visit(child, calls, checker));
+}
+const plugin = {
+    patterns: PATTERNS,
+    transform: (ctx) => {
+        let calls = [];
+        visit(ctx.sourceFile, calls, ctx.checker);
+        if (calls.length === 0) {
+            return {};
+        }
+        let arraySlotAlias = uid('ArraySlot'), replacements = [];
+        ctx.shared.set(SHARED_KEY, arraySlotAlias);
+        for (let i = 0, n = calls.length; i < n; i++) {
+            let call = calls[i];
+            replacements.push({
+                generate: (sourceFile) => `new ${arraySlotAlias}(${printer.printNode(ts.EmitHint.Expression, call.arrayArg, sourceFile)}, ${printer.printNode(ts.EmitHint.Expression, call.callbackArg, sourceFile)})`,
+                node: call.node
+            });
+        }
+        return {
+            imports: [{
+                    add: [`ArraySlot as ${arraySlotAlias}`],
+                    package: PACKAGE
+                }],
+            replacements
+        };
+    }
+};
+export default plugin;
+export { SHARED_KEY };

package/build/compiler/ts-parser.js

@@ -19,8 +19,8 @@ function isHtmlFromPackage(node, checker) {
         return true;
     }
     for (let i = 0, n = declarations.length; i < n; i++) {
-        let fileName = declarations[i].getSourceFile().fileName;
-        if (fileName.includes(PACKAGE) || fileName.includes('@esportsplus/template')) {
+        let filename = declarations[i].getSourceFile().fileName;
+        if (filename.includes(PACKAGE) || filename.includes('@esportsplus/template')) {
             return true;
         }
     }

package/package.json

@@ -2,14 +2,14 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/queue": "^0.2.0",
-    "@esportsplus/reactivity": "^0.27.0",
+    "@esportsplus/reactivity": "^0.28.0",
+    "@esportsplus/typescript": "^0.25.0",
     "@esportsplus/utilities": "^0.27.2",
     "serve": "^14.2.5"
   },
   "devDependencies": {
-    "@esportsplus/typescript": "^0.22.0",
     "@types/node": "^25.0.3",
-    "vite": "^7.3.0",
+    "vite": "^7.3.1",
     "vite-tsconfig-paths": "^6.0.3"
   },
   "exports": {
@@ -35,7 +35,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.35.1",
+  "version": "0.38.0",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",