@esportsplus/template 0.31.4 → 0.31.5

package/build/transformer/codegen.js

@@ -3,6 +3,7 @@ import { analyzeExpression, generateAttributeBinding, generateSpreadBindings } f
 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,7 +199,7 @@ function rewriteExpression(expr, sourceFile) {
     return applyReplacementsReverse(expr.getText(sourceFile), replacements);
 }
 const addArraySlotImport = (code) => {
-    return `import * as ${ns} from '@esportsplus/template';\n\n` + code;
+    return `import * as ${ns} from '@esportsplus/template';\n\n` + code.replace(TEMPLATE_IMPORT, '');
 };
 const generateCode = (templates, originalCode, sourceFile) => {
     if (templates.length === 0) {
@@ -238,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 };

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.4",
+  "version": "0.31.5",
   "scripts": {
     "build": "tsc",
     "build:test": "vite build --config test/vite.config.ts",

package/src/transformer/codegen.ts

@@ -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 `import * as ${ns} from '@esportsplus/template';\n\n` + code;
+    // 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 => {
@@ -409,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;
     }