@esportsplus/template 0.31.3 → 0.31.5

package/build/transformer/codegen.d.ts

@@ -12,7 +12,8 @@ declare const getNames: () => {
     event: string;
     slot: string;
 };
+declare const initNamespace: () => void;
 declare const needsArraySlotImport: (sourceFile: ts.SourceFile) => boolean;
 declare const setTypeChecker: (checker: ts.TypeChecker | undefined) => void;
-export { addArraySlotImport, generateCode, generateReactiveInlining, getNames, needsArraySlotImport, setTypeChecker };
+export { addArraySlotImport, generateCode, generateReactiveInlining, getNames, initNamespace, needsArraySlotImport, setTypeChecker };
 export type { CodegenResult };

package/build/transformer/codegen.js

@@ -1,8 +1,9 @@
-import { addImport, applyReplacementsReverse, uid } from '@esportsplus/typescript/transformer';
+import { applyReplacementsReverse, uid } from '@esportsplus/typescript/transformer';
 import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } from './type-analyzer.js';
 import { ts } from '@esportsplus/typescript';
 import parser from './parser.js';
 const ARROW_EMPTY_PARAMS = /\(\s*\)\s*=>\s*$/;
+const TEMPLATE_IMPORT = /import\s+\{[^}]*\}\s+from\s+['"]@esportsplus\/template['"];?\s*\n?/g;
 let currentChecker, hoistedFactories = new Map(), htmlToTemplateId = new Map(), ns = '';
 function collectNestedTemplateReplacements(node, exprStart, sourceFile, replacements) {
     if (isNestedHtmlTemplate(node)) {
@@ -198,15 +199,12 @@ function rewriteExpression(expr, sourceFile) {
     return applyReplacementsReverse(expr.getText(sourceFile), replacements);
 }
 const addArraySlotImport = (code) => {
-    return addImport(code, '@esportsplus/template', ['ArraySlot']);
+    return `import * as ${ns} from '@esportsplus/template';\n\n` + code.replace(TEMPLATE_IMPORT, '');
 };
 const generateCode = (templates, originalCode, sourceFile) => {
     if (templates.length === 0) {
         return { changed: false, code: originalCode };
     }
-    hoistedFactories.clear();
-    htmlToTemplateId.clear();
-    ns = uid('t');
     let rootTemplates = templates.filter(t => !isNestedTemplate(t, templates));
     if (rootTemplates.length === 0) {
         return { changed: false, code: originalCode };
@@ -241,6 +239,7 @@ const generateCode = (templates, originalCode, sourceFile) => {
         for (let [id, html] of hoistedFactories) {
             factories.push(`const ${id} = ${ns}.template(\`${html}\`);`);
         }
+        code = code.replace(TEMPLATE_IMPORT, '');
         code = generateImports() + '\n\n' + factories.join('\n') + '\n\n' + code;
     }
     return { changed, code };
@@ -266,10 +265,15 @@ const getNames = () => ({
     event: `${ns}.event`,
     slot: `${ns}.slot`
 });
+const initNamespace = () => {
+    hoistedFactories.clear();
+    htmlToTemplateId.clear();
+    ns = uid('t');
+};
 const needsArraySlotImport = (sourceFile) => {
     return hasArraySlotUsage(sourceFile) && !hasArraySlotImport(sourceFile);
 };
 const setTypeChecker = (checker) => {
     currentChecker = checker;
 };
-export { addArraySlotImport, generateCode, generateReactiveInlining, getNames, needsArraySlotImport, setTypeChecker };
+export { addArraySlotImport, generateCode, generateReactiveInlining, getNames, initNamespace, needsArraySlotImport, setTypeChecker };

package/build/transformer/index.js

@@ -1,5 +1,5 @@
 import { mightNeedTransform } from '@esportsplus/typescript/transformer';
-import { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport, setTypeChecker } from './codegen.js';
+import { addArraySlotImport, generateCode, generateReactiveInlining, initNamespace, needsArraySlotImport, setTypeChecker } from './codegen.js';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser.js';
 import { ts } from '@esportsplus/typescript';
 const PATTERNS = ['html`', 'html.reactive'];
@@ -23,6 +23,7 @@ function createTransformer(program) {
 }
 function transformCode(code, sourceFile) {
     let changed = false, result = code;
+    initNamespace();
     let reactiveCalls = findReactiveCalls(sourceFile);
     if (reactiveCalls.length > 0) {
         result = generateReactiveInlining(reactiveCalls, result, sourceFile);

package/package.json

@@ -2,7 +2,7 @@
   "author": "ICJR",
   "dependencies": {
     "@esportsplus/queue": "^0.2.0",
-    "@esportsplus/reactivity": "^0.24.3",
+    "@esportsplus/reactivity": "^0.24.4",
     "@esportsplus/utilities": "^0.27.2",
     "serve": "^14.2.5"
   },
@@ -40,7 +40,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.31.3",
+  "version": "0.31.5",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/transformer/codegen.ts

@@ -1,4 +1,4 @@
-import { addImport, applyReplacementsReverse, uid } from '@esportsplus/typescript/transformer';
+import { applyReplacementsReverse, uid } from '@esportsplus/typescript/transformer';
 import type { Replacement } from '@esportsplus/typescript/transformer';
 import type { ReactiveCallInfo, TemplateInfo } from './ts-parser';
 import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } from './type-analyzer';
@@ -33,6 +33,8 @@ type ParseResult = {
 
 const ARROW_EMPTY_PARAMS = /\(\s*\)\s*=>\s*$/;
 
+const TEMPLATE_IMPORT = /import\s+\{[^}]*\}\s+from\s+['"]@esportsplus\/template['"];?\s*\n?/g;
+
 
 let currentChecker: ts.TypeChecker | undefined,
     hoistedFactories = new Map<string, string>(),
@@ -344,7 +346,8 @@ function rewriteExpression(expr: ts.Expression, sourceFile: ts.SourceFile): stri
 
 
 const addArraySlotImport = (code: string): string => {
-    return addImport(code, '@esportsplus/template', ['ArraySlot']);
+    // Strip original @esportsplus/template imports (they lose symbol bindings in TS 5.9.3)
+    return `import * as ${ns} from '@esportsplus/template';\n\n` + code.replace(TEMPLATE_IMPORT, '');
 };
 
 const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFile: ts.SourceFile): CodegenResult => {
@@ -352,10 +355,6 @@ const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFil
         return { changed: false, code: originalCode };
     }
 
-    hoistedFactories.clear();
-    htmlToTemplateId.clear();
-    ns = uid('t');
-
     let rootTemplates = templates.filter(t => !isNestedTemplate(t, templates));
 
     if (rootTemplates.length === 0) {
@@ -413,6 +412,8 @@ const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFil
             factories.push(`const ${id} = ${ns}.template(\`${html}\`);`);
         }
 
+        // Strip original @esportsplus/template imports (they lose symbol bindings in TS 5.9.3)
+        code = code.replace(TEMPLATE_IMPORT, '');
         code = generateImports() + '\n\n' + factories.join('\n') + '\n\n' + code;
     }
 
@@ -447,6 +448,12 @@ const getNames = () => ({
     slot: `${ns}.slot`
 });
 
+const initNamespace = (): void => {
+    hoistedFactories.clear();
+    htmlToTemplateId.clear();
+    ns = uid('t');
+};
+
 const needsArraySlotImport = (sourceFile: ts.SourceFile): boolean => {
     return hasArraySlotUsage(sourceFile) && !hasArraySlotImport(sourceFile);
 };
@@ -456,5 +463,5 @@ const setTypeChecker = (checker: ts.TypeChecker | undefined): void => {
 };
 
 
-export { addArraySlotImport, generateCode, generateReactiveInlining, getNames, needsArraySlotImport, setTypeChecker };
+export { addArraySlotImport, generateCode, generateReactiveInlining, getNames, initNamespace, needsArraySlotImport, setTypeChecker };
 export type { CodegenResult };

package/src/transformer/index.ts

@@ -1,5 +1,5 @@
 import { mightNeedTransform } from '@esportsplus/typescript/transformer';
-import { addArraySlotImport, generateCode, generateReactiveInlining, needsArraySlotImport, setTypeChecker } from './codegen';
+import { addArraySlotImport, generateCode, generateReactiveInlining, initNamespace, needsArraySlotImport, setTypeChecker } from './codegen';
 import { findHtmlTemplates, findReactiveCalls } from './ts-parser';
 import { ts } from '@esportsplus/typescript';
 
@@ -47,6 +47,8 @@ function transformCode(code: string, sourceFile: ts.SourceFile): TransformResult
     let changed = false,
         result = code;
 
+    initNamespace();
+
     let reactiveCalls = findReactiveCalls(sourceFile);
 
     if (reactiveCalls.length > 0) {