@esportsplus/template 0.31.3 → 0.31.4

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,4 +1,4 @@
-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';
@@ -198,15 +198,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;
 };
 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 };
@@ -266,10 +263,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

@@ -40,7 +40,7 @@
   },
   "type": "module",
   "types": "./build/index.d.ts",
-  "version": "0.31.3",
+  "version": "0.31.4",
   "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';
@@ -344,7 +344,7 @@ function rewriteExpression(expr: ts.Expression, sourceFile: ts.SourceFile): stri
 
 
 const addArraySlotImport = (code: string): string => {
-    return addImport(code, '@esportsplus/template', ['ArraySlot']);
+    return `import * as ${ns} from '@esportsplus/template';\n\n` + code;
 };
 
 const generateCode = (templates: TemplateInfo[], originalCode: string, sourceFile: ts.SourceFile): CodegenResult => {
@@ -352,10 +352,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) {
@@ -447,6 +443,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 +458,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) {