@lithent/hmr-parser 0.2.2 → 0.2.3

package/dist/markerParse.d.cts

@@ -0,0 +1,2 @@
+import { MarkerTransformOptions, HmrTransformResult } from './types.cjs';
+export declare const transformWithMarker: (options: MarkerTransformOptions) => HmrTransformResult;

package/dist/markerParse.d.ts

@@ -1,2 +1,2 @@
-import { MarkerTransformOptions, HmrTransformResult } from './types';
+import { MarkerTransformOptions, HmrTransformResult } from './types.js';
 export declare const transformWithMarker: (options: MarkerTransformOptions) => HmrTransformResult;

package/dist/noMarkerParse.d.cts

@@ -0,0 +1,2 @@
+import { BaseTransformOptions, HmrTransformResult } from './types.cjs';
+export declare const transformWithoutMarker: (options: BaseTransformOptions) => HmrTransformResult;

package/dist/noMarkerParse.d.ts

@@ -1,2 +1,2 @@
-import { BaseTransformOptions, HmrTransformResult } from './types';
+import { BaseTransformOptions, HmrTransformResult } from './types.js';
 export declare const transformWithoutMarker: (options: BaseTransformOptions) => HmrTransformResult;

package/dist/shared.d.cts

@@ -0,0 +1,4 @@
+import { MarkerTransformOptions, BaseTransformOptions, MarkerAnalysisResult, BaseAnalysisResult } from './types.cjs';
+export declare const analyzeMarker: (options: MarkerTransformOptions) => MarkerAnalysisResult;
+export declare const analyzeNoMarker: (options: BaseTransformOptions) => BaseAnalysisResult;
+export declare const shouldSkipTransform: (code: string) => boolean;

package/dist/shared.d.ts

@@ -1,4 +1,4 @@
-import { MarkerTransformOptions, BaseTransformOptions, MarkerAnalysisResult, BaseAnalysisResult } from './types';
+import { MarkerTransformOptions, BaseTransformOptions, MarkerAnalysisResult, BaseAnalysisResult } from './types.js';
 export declare const analyzeMarker: (options: MarkerTransformOptions) => MarkerAnalysisResult;
 export declare const analyzeNoMarker: (options: BaseTransformOptions) => BaseAnalysisResult;
 export declare const shouldSkipTransform: (code: string) => boolean;

package/dist/strings.d.cts

@@ -0,0 +1 @@
+export declare const createHmrBootstrapBlock: (_targetExports: string[], componentNames: string[]) => string;

package/dist/strings.d.ts

@@ -1 +1 @@
-export declare const createHmrBootstrapBlock: (targetExports: string[], componentNames: string[]) => string;
+export declare const createHmrBootstrapBlock: (_targetExports: string[], componentNames: string[]) => string;

package/dist/tests/bootstrap.test.d.cts

@@ -0,0 +1 @@
+export {};

package/dist/tests/bootstrap.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/mark.test.d.cts

@@ -0,0 +1 @@
+export {};

package/dist/tests/nomark.test.d.cts

@@ -0,0 +1 @@
+export {};

package/dist/transform/componentRegister.d.cts

@@ -0,0 +1,3 @@
+import { default as MagicString } from 'magic-string';
+import { MountInfo } from '../utils/ast/componentCollector.cjs';
+export declare const stitchComponentRegistration: (ms: MagicString, mounts: MountInfo[], _code: string, _importInsertionPos: number) => string;

package/dist/transform/componentRegister.d.ts

@@ -1,3 +1,3 @@
 import { default as MagicString } from 'magic-string';
-import { MountInfo } from '../utils/ast/componentCollector';
-export declare const stitchComponentRegistration: (ms: MagicString, mounts: MountInfo[], code: string, importInsertionPos: number) => void;
+import { MountInfo } from '../utils/ast/componentCollector.js';
+export declare const stitchComponentRegistration: (ms: MagicString, mounts: MountInfo[], _code: string, _importInsertionPos: number) => string;

package/dist/transform/exportSnapshot.d.cts

@@ -0,0 +1,3 @@
+import { File } from '@babel/types';
+import { MountInfo } from '../utils/ast/componentCollector.cjs';
+export declare const createExportSnapshot: (ast: File, components: MountInfo[]) => string;

package/dist/transform/exportSnapshot.d.ts

@@ -0,0 +1,3 @@
+import { File } from '@babel/types';
+import { MountInfo } from '../utils/ast/componentCollector.js';
+export declare const createExportSnapshot: (ast: File, components: MountInfo[]) => string;

package/dist/transform/renderGuard.d.cts

@@ -0,0 +1,3 @@
+import { default as MagicString } from 'magic-string';
+import { File } from '@babel/types';
+export declare const wrapRenderCalls: (ms: MagicString, ast: File, _code: string, importSpecifier?: string) => boolean;

package/dist/transform/renderGuard.d.ts

@@ -1,3 +1,3 @@
 import { default as MagicString } from 'magic-string';
 import { File } from '@babel/types';
-export declare const wrapRenderCalls: (ms: MagicString, ast: File, code: string) => boolean;
+export declare const wrapRenderCalls: (ms: MagicString, ast: File, _code: string, importSpecifier?: string) => boolean;

package/dist/types.d.cts

@@ -0,0 +1,28 @@
+import { default as MagicString } from 'magic-string';
+import { File } from '@babel/types';
+export interface BaseTransformOptions {
+    code: string;
+    boundaryImportSpecifier: string;
+    tagFunctionImportSpecifier: string;
+}
+export interface MarkerTransformOptions extends BaseTransformOptions {
+    markerRegex: RegExp;
+}
+export interface BaseAnalysisResult {
+    targetExports: string[];
+    shouldTransform: boolean;
+    importInsertionPos: number;
+    blockInsertionPos: number;
+    headerSnippet: string;
+    ast: File;
+}
+export interface MarkerAnalysisResult extends BaseAnalysisResult {
+    match: RegExpExecArray | null;
+}
+export interface HmrTransformOptions extends MarkerTransformOptions {
+}
+export interface HmrTransformResult {
+    transformed: boolean;
+    code: string;
+    map: ReturnType<MagicString['generateMap']> | null;
+}

package/dist/utils/ast/componentCollector.d.cts

@@ -0,0 +1,9 @@
+import { File } from '@babel/types';
+export type MountInfo = {
+    componentName: string;
+    declarationEnd: number;
+    start: number;
+    end: number;
+    declaration: boolean;
+};
+export declare const collectComponentMounts: (ast: File, _code: string, importSpecifier?: string) => MountInfo[];

package/dist/utils/ast/componentCollector.d.ts

@@ -1,8 +1,9 @@
 import { File } from '@babel/types';
 export type MountInfo = {
-    insertPos: number;
-    propsExpression: string;
-    componentName: string | null;
+    componentName: string;
     declarationEnd: number;
+    start: number;
+    end: number;
+    declaration: boolean;
 };
-export declare const collectComponentMounts: (ast: File, code: string) => MountInfo[];
+export declare const collectComponentMounts: (ast: File, _code: string, importSpecifier?: string) => MountInfo[];

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@lithent/hmr-parser",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Lithent HMR parser utilities for build tools",
   "main": "./dist/lithentHmrParser.umd.js",
   "module": "./dist/lithentHmrParser.mjs",
@@ -40,7 +40,7 @@
     "vite-plugin-checker": "^0.8.0",
     "vite-plugin-dts": "^4.2.1",
     "vitest": "^2.1.5",
-    "lithent": "1.20.2"
+    "lithent": "1.25.0"
   },
   "volta": {
     "node": "20.3.0",

package/src/helper/calculator.ts

@@ -49,7 +49,13 @@ export const collectExportNames = (ast: File): string[] => {
 };
 
 export const detectLithentUsage = (ast: File): boolean => {
-  const watchedNames = new Set(['render', 'mount', 'createApp', 'createRoot']);
+  const watchedNames = new Set([
+    'render',
+    'mount',
+    'lmount',
+    'createApp',
+    'createRoot',
+  ]);
 
   for (const node of ast.program.body) {
     if (node.type !== 'ImportDeclaration') continue;
@@ -86,12 +92,15 @@ export const collectHeaderInsert = (
   ast: File,
   sourceCode: string,
   boundaryImportSpecifier: string,
-  _tagFunctionImportSpecifier: string
+  tagFunctionImportSpecifier: string
 ) => {
-  const importsToPrepend: string[] = [];
+  const importsToPrepend: string[] = [
+    `import { getComponentKey as __lithentGetComponentKey, mountCallback as __lithentMountCallback, componentMap as __lithentComponentMap } from '${tagFunctionImportSpecifier}';`,
+  ];
   let hasBoundaryImport = false;
   let lastImportEnd = 0;
-  let directiveEnd = 0;
+  let directiveEnd =
+    ast.program.directives.at(-1)?.end ?? ast.program.interpreter?.end ?? 0;
   let firstImportStart: number | null = null;
 
   for (const node of ast.program.body) {
@@ -101,8 +110,19 @@ export const collectHeaderInsert = (
         firstImportStart = node.start ?? null;
       }
 
-      if (node.source.value === boundaryImportSpecifier) {
-        hasBoundaryImport = true;
+      if (
+        node.source.value === boundaryImportSpecifier &&
+        node.importKind !== 'type'
+      ) {
+        hasBoundaryImport =
+          node.specifiers.some(
+            specifier =>
+              specifier.type === 'ImportSpecifier' &&
+              specifier.importKind !== 'type' &&
+              specifier.imported.type === 'Identifier' &&
+              specifier.imported.name === 'createBoundary' &&
+              specifier.local.name === '__lithentCreateBoundary'
+          ) || hasBoundaryImport;
       }
 
       continue;
@@ -126,7 +146,7 @@ export const collectHeaderInsert = (
 
   if (!hasBoundaryImport) {
     importsToPrepend.push(
-      `import { createBoundary } from '${boundaryImportSpecifier}';`
+      `import { createBoundary as __lithentCreateBoundary } from '${boundaryImportSpecifier}';`
     );
   }
 

package/src/markerParse.ts

@@ -5,6 +5,7 @@ import { analyzeMarker } from './shared';
 import { stitchComponentRegistration } from './transform/componentRegister';
 import { wrapRenderCalls } from './transform/renderGuard';
 import { collectComponentMounts } from './utils/ast/componentCollector';
+import { createExportSnapshot } from './transform/exportSnapshot';
 
 export const transformWithMarker = (
   options: MarkerTransformOptions
@@ -15,6 +16,7 @@ export const transformWithMarker = (
     targetExports,
     shouldTransform,
     importInsertionPos,
+    blockInsertionPos,
     headerSnippet,
   } = analysis;
 
@@ -22,7 +24,11 @@ export const transformWithMarker = (
     return { transformed: false, code: options.code, map: null };
   }
 
-  const mounts = collectComponentMounts(analysis.ast, options.code);
+  const mounts = collectComponentMounts(
+    analysis.ast,
+    options.code,
+    options.tagFunctionImportSpecifier
+  );
   const componentNames = Array.from(
     new Set(
       mounts
@@ -32,26 +38,36 @@ export const transformWithMarker = (
   );
 
   const ms = new MagicString(options.code);
-  wrapRenderCalls(ms, analysis.ast, options.code);
+  if (mounts.length)
+    wrapRenderCalls(
+      ms,
+      analysis.ast,
+      options.code,
+      options.tagFunctionImportSpecifier
+    );
+  const hoisted = stitchComponentRegistration(
+    ms,
+    mounts,
+    options.code,
+    importInsertionPos
+  );
   const transformBlock = createHmrBootstrapBlock(
     targetExports,
     componentNames
   ).trimStart();
 
-  if (headerSnippet) {
+  const precedingChar =
+    blockInsertionPos > 0 ? options.code[blockInsertionPos - 1] : undefined;
+  const needsLeadingNewline = blockInsertionPos > 0 && precedingChar !== '\n';
+  const blockSnippet = `${needsLeadingNewline ? '\n' : ''}${transformBlock}\n${hoisted}\n\n`;
+  if (blockInsertionPos === importInsertionPos) {
+    ms.appendLeft(importInsertionPos, `${headerSnippet}${blockSnippet}`);
+  } else {
     ms.appendLeft(importInsertionPos, headerSnippet);
+    ms.appendLeft(blockInsertionPos, blockSnippet);
   }
-
-  const precedingChar =
-    match.index > 0 ? options.code[match.index - 1] : undefined;
-  const needsLeadingNewline = match.index > 0 && precedingChar !== '\n';
-  const followingChar = options.code[match.index + match[0].length] ?? null;
-  const trailingNewline = followingChar === '\n' ? '\n' : '\n\n';
-  const blockSnippet = `${needsLeadingNewline ? '\n' : ''}${transformBlock}${trailingNewline}`;
-
-  ms.overwrite(match.index, match.index + match[0].length, blockSnippet);
-
-  stitchComponentRegistration(ms, mounts, options.code, importInsertionPos);
+  ms.overwrite(match.index, match.index + match[0].length, '');
+  ms.append(createExportSnapshot(analysis.ast, mounts));
 
   return {
     transformed: true,

package/src/noMarkerParse.ts

@@ -5,6 +5,7 @@ import { analyzeNoMarker } from './shared';
 import { stitchComponentRegistration } from './transform/componentRegister';
 import { wrapRenderCalls } from './transform/renderGuard';
 import { collectComponentMounts } from './utils/ast/componentCollector';
+import { createExportSnapshot } from './transform/exportSnapshot';
 
 export const transformWithoutMarker = (
   options: BaseTransformOptions
@@ -23,7 +24,11 @@ export const transformWithoutMarker = (
     return { transformed: false, code: options.code, map: null };
   }
 
-  const mounts = collectComponentMounts(ast, options.code);
+  const mounts = collectComponentMounts(
+    ast,
+    options.code,
+    options.tagFunctionImportSpecifier
+  );
   const componentNames = Array.from(
     new Set(
       mounts
@@ -33,7 +38,14 @@ export const transformWithoutMarker = (
   );
 
   const ms = new MagicString(options.code);
-  wrapRenderCalls(ms, ast, options.code);
+  if (mounts.length)
+    wrapRenderCalls(ms, ast, options.code, options.tagFunctionImportSpecifier);
+  const hoisted = stitchComponentRegistration(
+    ms,
+    mounts,
+    options.code,
+    importInsertionPos
+  );
   const transformBlock = createHmrBootstrapBlock(
     targetExports,
     componentNames
@@ -43,7 +55,7 @@ export const transformWithoutMarker = (
     blockInsertionPos > 0 ? options.code[blockInsertionPos - 1] : undefined;
   const needsLeadingNewlineForBlock =
     blockInsertionPos > 0 && blockPrecedingChar !== '\n';
-  const blockSnippet = `${needsLeadingNewlineForBlock ? '\n' : ''}${transformBlock}\n\n`;
+  const blockSnippet = `${needsLeadingNewlineForBlock ? '\n' : ''}${transformBlock}\n${hoisted}\n\n`;
 
   if (!headerSnippet && !blockSnippet.trim().length) {
     return { transformed: false, code: options.code, map: null };
@@ -60,7 +72,7 @@ export const transformWithoutMarker = (
     ms.appendLeft(blockInsertionPos, blockSnippet);
   }
 
-  stitchComponentRegistration(ms, mounts, options.code, importInsertionPos);
+  ms.append(createExportSnapshot(ast, mounts));
 
   return {
     transformed: true,

package/src/shared.ts

@@ -1,4 +1,5 @@
 import { parse } from '@babel/parser';
+import { collectComponentMounts } from './utils/ast/componentCollector';
 import type { File } from '@babel/types';
 import type {
   MarkerTransformOptions,
@@ -73,7 +74,10 @@ export const analyzeMarker = (
 
   return {
     targetExports: finalTargets,
-    shouldTransform: !!match || detectLithentUsage(ast),
+    shouldTransform:
+      !!match ||
+      detectLithentUsage(ast) ||
+      collectComponentMounts(ast, code, tagFunctionImportSpecifier).length > 0,
     importInsertionPos,
     blockInsertionPos,
     headerSnippet,
@@ -97,7 +101,9 @@ export const analyzeNoMarker = (
 
   return {
     targetExports,
-    shouldTransform: detectLithentUsage(ast),
+    shouldTransform:
+      detectLithentUsage(ast) ||
+      collectComponentMounts(ast, code, tagFunctionImportSpecifier).length > 0,
     importInsertionPos,
     blockInsertionPos,
     headerSnippet,