@lithent/hmr-parser 0.1.1 → 0.2.0

package/package.json

@@ -1,9 +1,8 @@
 {
   "type": "module",
   "name": "@lithent/hmr-parser",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Lithent HMR parser utilities for build tools",
-  "packageManager": "pnpm@9.12.3",
   "main": "./dist/lithentHmrParser.umd.js",
   "module": "./dist/lithentHmrParser.mjs",
   "types": "./dist/index.d.ts",
@@ -14,12 +13,6 @@
       "require": "./dist/lithentHmrParser.umd.js"
     }
   },
-  "scripts": {
-    "build": "vite build",
-    "watch": "vite build --watch",
-    "test": "vitest run --reporter verbose",
-    "test:dev": "vitest"
-  },
   "author": "superlucky84",
   "repository": {
     "type": "git",
@@ -27,7 +20,11 @@
   },
   "homepage": "https://github.com/superlucky84/lithent",
   "license": "MIT",
-  "keywords": ["lithent", "hmr", "parser"],
+  "keywords": [
+    "lithent",
+    "hmr",
+    "parser"
+  ],
   "dependencies": {
     "@babel/parser": "^7.26.2",
     "@babel/types": "^7.26.0",
@@ -38,15 +35,21 @@
     "src"
   ],
   "devDependencies": {
-    "lithent": "^1.20.0",
     "@types/babel__traverse": "^7.20.6",
     "vite": "^5.4.8",
     "vite-plugin-checker": "^0.8.0",
     "vite-plugin-dts": "^4.2.1",
-    "vitest": "^2.1.5"
+    "vitest": "^2.1.5",
+    "lithent": "1.20.0"
   },
   "volta": {
     "node": "20.3.0",
     "pnpm": "9.12.3"
+  },
+  "scripts": {
+    "build": "vite build",
+    "watch": "vite build --watch",
+    "test": "vitest run --reporter verbose",
+    "test:dev": "vitest"
   }
-}
+}

package/src/helper/calculator.ts

@@ -86,11 +86,10 @@ export const collectHeaderInsert = (
   ast: File,
   sourceCode: string,
   boundaryImportSpecifier: string,
-  tagFunctionImportSpecifier: string
+  _tagFunctionImportSpecifier: string
 ) => {
   const importsToPrepend: string[] = [];
   let hasBoundaryImport = false;
-  let hasTagImport = false;
   let lastImportEnd = 0;
   let directiveEnd = 0;
   let firstImportStart: number | null = null;
@@ -106,20 +105,6 @@ export const collectHeaderInsert = (
         hasBoundaryImport = true;
       }
 
-      if (node.source.value === tagFunctionImportSpecifier) {
-        const hasTag = node.specifiers.some(specifier => {
-          return (
-            specifier.type === 'ImportSpecifier' &&
-            specifier.imported.type === 'Identifier' &&
-            specifier.imported.name === 'TagFunction'
-          );
-        });
-
-        if (hasTag) {
-          hasTagImport = true;
-        }
-      }
-
       continue;
     }
 
@@ -145,11 +130,10 @@ export const collectHeaderInsert = (
     );
   }
 
-  if (!hasTagImport) {
-    importsToPrepend.push(
-      `import type { TagFunction } from '${tagFunctionImportSpecifier}';`
-    );
-  }
+  // Note: We don't add TagFunction import anymore since:
+  // 1. In enforce:'post', esbuild already removed type imports
+  // 2. The type is only used for TypeScript casting, not at runtime
+  // 3. Adding "import type" in post-transform breaks browser execution
 
   const importInsertionPos = firstImportStart ?? directiveEnd ?? 0;
   const blockInsertionPos = lastImportEnd || directiveEnd || 0;

package/src/strings.ts

@@ -14,17 +14,11 @@ const __lithentBoundaryStoreKey = \`__lithent_hmr_boundary__\${__lithentModuleId
 const __lithentDisposeStoreKey = \`__lithent_hmr_dispose__\${__lithentModuleId}\`;
 const __lithentGlobalStore =
   typeof globalThis === 'object'
-    ? (globalThis as Record<string, unknown>)
+    ? globalThis
     : undefined;
 
-const __lithentEnsureHotData = (): Record<string, unknown> | undefined => {
-  const hot =
-    (import.meta.hot as
-      | {
-          data?: Record<string, unknown>;
-          __lithentData?: Record<string, unknown>;
-        }
-      | undefined) ?? undefined;
+const __lithentEnsureHotData = () => {
+  const hot = import.meta.hot ?? undefined;
   if (!hot) return undefined;
 
   const existing = hot.data;
@@ -33,7 +27,7 @@ const __lithentEnsureHotData = (): Record<string, unknown> | undefined => {
   }
 
   try {
-    const target: Record<string, unknown> = {};
+    const target = {};
     hot.data = target;
     return target;
   } catch {
@@ -43,11 +37,10 @@ const __lithentEnsureHotData = (): Record<string, unknown> | undefined => {
 };
 
 const __lithentHotData = __lithentEnsureHotData();
-type __LithentBoundaryController = ReturnType<typeof createBoundary>;
 
-const counterBoundary: __LithentBoundaryController =
-  (__lithentHotData?.counterBoundary as __LithentBoundaryController | undefined) ||
-  (__lithentGlobalStore?.[__lithentBoundaryStoreKey] as __LithentBoundaryController | undefined) ||
+const counterBoundary =
+  __lithentHotData?.counterBoundary ||
+  __lithentGlobalStore?.[__lithentBoundaryStoreKey] ||
   createBoundary(__lithentModuleId);
 
 if (__lithentHotData) {
@@ -59,18 +52,18 @@ if (__lithentGlobalStore) {
 }
 
 let disposeApp =
-  (__lithentHotData?.disposeApp as (() => void) | undefined) ||
-  (__lithentGlobalStore?.[__lithentDisposeStoreKey] as (() => void) | undefined);
+  __lithentHotData?.disposeApp ||
+  __lithentGlobalStore?.[__lithentDisposeStoreKey];
 
-const __lithentRenderOnce = <T,>(factory: () => T) => {
+const __lithentRenderOnce = (factory) => {
   if (disposeApp) {
-    return disposeApp as unknown as T;
+    return disposeApp;
   }
 
   const result = factory();
 
   if (typeof result === 'function') {
-    disposeApp = result as unknown as () => void;
+    disposeApp = result;
 
     if (__lithentHotData) {
       __lithentHotData.disposeApp = disposeApp;
@@ -87,10 +80,7 @@ const __lithentRenderOnce = <T,>(factory: () => T) => {
 const __lithentModuleHotStore =
   __lithentHotData
     ? ((__lithentHotData.components =
-        (__lithentHotData.components as Record<
-          string,
-          TagFunction | undefined
-        > | undefined) ?? {}) as Record<string, TagFunction | undefined>)
+        __lithentHotData.components ?? {}))
     : undefined;
 
 const __lithentHmrTargets = ${serializedTargets};
@@ -102,8 +92,8 @@ const __lithentSetupHmrHooks = () => {
 
   import.meta.hot.accept(mod => {
     let applied = false;
-    const nextModule = (mod ?? {}) as Record<string, unknown>;
-    const missing: string[] = [];
+    const nextModule = mod ?? {};
+    const missing = [];
     const knownNames = new Set([
       ...${JSON.stringify(Array.from(new Set(componentNames)))},
       ...__lithentHmrTargets,
@@ -112,9 +102,9 @@ const __lithentSetupHmrHooks = () => {
     for (const name of knownNames) {
       const nextCtor =
         name === 'default'
-          ? (nextModule.default as TagFunction | undefined)
-          : (nextModule[name] as TagFunction | undefined) ||
-            (__lithentModuleHotStore?.[name] as TagFunction | undefined);
+          ? nextModule.default
+          : nextModule[name] ||
+            __lithentModuleHotStore?.[name];
 
       if (!nextCtor) {
         missing.push(name);
@@ -131,9 +121,7 @@ const __lithentSetupHmrHooks = () => {
         queueMicrotask(() => {
           let retried = false;
           for (const name of missing) {
-            const retryCtor = __lithentModuleHotStore?.[name] as
-              | TagFunction
-              | undefined;
+            const retryCtor = __lithentModuleHotStore?.[name];
             if (retryCtor && counterBoundary.update(retryCtor)) {
               retried = true;
             }

package/src/tests/mark.test.ts

@@ -84,10 +84,7 @@ if (import.meta.vitest) {
       expect(defaultResult.code).toContain(
         "import { createBoundary } from 'lithent/devHelper';"
       );
-      expect(defaultResult.code).toContain(
-        "import type { TagFunction } from 'lithent';"
-      );
-      expect(defaultResult.code).toContain('import.meta.hot as');
+      expect(defaultResult.code).toContain('import.meta.hot');
       expect(defaultResult.code).toContain(
         "import { mountCallback, getComponentKey } from 'lithent';"
       );
@@ -101,18 +98,20 @@ if (import.meta.vitest) {
       expect(defaultResult.code).toContain('...["App","Secondary"]');
       expect(defaultResult.code).toContain('...__lithentHmrTargets');
       expect(defaultResult.code).toContain(
-        'const __lithentHotComponent_App = App as unknown as TagFunction;'
+        'const __lithentHotComponent_App = App;'
       );
       expect(defaultResult.code).toContain(
         '__lithentModuleHotStore["App"] = __lithentHotComponent_App;'
       );
       expect(defaultResult.code).toContain(
-        'const __lithentHotComponent_Secondary = Secondary as unknown as TagFunction;'
+        'const __lithentHotComponent_Secondary = Secondary;'
       );
       expect(defaultResult.code).toContain(
         '__lithentModuleHotStore["Secondary"] = __lithentHotComponent_Secondary;'
       );
-      expect(defaultResult.code).toContain('const __lithentRenderOnce = <');
+      expect(defaultResult.code).toContain(
+        'const __lithentRenderOnce = (factory)'
+      );
       const registerMatches =
         defaultResult.code.match(/counterBoundary\.register\(compKey\)/g) ?? [];
       const unregisterMatches =
@@ -133,18 +132,18 @@ if (import.meta.vitest) {
       expect(namedResult.code).toContain(
         'const __lithentHmrTargets = ["Counter","Another"];'
       );
-      expect(namedResult.code).toContain('import.meta.hot as');
+      expect(namedResult.code).toContain('import.meta.hot');
       expect(namedResult.code).toContain('const knownNames = new Set([');
       expect(namedResult.code).toContain('...["Counter","Another"]');
       expect(namedResult.code).toContain('...__lithentHmrTargets');
       expect(namedResult.code).toContain(
-        'const __lithentHotComponent_Counter = Counter as unknown as TagFunction;'
+        'const __lithentHotComponent_Counter = Counter;'
       );
       expect(namedResult.code).toContain(
         '__lithentModuleHotStore["Counter"] = __lithentHotComponent_Counter;'
       );
       expect(namedResult.code).toContain(
-        'const __lithentHotComponent_Another = Another as unknown as TagFunction;'
+        'const __lithentHotComponent_Another = Another;'
       );
       expect(namedResult.code).toContain(
         '__lithentModuleHotStore["Another"] = __lithentHotComponent_Another;'

package/src/tests/nomark.test.tsx

@@ -65,9 +65,7 @@ if (import.meta.vitest) {
       expect(result.code.includes('...["Demo","Another"]')).toBe(true);
       expect(result.code.includes('...__lithentHmrTargets')).toBe(true);
       expect(
-        result.code.includes(
-          'const __lithentHotComponent_Demo = Demo as unknown as TagFunction;'
-        )
+        result.code.includes('const __lithentHotComponent_Demo = Demo;')
       ).toBe(true);
       expect(
         result.code.includes(
@@ -75,16 +73,16 @@ if (import.meta.vitest) {
         )
       ).toBe(true);
       expect(
-        result.code.includes(
-          'const __lithentHotComponent_Another = Another as unknown as TagFunction;'
-        )
+        result.code.includes('const __lithentHotComponent_Another = Another;')
       ).toBe(true);
       expect(
         result.code.includes(
           '__lithentModuleHotStore["Another"] = __lithentHotComponent_Another;'
         )
       ).toBe(true);
-      expect(result.code.includes('const __lithentRenderOnce = <')).toBe(true);
+      expect(
+        result.code.includes('const __lithentRenderOnce = (factory)')
+      ).toBe(true);
       expect(/__lithentRenderOnce\(\(\) =>\s*render\(/.test(result.code)).toBe(
         true
       );

package/src/transform/componentRegister.ts

@@ -39,7 +39,7 @@ export const stitchComponentRegistration = (
     if (componentName) {
       const hotStoreVar = `__lithentHotComponent_${componentName}`;
       const storeSnippet = `
-const ${hotStoreVar} = ${componentName} as unknown as TagFunction;
+const ${hotStoreVar} = ${componentName};
 if (__lithentModuleHotStore) {
   __lithentModuleHotStore["${componentName}"] = ${hotStoreVar};
 }