@esportsplus/template 0.35.0 → 0.35.1

package/build/attributes.d.ts

@@ -1,6 +1,6 @@
 import { Attributes, Element } from './types.js';
-declare const setClass: (element: Element, classlist: false | string | undefined, value: unknown) => void;
+declare const setClass: (element: Element, classlist: false | string, value: unknown) => void;
 declare const setProperty: (element: Element, name: string, value: unknown) => void;
-declare const setProperties: (element: Element, value: Attributes | Attributes[]) => void;
-declare const setStyle: (element: Element, styles: false | string | undefined, value: unknown) => void;
+declare const setProperties: (element: Element, value?: Attributes | Attributes[] | false | null | undefined) => void;
+declare const setStyle: (element: Element, styles: false | string, value: unknown) => void;
 export { setClass, setProperty, setProperties, setStyle };

package/build/attributes.js

@@ -199,7 +199,10 @@ const setProperty = (element, name, value) => {
     }
 };
 const setProperties = function (element, value) {
-    if (isObject(value)) {
+    if (!value) {
+        return;
+    }
+    else if (isObject(value)) {
         for (let name in value) {
             let v = value[name];
             if (v == null || v === false || v === '') {

package/build/compiler/codegen.d.ts

@@ -4,8 +4,7 @@ type CodegenResult = {
     changed: boolean;
     code: string;
 };
-declare const generateCode: (templates: TemplateInfo[], originalCode: string, sourceFile: ts.SourceFile, checker?: ts.TypeChecker) => CodegenResult;
-declare const generateReactiveInlining: (calls: ReactiveCallInfo[], code: string, sourceFile: ts.SourceFile) => string;
-declare const needsArraySlotImport: (sourceFile: ts.SourceFile) => boolean;
-export { generateCode, generateReactiveInlining, needsArraySlotImport };
+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 };
 export type { CodegenResult };

package/build/compiler/codegen.js

@@ -5,6 +5,14 @@ import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } f
 import parser from './parser.js';
 const ARROW_EMPTY_PARAMS = /\(\s*\)\s*=>\s*$/;
 let printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
+function addImport(ctx, name) {
+    let alias = ctx.imports.get(name);
+    if (!alias) {
+        alias = uid(name);
+        ctx.imports.set(name, alias);
+    }
+    return alias;
+}
 function collectNestedTemplateReplacements(ctx, node, exprStart, replacements) {
     if (isNestedHtmlTemplate(node)) {
         replacements.push({
@@ -35,8 +43,7 @@ function generateNestedTemplateCode(ctx, node) {
 }
 function generateNodeBinding(ctx, anchor, exprText, exprNode) {
     if (!exprNode) {
-        ctx.neededImports.add('slot');
-        return `slot(${anchor}, ${exprText});`;
+        return `${addImport(ctx, 'slot')}(${anchor}, ${exprText});`;
     }
     if (isNestedHtmlTemplate(exprNode)) {
         return `${anchor}.parentNode.insertBefore(${generateNestedTemplateCode(ctx, exprNode)}, ${anchor});`;
@@ -44,18 +51,15 @@ function generateNodeBinding(ctx, anchor, exprText, exprNode) {
     let slotType = analyzeExpression(exprNode, ctx.checker);
     switch (slotType) {
         case COMPILER_TYPES.Effect:
-            ctx.neededImports.add('EffectSlot');
-            return `new EffectSlot(${anchor}, ${exprText});`;
+            return `new ${addImport(ctx, 'EffectSlot')}(${anchor}, ${exprText});`;
         case COMPILER_TYPES.ArraySlot:
-            ctx.neededImports.add('ArraySlot');
-            return `new ArraySlot(${anchor}, ${exprText});`;
+            return `new ${addImport(ctx, 'ArraySlot')}(${anchor}, ${exprText});`;
         case COMPILER_TYPES.Static:
             return `${anchor}.textContent = ${exprText};`;
         case COMPILER_TYPES.DocumentFragment:
             return `${anchor}.parentNode.insertBefore(${exprText}, ${anchor});`;
         default:
-            ctx.neededImports.add('slot');
-            return `slot(${anchor}, ${exprText});`;
+            return `${addImport(ctx, 'slot')}(${anchor}, ${exprText});`;
     }
 }
 function generateTemplateCode(ctx, { html, slots }, exprTexts, exprNodes, isArrowBody) {
@@ -74,23 +78,25 @@ function generateTemplateCode(ctx, { html, slots }, exprTexts, exprNodes, isArro
         if (nodes.has(key)) {
             continue;
         }
-        let ancestorVar = root, startIdx = 0;
+        let ancestor = root, start = 0;
         for (let j = path.length - 1; j >= 0; j--) {
             let prefix = path.slice(0, j).join('.');
             if (nodes.has(prefix)) {
-                ancestorVar = nodes.get(prefix);
-                startIdx = j;
+                ancestor = nodes.get(prefix);
+                start = j;
                 break;
             }
         }
-        let name = uid('element'), suffix = path.slice(startIdx).join('.');
-        ctx.neededImports.add('Element');
-        declarations.push(`${name} = ${ancestorVar}.${suffix} as Element`);
+        let alias = addImport(ctx, 'Element'), name = uid('element'), segments = path.slice(start), value = `${ancestor}.${segments.join('!.')}`;
+        if (ancestor === root && segments[0] === 'firstChild') {
+            value = value.replace(`${ancestor}.firstChild!`, `(${ancestor}.firstChild! as ${alias})`);
+        }
+        declarations.push(`${name} = ${value} as ${alias}`);
         nodes.set(key, name);
     }
     code.push(isArrowBody ? '{' : `(() => {`, `let ${declarations.join(',\n')};`);
     for (let i = 0, n = slots.length; i < n; i++) {
-        let elementVar = slots[i].path.length === 0
+        let element = slots[i].path.length === 0
             ? root
             : (nodes.get(slots[i].path.join('.')) || root), slot = slots[i];
         if (slot.type === COMPILER_TYPES.Attribute) {
@@ -98,19 +104,19 @@ 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(exprNodes[index], exprTexts[index] || 'undefined', elementVar, ctx.checker, ctx.neededImports);
+                    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]);
                     }
                     index++;
                 }
                 else {
-                    code.push(generateAttributeBinding(elementVar, name, exprTexts[index++] || 'undefined', slot.attributes.statics[name] || '', ctx.neededImports));
+                    code.push(generateAttributeBinding(element, name, exprTexts[index++] || 'undefined', slot.attributes.statics[name] || '', n => addImport(ctx, n)));
                 }
             }
         }
         else {
-            code.push(generateNodeBinding(ctx, elementVar, exprTexts[index] || 'undefined', exprNodes[index]));
+            code.push(generateNodeBinding(ctx, element, exprTexts[index] || 'undefined', exprNodes[index]));
             index++;
         }
     }
@@ -119,32 +125,13 @@ function generateTemplateCode(ctx, { html, slots }, exprTexts, exprNodes, isArro
     return code.join('\n');
 }
 function getOrCreateTemplateId(ctx, html) {
-    let id = ctx.htmlToTemplateId.get(html);
+    let id = ctx.templates.get(html);
     if (!id) {
-        id = uid('tmpl');
-        ctx.hoistedFactories.set(id, html);
-        ctx.htmlToTemplateId.set(html, id);
+        id = uid('template');
+        ctx.templates.set(html, id);
     }
     return id;
 }
-function hasArraySlotImport(sourceFile) {
-    for (let i = 0, n = sourceFile.statements.length; i < n; i++) {
-        let stmt = sourceFile.statements[i];
-        if (!ts.isImportDeclaration(stmt) || !stmt.importClause?.namedBindings) {
-            continue;
-        }
-        let bindings = stmt.importClause.namedBindings;
-        if (!ts.isNamedImports(bindings)) {
-            continue;
-        }
-        for (let j = 0, m = bindings.elements.length; j < m; j++) {
-            if (bindings.elements[j].name.text === 'ArraySlot') {
-                return true;
-            }
-        }
-    }
-    return false;
-}
 function isNestedHtmlTemplate(expr) {
     return ts.isTaggedTemplateExpression(expr) && ts.isIdentifier(expr.tag) && expr.tag.text === COMPILER_ENTRYPOINT;
 }
@@ -159,7 +146,7 @@ function rewriteExpression(ctx, expr) {
     collectNestedTemplateReplacements(ctx, expr, expr.getStart(), replacements);
     return c.replaceReverse(expr.getText(ctx.sourceFile), replacements);
 }
-const generateCode = (templates, originalCode, sourceFile, checker) => {
+const generateCode = (templates, originalCode, sourceFile, checker, existingAliases) => {
     if (templates.length === 0) {
         return { changed: false, code: originalCode };
     }
@@ -176,12 +163,11 @@ const generateCode = (templates, originalCode, sourceFile, checker) => {
     }
     let ctx = {
         checker,
-        hoistedFactories: new Map(),
-        htmlToTemplateId: new Map(),
-        neededImports: new Set(['template']),
+        templates: new Map(),
+        imports: existingAliases ?? new Map(),
         printer,
         sourceFile
-    }, replacements = [];
+    }, replacements = [], 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++) {
@@ -206,19 +192,23 @@ const generateCode = (templates, originalCode, sourceFile, checker) => {
         });
     }
     let changed = replacements.length > 0, code = c.replaceReverse(originalCode, replacements);
-    if (changed && ctx.hoistedFactories.size > 0) {
-        let factories = [];
-        for (let [id, html] of ctx.hoistedFactories) {
-            factories.push(`const ${id} = template(\`${html}\`);`);
+    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(factories.join('\n') + code, sourceFile, PACKAGE, {
-            add: ctx.neededImports,
+        code = imports.modify(code, sourceFile, PACKAGE, {
+            add: new Set(aliasedImports),
             remove: [COMPILER_ENTRYPOINT]
         });
+        code = factories.join('\n') + '\n\n' + code;
     }
     return { changed, code };
 };
-const generateReactiveInlining = (calls, code, sourceFile) => {
+const generateReactiveInlining = (calls, code, sourceFile, arraySlotAlias) => {
     if (calls.length === 0) {
         return code;
     }
@@ -227,7 +217,7 @@ const generateReactiveInlining = (calls, code, sourceFile) => {
         let call = calls[i];
         replacements.push({
             end: call.end,
-            newText: `new ArraySlot(
+            newText: `new ${arraySlotAlias}(
                 ${printer.printNode(ts.EmitHint.Expression, call.arrayArg, sourceFile)},
                 ${printer.printNode(ts.EmitHint.Expression, call.callbackArg, sourceFile)}
             )`,
@@ -236,9 +226,4 @@ const generateReactiveInlining = (calls, code, sourceFile) => {
     }
     return c.replaceReverse(code, replacements);
 };
-const needsArraySlotImport = (sourceFile) => {
-    return ast.hasMatch(sourceFile, n => ts.isNewExpression(n) &&
-        ts.isIdentifier(n.expression) &&
-        n.expression.text === 'ArraySlot') && !hasArraySlotImport(sourceFile);
-};
-export { generateCode, generateReactiveInlining, needsArraySlotImport };
+export { generateCode, generateReactiveInlining };

package/build/compiler/index.js

@@ -1,7 +1,7 @@
 import { ts } from '@esportsplus/typescript';
-import { code as c, imports } from '@esportsplus/typescript/compiler';
+import { code as c, imports, uid } from '@esportsplus/typescript/compiler';
 import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, PACKAGE } from '../constants.js';
-import { generateCode, generateReactiveInlining, needsArraySlotImport } from './codegen.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;
@@ -18,24 +18,29 @@ const transform = (sourceFile, program) => {
         checker = program.getTypeChecker();
         sourceFile = programSourceFile;
     }
-    let changed = false, codegenChanged = false, needsImport = false, reactiveCalls = findReactiveCalls(sourceFile, checker), result = code;
+    let changed = false, codegenChanged = false, existingAliases = new Map(), reactiveCalls = findReactiveCalls(sourceFile, checker), result = code;
     if (reactiveCalls.length > 0) {
+        let arraySlotAlias = uid('ArraySlot');
         changed = true;
-        result = generateReactiveInlining(reactiveCalls, result, sourceFile);
+        existingAliases.set('ArraySlot', arraySlotAlias);
+        result = generateReactiveInlining(reactiveCalls, result, sourceFile, arraySlotAlias);
         sourceFile = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
-        needsImport = needsArraySlotImport(sourceFile);
     }
     let templates = findHtmlTemplates(sourceFile, checker);
     if (templates.length > 0) {
-        let codegenResult = generateCode(templates, result, sourceFile, checker);
+        let codegenResult = generateCode(templates, result, sourceFile, checker, existingAliases);
         if (codegenResult.changed) {
             changed = true;
             codegenChanged = true;
             result = codegenResult.code;
         }
     }
-    if (needsImport && !codegenChanged) {
-        result = imports.modify(result, sourceFile, PACKAGE, { add: ['ArraySlot'] });
+    if (existingAliases.size > 0 && !codegenChanged) {
+        let aliasedImports = [];
+        for (let [name, alias] of existingAliases) {
+            aliasedImports.push(`${name} as ${alias}`);
+        }
+        result = imports.modify(result, sourceFile, PACKAGE, { add: aliasedImports });
     }
     if (changed) {
         sourceFile = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);

package/build/compiler/type-analyzer.d.ts

@@ -1,6 +1,6 @@
 import { COMPILER_TYPES } from '../constants.js';
 import { ts } from '@esportsplus/typescript';
 declare const analyzeExpression: (expr: ts.Expression, checker?: ts.TypeChecker) => COMPILER_TYPES;
-declare const generateAttributeBinding: (elementVar: string, name: string, expr: string, staticValue: string, neededImports: Set<string>) => string;
-declare const generateSpreadBindings: (expr: ts.Expression, exprCode: string, elementVar: string, checker: ts.TypeChecker | undefined, neededImports: Set<string>) => string[];
+declare const generateAttributeBinding: (elementVar: string, name: string, expr: string, staticValue: string, addImport: (name: string) => string) => string;
+declare const generateSpreadBindings: (exprCode: string, elementVar: string, addImport: (name: string) => string) => string[];
 export { analyzeExpression, generateAttributeBinding, generateSpreadBindings };

package/build/compiler/type-analyzer.js

@@ -1,45 +1,5 @@
 import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, COMPILER_TYPES, DIRECT_ATTACH_EVENTS, LIFECYCLE_EVENTS } from '../constants.js';
 import { ts } from '@esportsplus/typescript';
-function analyzeSpread(expr, checker) {
-    while (ts.isParenthesizedExpression(expr)) {
-        expr = expr.expression;
-    }
-    if (ts.isObjectLiteralExpression(expr)) {
-        let keys = [];
-        for (let i = 0, n = expr.properties.length; i < n; i++) {
-            let prop = expr.properties[i];
-            if (ts.isPropertyAssignment(prop)) {
-                if (ts.isIdentifier(prop.name) || ts.isStringLiteral(prop.name)) {
-                    keys.push(prop.name.text);
-                }
-            }
-            else if (ts.isShorthandPropertyAssignment(prop)) {
-                keys.push(prop.name.text);
-            }
-            else if (ts.isSpreadAssignment(prop)) {
-                return { canUnpack: false, keys: [] };
-            }
-        }
-        return { canUnpack: true, keys };
-    }
-    if (checker && (ts.isIdentifier(expr) || ts.isPropertyAccessExpression(expr))) {
-        try {
-            let keys = [], props = checker.getTypeAtLocation(expr).getProperties();
-            for (let i = 0, n = props.length; i < n; i++) {
-                let name = props[i].getName();
-                if (name.startsWith('__') || name.startsWith('[')) {
-                    continue;
-                }
-                keys.push(name);
-            }
-            if (keys.length > 0) {
-                return { canUnpack: true, keys };
-            }
-        }
-        catch { }
-    }
-    return { canUnpack: false, keys: [] };
-}
 function inferCOMPILER_TYPES(expr, checker) {
     while (ts.isParenthesizedExpression(expr)) {
         expr = expr.expression;
@@ -57,9 +17,6 @@ function inferCOMPILER_TYPES(expr, checker) {
     if (ts.isTaggedTemplateExpression(expr) && ts.isIdentifier(expr.tag) && expr.tag.text === COMPILER_ENTRYPOINT) {
         return COMPILER_TYPES.DocumentFragment;
     }
-    if (ts.isArrayLiteralExpression(expr)) {
-        return COMPILER_TYPES.ArraySlot;
-    }
     if (ts.isNumericLiteral(expr) ||
         ts.isStringLiteral(expr) ||
         ts.isNoSubstitutionTemplateLiteral(expr) ||
@@ -88,106 +45,53 @@ function inferCOMPILER_TYPES(expr, checker) {
             if (isTypeFunction(type, checker)) {
                 return COMPILER_TYPES.Effect;
             }
-            if (isTypeArray(type, checker)) {
-                return COMPILER_TYPES.ArraySlot;
-            }
         }
         catch {
         }
     }
     return COMPILER_TYPES.Unknown;
 }
-function isTypeArray(type, checker) {
-    if (checker.isArrayType(type)) {
-        return true;
-    }
-    return type.getSymbol()?.getName() === 'ReactiveArray';
-}
 function isTypeFunction(type, checker) {
-    if (type.getCallSignatures().length > 0) {
-        return true;
-    }
     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)) {
-                return true;
+                hasFunction = true;
+            }
+            else {
+                allFunctions = false;
             }
         }
+        return hasFunction && allFunctions;
     }
-    return false;
+    return type.getCallSignatures().length > 0;
 }
 const analyzeExpression = (expr, checker) => {
     return inferCOMPILER_TYPES(expr, checker);
 };
-const generateAttributeBinding = (elementVar, name, expr, staticValue, neededImports) => {
+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)) {
-            neededImports.add(key);
-            return `${key}(${elementVar}, ${expr});`;
+            return `${addImport(key)}(${elementVar}, ${expr});`;
         }
         if (DIRECT_ATTACH_EVENTS.has(key)) {
-            neededImports.add('on');
-            return `on(${elementVar}, '${event}', ${expr});`;
+            return `${addImport('on')}(${elementVar}, '${event}', ${expr});`;
         }
-        neededImports.add('delegate');
-        return `delegate(${elementVar}, '${event}', ${expr});`;
+        return `${addImport('delegate')}(${elementVar}, '${event}', ${expr});`;
     }
     if (name === 'class') {
-        neededImports.add('setClass');
-        return `setClass(${elementVar}, '${staticValue}', ${expr});`;
+        return `${addImport('setClass')}(${elementVar}, '${staticValue}', ${expr});`;
     }
     if (name === COMPILER_TYPES.Attributes) {
-        neededImports.add('setProperties');
-        return `setProperties(${elementVar}, ${expr});`;
+        return `${addImport('setProperties')}(${elementVar}, ${expr});`;
     }
     if (name === 'style') {
-        neededImports.add('setStyle');
-        return `setStyle(${elementVar}, '${staticValue}', ${expr});`;
+        return `${addImport('setStyle')}(${elementVar}, '${staticValue}', ${expr});`;
     }
-    neededImports.add('setProperty');
-    return `setProperty(${elementVar}, '${name}', ${expr});`;
+    return `${addImport('setProperty')}(${elementVar}, '${name}', ${expr});`;
 };
-const generateSpreadBindings = (expr, exprCode, elementVar, checker, neededImports) => {
-    while (ts.isParenthesizedExpression(expr)) {
-        expr = expr.expression;
-    }
-    let analysis = analyzeSpread(expr, checker);
-    if (!analysis.canUnpack) {
-        neededImports.add('setProperties');
-        return [`setProperties(${elementVar}, ${exprCode});`];
-    }
-    let lines = [];
-    if (ts.isObjectLiteralExpression(expr)) {
-        for (let i = 0, n = analysis.keys.length; i < n; i++) {
-            let key = analysis.keys[i], value = null;
-            for (let j = 0, m = expr.properties.length; j < m; j++) {
-                let prop = expr.properties[j];
-                if (ts.isPropertyAssignment(prop)) {
-                    let text = ts.isIdentifier(prop.name)
-                        ? prop.name.text
-                        : ts.isStringLiteral(prop.name) ? prop.name.text : null;
-                    if (text === key) {
-                        value = prop.initializer.getText();
-                        break;
-                    }
-                }
-                else if (ts.isShorthandPropertyAssignment(prop) && prop.name.text === key) {
-                    value = prop.name.text;
-                    break;
-                }
-            }
-            if (value !== null) {
-                lines.push(generateAttributeBinding(elementVar, key, value, '', neededImports));
-            }
-        }
-    }
-    else {
-        for (let i = 0, n = analysis.keys.length; i < n; i++) {
-            let key = analysis.keys[i];
-            lines.push(generateAttributeBinding(elementVar, key, `${exprCode}.${key}`, '', neededImports));
-        }
-    }
-    return lines;
+const generateSpreadBindings = (exprCode, elementVar, addImport) => {
+    return [`${addImport('setProperties')}(${elementVar}, ${exprCode});`];
 };
 export { analyzeExpression, generateAttributeBinding, generateSpreadBindings };

package/package.json

@@ -35,7 +35,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.35.0",
+  "version": "0.35.1",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/attributes.ts

@@ -61,7 +61,7 @@ function list(
         changed = false,
         delimiter = delimiters[name],
         store = (ctx ??= context(element)).store ??= {},
-        dynamic = store[name] as Set<string> | undefined;
+        dynamic = store[name] as Set<string>;
 
     if (dynamic === undefined) {
         let value = (element.getAttribute(name) || '').trim();
@@ -105,7 +105,7 @@ function list(
             }
         }
 
-        let cold = store[id] as Record<PropertyKey, true> | undefined;
+        let cold = store[id] as Record<PropertyKey, true>;
 
         if (cold !== undefined) {
             for (let part in cold) {
@@ -274,7 +274,7 @@ function task() {
 }
 
 
-const setClass = (element: Element, classlist: false | string | undefined, value: unknown) => {
+const setClass = (element: Element, classlist: false | string, value: unknown) => {
     let ctx = context(element),
         store = ctx.store ??= {};
 
@@ -298,8 +298,11 @@ const setProperty = (element: Element, name: string, value: unknown) => {
     }
 };
 
-const setProperties = function (element: Element, value: Attributes | Attributes[]) {
-    if (isObject(value)) {
+const setProperties = function (element: Element, value?: Attributes | Attributes[] | false | null | undefined) {
+    if (!value) {
+        return;
+    }
+    else if (isObject(value)) {
         for (let name in value) {
             let v = value[name];
 
@@ -317,7 +320,7 @@ const setProperties = function (element: Element, value: Attributes | Attributes
     }
 };
 
-const setStyle = (element: Element, styles: false | string | undefined, value: unknown) => {
+const setStyle = (element: Element, styles: false | string, value: unknown) => {
     let ctx = context(element),
         store = ctx.store ??= {};
 

package/src/compiler/codegen.ts

@@ -17,11 +17,10 @@ type Attribute = {
 
 type CodegenContext = {
     checker?: ts.TypeChecker;
-    hoistedFactories: Map<string, string>;
-    htmlToTemplateId: Map<string, string>;
-    neededImports: Set<string>;
+    imports: Map<string, string>;
     printer: ts.Printer;
     sourceFile: ts.SourceFile;
+    templates: Map<string, string>;
 };
 
 type CodegenResult = {
@@ -46,6 +45,17 @@ const ARROW_EMPTY_PARAMS = /\(\s*\)\s*=>\s*$/;
 let printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
 
 
+function addImport(ctx: CodegenContext, name: string): string {
+    let alias = ctx.imports.get(name);
+
+    if (!alias) {
+        alias = uid(name);
+        ctx.imports.set(name, alias);
+    }
+
+    return alias;
+}
+
 function collectNestedTemplateReplacements(
     ctx: CodegenContext,
     node: ts.Node,
@@ -96,8 +106,7 @@ function generateNestedTemplateCode(ctx: CodegenContext, node: ts.TaggedTemplate
 
 function generateNodeBinding(ctx: CodegenContext, anchor: string, exprText: string, exprNode: ts.Expression | undefined): string {
     if (!exprNode) {
-        ctx.neededImports.add('slot');
-        return `slot(${anchor}, ${exprText});`;
+        return `${addImport(ctx, 'slot')}(${anchor}, ${exprText});`;
     }
 
     if (isNestedHtmlTemplate(exprNode)) {
@@ -108,12 +117,10 @@ function generateNodeBinding(ctx: CodegenContext, anchor: string, exprText: stri
 
     switch (slotType) {
         case COMPILER_TYPES.Effect:
-            ctx.neededImports.add('EffectSlot');
-            return `new EffectSlot(${anchor}, ${exprText});`;
+            return `new ${addImport(ctx, 'EffectSlot')}(${anchor}, ${exprText});`;
 
         case COMPILER_TYPES.ArraySlot:
-            ctx.neededImports.add('ArraySlot');
-            return `new ArraySlot(${anchor}, ${exprText});`;
+            return `new ${addImport(ctx, 'ArraySlot')}(${anchor}, ${exprText});`;
 
         case COMPILER_TYPES.Static:
             return `${anchor}.textContent = ${exprText};`;
@@ -122,8 +129,7 @@ function generateNodeBinding(ctx: CodegenContext, anchor: string, exprText: stri
             return `${anchor}.parentNode.insertBefore(${exprText}, ${anchor});`;
 
         default:
-            ctx.neededImports.add('slot');
-            return `slot(${anchor}, ${exprText});`;
+            return `${addImport(ctx, 'slot')}(${anchor}, ${exprText});`;
     }
 }
 
@@ -160,24 +166,30 @@ function generateTemplateCode(
             continue;
         }
 
-        let ancestorVar = root,
-            startIdx = 0;
+        let ancestor = root,
+            start = 0;
 
         for (let j = path.length - 1; j >= 0; j--) {
             let prefix = path.slice(0, j).join('.');
 
             if (nodes.has(prefix)) {
-                ancestorVar = nodes.get(prefix)!;
-                startIdx = j;
+                ancestor = nodes.get(prefix)!;
+                start = j;
                 break;
             }
         }
 
-        let name = uid('element'),
-            suffix = path.slice(startIdx).join('.');
+        let alias = addImport(ctx, 'Element'),
+            name = uid('element'),
+            segments = path.slice(start),
+            value = `${ancestor}.${segments.join('!.')}`;
+
+        // Cast root.firstChild to Element since DocumentFragment.firstChild returns ChildNode
+        if (ancestor === root && segments[0] === 'firstChild') {
+            value = value.replace(`${ancestor}.firstChild!`, `(${ancestor}.firstChild! as ${alias})`);
+        }
 
-        ctx.neededImports.add('Element');
-        declarations.push(`${name} = ${ancestorVar}.${suffix} as Element`);
+        declarations.push(`${name} = ${value} as ${alias}`);
         nodes.set(key, name);
     }
 
@@ -187,7 +199,7 @@ function generateTemplateCode(
     );
 
     for (let i = 0, n = slots.length; i < n; i++) {
-        let elementVar = slots[i].path.length === 0
+        let element = slots[i].path.length === 0
                 ? root
                 : (nodes.get(slots[i].path.join('.')) || root),
             slot = slots[i];
@@ -200,11 +212,9 @@ function generateTemplateCode(
 
                 if (name === COMPILER_TYPES.Attributes) {
                     let bindings = generateSpreadBindings(
-                            exprNodes[index],
                             exprTexts[index] || 'undefined',
-                            elementVar,
-                            ctx.checker,
-                            ctx.neededImports
+                            element,
+                            n => addImport(ctx, n)
                         );
 
                     for (let k = 0, o = bindings.length; k < o; k++) {
@@ -216,11 +226,11 @@ function generateTemplateCode(
                 else {
                     code.push(
                         generateAttributeBinding(
-                            elementVar,
+                            element,
                             name,
                             exprTexts[index++] || 'undefined',
                             slot.attributes.statics[name] || '',
-                            ctx.neededImports
+                            n => addImport(ctx, n)
                         )
                     );
                 }
@@ -228,7 +238,7 @@ function generateTemplateCode(
         }
         else {
             code.push(
-                generateNodeBinding(ctx, elementVar, exprTexts[index] || 'undefined', exprNodes[index])
+                generateNodeBinding(ctx, element, exprTexts[index] || 'undefined', exprNodes[index])
             );
             index++;
         }
@@ -241,41 +251,16 @@ function generateTemplateCode(
 }
 
 function getOrCreateTemplateId(ctx: CodegenContext, html: string): string {
-    let id = ctx.htmlToTemplateId.get(html);
+    let id = ctx.templates.get(html);
 
     if (!id) {
-        id = uid('tmpl');
-        ctx.hoistedFactories.set(id, html);
-        ctx.htmlToTemplateId.set(html, id);
+        id = uid('template');
+        ctx.templates.set(html, id);
     }
 
     return id;
 }
 
-function hasArraySlotImport(sourceFile: ts.SourceFile): boolean {
-    for (let i = 0, n = sourceFile.statements.length; i < n; i++) {
-        let stmt = sourceFile.statements[i];
-
-        if (!ts.isImportDeclaration(stmt) || !stmt.importClause?.namedBindings) {
-            continue;
-        }
-
-        let bindings = stmt.importClause.namedBindings;
-
-        if (!ts.isNamedImports(bindings)) {
-            continue;
-        }
-
-        for (let j = 0, m = bindings.elements.length; j < m; j++) {
-            if (bindings.elements[j].name.text === 'ArraySlot') {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
 function isNestedHtmlTemplate(expr: ts.Expression): expr is ts.TaggedTemplateExpression {
     return ts.isTaggedTemplateExpression(expr) && ts.isIdentifier(expr.tag) && expr.tag.text === COMPILER_ENTRYPOINT;
 }
@@ -297,7 +282,7 @@ function rewriteExpression(ctx: CodegenContext, expr: ts.Expression): string {
 }
 
 
-const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFile: ts.SourceFile, checker?: ts.TypeChecker): CodegenResult => {
+const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFile: ts.SourceFile, checker?: ts.TypeChecker, existingAliases?: Map<string, string>): CodegenResult => {
     if (templates.length === 0) {
         return { changed: false, code: originalCode };
     }
@@ -321,13 +306,13 @@ const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFil
 
     let ctx: CodegenContext = {
             checker,
-            hoistedFactories: new Map(),
-            htmlToTemplateId: new Map(),
-            neededImports: new Set(['template']),
+            templates: new Map(),
+            imports: existingAliases ?? new Map(),
             printer,
             sourceFile
         },
-        replacements: Replacement[] = [];
+        replacements: Replacement[] = [],
+        templateAlias = addImport(ctx, 'template');
 
     for (let i = 0, n = rootTemplates.length; i < n; i++) {
         let exprTexts: string[] = [],
@@ -371,23 +356,30 @@ const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFil
     let changed = replacements.length > 0,
         code = c.replaceReverse(originalCode, replacements);
 
-    if (changed && ctx.hoistedFactories.size > 0) {
-        let factories: string[] = [];
+    if (changed && ctx.templates.size > 0) {
+        let aliasedImports: string[] = [],
+            factories: string[] = [];
+
+        for (let [name, alias] of ctx.imports) {
+            aliasedImports.push(`${name} as ${alias}`);
+        }
 
-        for (let [id, html] of ctx.hoistedFactories) {
-            factories.push(`const ${id} = template(\`${html}\`);`);
+        for (let [html, id] of ctx.templates) {
+            factories.push(`const ${id} = ${templateAlias}(\`${html}\`);`);
         }
 
-        code = imports.modify(factories.join('\n') + code, sourceFile, PACKAGE, {
-            add: ctx.neededImports,
+        // Remove html entrypoint and add aliased imports
+        code = imports.modify(code, sourceFile, PACKAGE, {
+            add: new Set(aliasedImports),
             remove: [COMPILER_ENTRYPOINT]
         });
+        code = factories.join('\n') + '\n\n' + code;
     }
 
     return { changed, code };
 };
 
-const generateReactiveInlining = (calls: ReactiveCallInfo[], code: string, sourceFile: ts.SourceFile): string => {
+const generateReactiveInlining = (calls: ReactiveCallInfo[], code: string, sourceFile: ts.SourceFile, arraySlotAlias: string): string => {
     if (calls.length === 0) {
         return code;
     }
@@ -399,7 +391,7 @@ const generateReactiveInlining = (calls: ReactiveCallInfo[], code: string, sourc
 
         replacements.push({
             end: call.end,
-            newText: `new ArraySlot(
+            newText: `new ${arraySlotAlias}(
                 ${printer.printNode(ts.EmitHint.Expression, call.arrayArg, sourceFile)},
                 ${printer.printNode(ts.EmitHint.Expression, call.callbackArg, sourceFile)}
             )`,
@@ -410,14 +402,5 @@ const generateReactiveInlining = (calls: ReactiveCallInfo[], code: string, sourc
     return c.replaceReverse(code, replacements);
 };
 
-const needsArraySlotImport = (sourceFile: ts.SourceFile): boolean => {
-    return ast.hasMatch(sourceFile, n =>
-        ts.isNewExpression(n) &&
-        ts.isIdentifier(n.expression) &&
-        n.expression.text === 'ArraySlot'
-    ) && !hasArraySlotImport(sourceFile);
-};
-
-
-export { generateCode, generateReactiveInlining, needsArraySlotImport };
+export { generateCode, generateReactiveInlining };
 export type { CodegenResult };

package/src/compiler/index.ts

@@ -1,7 +1,7 @@
 import { ts } from '@esportsplus/typescript';
-import { code as c, imports } from '@esportsplus/typescript/compiler';
+import { code as c, imports, uid } from '@esportsplus/typescript/compiler';
 import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REACTIVITY, PACKAGE } from '~/constants';
-import { generateCode, generateReactiveInlining, needsArraySlotImport } from './codegen';
+import { generateCode, generateReactiveInlining } from './codegen';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser';
 
 
@@ -39,21 +39,23 @@ const transform = (sourceFile: ts.SourceFile, program: ts.Program): TransformRes
 
     let changed = false,
         codegenChanged = false,
-        needsImport = false,
+        existingAliases = new Map<string, string>(),
         reactiveCalls = findReactiveCalls(sourceFile, checker),
         result = code;
 
     if (reactiveCalls.length > 0) {
+        let arraySlotAlias = uid('ArraySlot');
+
         changed = true;
-        result = generateReactiveInlining(reactiveCalls, result, sourceFile);
+        existingAliases.set('ArraySlot', arraySlotAlias);
+        result = generateReactiveInlining(reactiveCalls, result, sourceFile, arraySlotAlias);
         sourceFile = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
-        needsImport = needsArraySlotImport(sourceFile);
     }
 
     let templates = findHtmlTemplates(sourceFile, checker);
 
     if (templates.length > 0) {
-        let codegenResult = generateCode(templates, result, sourceFile, checker);
+        let codegenResult = generateCode(templates, result, sourceFile, checker, existingAliases);
 
         if (codegenResult.changed) {
             changed = true;
@@ -62,8 +64,15 @@ const transform = (sourceFile: ts.SourceFile, program: ts.Program): TransformRes
         }
     }
 
-    if (needsImport && !codegenChanged) {
-        result = imports.modify(result, sourceFile, PACKAGE, { add: ['ArraySlot'] });
+    // Add aliased ArraySlot import if reactive calls were processed but codegen didn't run
+    if (existingAliases.size > 0 && !codegenChanged) {
+        let aliasedImports: string[] = [];
+
+        for (let [name, alias] of existingAliases) {
+            aliasedImports.push(`${name} as ${alias}`);
+        }
+
+        result = imports.modify(result, sourceFile, PACKAGE, { add: aliasedImports });
     }
 
     if (changed) {

package/src/compiler/type-analyzer.ts

@@ -8,64 +8,6 @@ import {
 import { ts } from '@esportsplus/typescript';
 
 
-type SpreadAnalysis = {
-    canUnpack: boolean;
-    keys: string[];
-};
-
-
-function analyzeSpread(expr: ts.Expression, checker?: ts.TypeChecker): SpreadAnalysis {
-    while (ts.isParenthesizedExpression(expr)) {
-        expr = expr.expression;
-    }
-
-    if (ts.isObjectLiteralExpression(expr)) {
-        let keys: string[] = [];
-
-        for (let i = 0, n = expr.properties.length; i < n; i++) {
-            let prop = expr.properties[i];
-
-            if (ts.isPropertyAssignment(prop)) {
-                if (ts.isIdentifier(prop.name) || ts.isStringLiteral(prop.name)) {
-                    keys.push(prop.name.text);
-                }
-            }
-            else if (ts.isShorthandPropertyAssignment(prop)) {
-                keys.push(prop.name.text);
-            }
-            else if (ts.isSpreadAssignment(prop)) {
-                return { canUnpack: false, keys: [] };
-            }
-        }
-
-        return { canUnpack: true, keys };
-    }
-
-    if (checker && (ts.isIdentifier(expr) || ts.isPropertyAccessExpression(expr))) {
-        try {
-            let keys: string[] = [],
-                props = checker.getTypeAtLocation(expr).getProperties();
-
-            for (let i = 0, n = props.length; i < n; i++) {
-                let name = props[i].getName();
-
-                if (name.startsWith('__') || name.startsWith('[')) {
-                    continue;
-                }
-
-                keys.push(name);
-            }
-
-            if (keys.length > 0) {
-                return { canUnpack: true, keys };
-            }
-        }
-        catch { }
-    }
-
-    return { canUnpack: false, keys: [] };
-}
-
 function inferCOMPILER_TYPES(expr: ts.Expression, checker?: ts.TypeChecker): COMPILER_TYPES {
     while (ts.isParenthesizedExpression(expr)) {
         expr = expr.expression;
@@ -75,6 +17,7 @@ function inferCOMPILER_TYPES(expr: ts.Expression, checker?: ts.TypeChecker): COM
         return COMPILER_TYPES.Effect;
     }
 
+    // Only html.reactive() calls become ArraySlot - handled by generateReactiveInlining
     if (
         ts.isCallExpression(expr) &&
         ts.isPropertyAccessExpression(expr.expression) &&
@@ -89,10 +32,6 @@ function inferCOMPILER_TYPES(expr: ts.Expression, checker?: ts.TypeChecker): COM
         return COMPILER_TYPES.DocumentFragment;
     }
 
-    if (ts.isArrayLiteralExpression(expr)) {
-        return COMPILER_TYPES.ArraySlot;
-    }
-
     if (
         ts.isNumericLiteral(expr) ||
         ts.isStringLiteral(expr) ||
@@ -131,10 +70,6 @@ function inferCOMPILER_TYPES(expr: ts.Expression, checker?: ts.TypeChecker): COM
             if (isTypeFunction(type, checker)) {
                 return COMPILER_TYPES.Effect;
             }
-
-            if (isTypeArray(type, checker)) {
-                return COMPILER_TYPES.ArraySlot;
-            }
         }
         catch {
         }
@@ -143,28 +78,26 @@ function inferCOMPILER_TYPES(expr: ts.Expression, checker?: ts.TypeChecker): COM
     return COMPILER_TYPES.Unknown;
 }
 
-function isTypeArray(type: ts.Type, checker: ts.TypeChecker): boolean {
-    if (checker.isArrayType(type)) {
-        return true;
-    }
-
-    return type.getSymbol()?.getName() === 'ReactiveArray';
-}
-
 function isTypeFunction(type: ts.Type, checker: ts.TypeChecker): boolean {
-    if (type.getCallSignatures().length > 0) {
-        return true;
-    }
-
+    // Union types that mix functions with non-functions (e.g., Renderable)
+    // should fall through to runtime slot dispatch
     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)) {
-                return true;
+                hasFunction = true;
+            }
+            else {
+                allFunctions = false;
             }
         }
+
+        return hasFunction && allFunctions;
     }
 
-    return false;
+    return type.getCallSignatures().length > 0;
 }
 
 
@@ -172,102 +105,43 @@ const analyzeExpression = (expr: ts.Expression, checker?: ts.TypeChecker): COMPI
     return inferCOMPILER_TYPES(expr, checker);
 };
 
-const generateAttributeBinding = (elementVar: string, name: string, expr: string, staticValue: string, neededImports: Set<string>): string => {
+const generateAttributeBinding = (elementVar: string, name: string, expr: string, staticValue: string, addImport: (name: string) => string): string => {
     if (name.startsWith('on') && name.length > 2) {
         let event = name.slice(2).toLowerCase(),
             key = name.toLowerCase();
 
         if (LIFECYCLE_EVENTS.has(key)) {
-            neededImports.add(key);
-            return `${key}(${elementVar}, ${expr});`;
+            return `${addImport(key)}(${elementVar}, ${expr});`;
         }
 
         if (DIRECT_ATTACH_EVENTS.has(key)) {
-            neededImports.add('on');
-            return `on(${elementVar}, '${event}', ${expr});`;
+            return `${addImport('on')}(${elementVar}, '${event}', ${expr});`;
         }
 
-        neededImports.add('delegate');
-        return `delegate(${elementVar}, '${event}', ${expr});`;
+        return `${addImport('delegate')}(${elementVar}, '${event}', ${expr});`;
     }
 
     if (name === 'class') {
-        neededImports.add('setClass');
-        return `setClass(${elementVar}, '${staticValue}', ${expr});`;
+        return `${addImport('setClass')}(${elementVar}, '${staticValue}', ${expr});`;
     }
 
     if (name === COMPILER_TYPES.Attributes) {
-        neededImports.add('setProperties');
-        return `setProperties(${elementVar}, ${expr});`;
+        return `${addImport('setProperties')}(${elementVar}, ${expr});`;
     }
 
     if (name === 'style') {
-        neededImports.add('setStyle');
-        return `setStyle(${elementVar}, '${staticValue}', ${expr});`;
+        return `${addImport('setStyle')}(${elementVar}, '${staticValue}', ${expr});`;
     }
 
-    neededImports.add('setProperty');
-    return `setProperty(${elementVar}, '${name}', ${expr});`;
+    return `${addImport('setProperty')}(${elementVar}, '${name}', ${expr});`;
 };
 
 const generateSpreadBindings = (
-    expr: ts.Expression,
     exprCode: string,
     elementVar: string,
-    checker: ts.TypeChecker | undefined,
-    neededImports: Set<string>
+    addImport: (name: string) => string
 ): string[] => {
-    while (ts.isParenthesizedExpression(expr)) {
-        expr = expr.expression;
-    }
-
-    let analysis = analyzeSpread(expr, checker);
-
-    if (!analysis.canUnpack) {
-        neededImports.add('setProperties');
-        return [`setProperties(${elementVar}, ${exprCode});`];
-    }
-
-    let lines: string[] = [];
-
-    if (ts.isObjectLiteralExpression(expr)) {
-        for (let i = 0, n = analysis.keys.length; i < n; i++) {
-            let key = analysis.keys[i],
-                value: string | null = null;
-
-            for (let j = 0, m = expr.properties.length; j < m; j++) {
-                let prop = expr.properties[j];
-
-                if (ts.isPropertyAssignment(prop)) {
-                    let text = ts.isIdentifier(prop.name)
-                            ? prop.name.text
-                            : ts.isStringLiteral(prop.name) ? prop.name.text : null;
-
-                    if (text === key) {
-                        value = prop.initializer.getText();
-                        break;
-                    }
-                }
-                else if (ts.isShorthandPropertyAssignment(prop) && prop.name.text === key) {
-                    value = prop.name.text;
-                    break;
-                }
-            }
-
-            if (value !== null) {
-                lines.push(generateAttributeBinding(elementVar, key, value, '', neededImports));
-            }
-        }
-    }
-    else {
-        for (let i = 0, n = analysis.keys.length; i < n; i++) {
-            let key = analysis.keys[i];
-
-            lines.push(generateAttributeBinding(elementVar, key, `${exprCode}.${key}`, '', neededImports));
-        }
-    }
-
-    return lines;
+    return [`${addImport('setProperties')}(${elementVar}, ${exprCode});`];
 };