@lithent/hmr-parser 0.2.2 → 0.2.3

package/src/strings.ts

@@ -1,204 +1,132 @@
 export const createHmrBootstrapBlock = (
-  targetExports: string[],
+  _targetExports: string[],
   componentNames: string[]
 ) => {
-  const normalizedTargets = new Set(
-    componentNames.length ? componentNames : targetExports
-  );
-
-  const serializedTargets = JSON.stringify(Array.from(normalizedTargets));
-
   return `
-const __lithentModuleId = new URL(import.meta.url).pathname;
-const __lithentBoundaryStoreKey = \`__lithent_hmr_boundary__\${__lithentModuleId}\`;
-const __lithentDisposeStoreKey = \`__lithent_hmr_dispose__\${__lithentModuleId}\`;
+const __lithentModuleUrl = new URL(import.meta.url);
+__lithentModuleUrl.searchParams.delete('t');
+const __lithentModuleId = __lithentModuleUrl.pathname + __lithentModuleUrl.search;
 const __lithentInvalidateCountKey = \`__lithent_hmr_invalidate_count__\${__lithentModuleId}\`;
-const __lithentGlobalStore =
-  typeof globalThis === 'object'
-    ? globalThis
-    : undefined;
-
-const __lithentEnsureHotData = () => {
-  const hot = import.meta.hot ?? undefined;
-  if (!hot) return undefined;
-
-  const existing = hot.data;
-  if (existing && typeof existing === 'object') {
-    return existing;
-  }
-
-  try {
-    const target = {};
-    hot.data = target;
-    return target;
-  } catch {
-    hot.__lithentData = hot.__lithentData || {};
-    return hot.__lithentData;
-  }
-};
-
-const __lithentHotData = __lithentEnsureHotData();
-
-const counterBoundary =
-  __lithentHotData?.counterBoundary ||
-  __lithentGlobalStore?.[__lithentBoundaryStoreKey] ||
-  createBoundary(__lithentModuleId);
-
-if (__lithentHotData) {
-  __lithentHotData.counterBoundary = counterBoundary;
-}
-
-if (__lithentGlobalStore) {
-  __lithentGlobalStore[__lithentBoundaryStoreKey] = counterBoundary;
-}
-
-let disposeApp =
-  __lithentHotData?.disposeApp ||
-  __lithentGlobalStore?.[__lithentDisposeStoreKey];
-
-const __lithentRenderOnce = (factory) => {
-  if (disposeApp) {
-    return disposeApp;
-  }
-
+const __lithentGlobalStore = globalThis;
+const __lithentHotData = import.meta.hot?.data;
+const __lithentModuleHotStore = __lithentHotData
+  ? (__lithentHotData.components ??= Object.create(null))
+  : Object.create(null);
+const __lithentCurrentComponents = Object.create(null);
+if (__lithentHotData) __lithentHotData.currentComponents = __lithentCurrentComponents;
+let __lithentExportSnapshot;
+const __lithentRenderDisposers = __lithentHotData
+  ? (__lithentHotData.renderDisposers ??= new Map()) : new Map();
+const __lithentRenderOnce = (id, factory) => {
+  if (!import.meta.hot) return factory();
+  if (__lithentRenderDisposers.has(id)) return __lithentRenderDisposers.get(id);
   const result = factory();
-
   if (typeof result === 'function') {
-    disposeApp = result;
-
-    if (__lithentHotData) {
-      __lithentHotData.disposeApp = disposeApp;
-    }
-
-    if (__lithentGlobalStore && disposeApp) {
-      __lithentGlobalStore[__lithentDisposeStoreKey] = disposeApp;
-    }
+    __lithentRenderDisposers.set(id, result);
   }
-
   return result;
 };
-
-const __lithentModuleHotStore =
-  __lithentHotData
-    ? ((__lithentHotData.components =
-        __lithentHotData.components ?? {}))
-    : undefined;
-
-const __lithentHmrTargets = ${serializedTargets};
-
-const __lithentGetInvalidateCount = () => {
-  return (__lithentGlobalStore && __lithentGlobalStore[__lithentInvalidateCountKey]) || 0;
-};
-
-const __lithentIncrementInvalidateCount = () => {
-  if (__lithentGlobalStore) {
-    const current = __lithentGetInvalidateCount();
-    __lithentGlobalStore[__lithentInvalidateCountKey] = current + 1;
-    return current + 1;
-  }
-  return 0;
+const __lithentResetInvalidateCount = (name = '') => {
+  __lithentGlobalStore[__lithentInvalidateCountKey + '#' + name] = 0;
 };
-
-const __lithentResetInvalidateCount = () => {
-  if (__lithentGlobalStore) {
-    __lithentGlobalStore[__lithentInvalidateCountKey] = 0;
+const __lithentSafeInvalidate = (reason, name = '') => {
+  const key = __lithentInvalidateCountKey + '#' + name;
+  const count = (__lithentGlobalStore[key] || 0) + 1;
+  __lithentGlobalStore[key] = count;
+  if (count >= 3) {
+    console.warn('[Lithent HMR] boundary update repeatedly failed; reload manually:', reason);
+    return;
   }
+  console.warn('[Lithent HMR] invalidating boundary:', reason);
+  import.meta.hot?.invalidate(reason);
 };
-
-const __lithentSafeInvalidate = (reason) => {
-  const MAX_INVALIDATE_ATTEMPTS = 3;
-  const count = __lithentIncrementInvalidateCount();
-
-  if (count >= MAX_INVALIDATE_ATTEMPTS) {
-    console.warn(
-      \`[Lithent HMR] 전체 리프레시를 \${count}번 시도했지만 계속 실패합니다. 컴포넌트가 마운트되지 않았거나 다른 문제가 있을 수 있습니다. 페이지를 수동으로 새로고침해주세요.\`,
-      reason
-    );
-    return;
+const __lithentWrapComponent = (name, implementation) => {
+  // Production/SSR builds retain the original component and never register hooks.
+  if (!import.meta.hot) return implementation;
+  let entry = __lithentModuleHotStore[name];
+  if (!entry) {
+    entry = {
+      implementation,
+      registrations: new WeakMap(),
+      boundary: __lithentCreateBoundary(
+        __lithentModuleId + '#' + name,
+        reason => __lithentSafeInvalidate(reason, name),
+        () => __lithentResetInvalidateCount(name)
+      ),
+    };
+    entry.component = (props, children) => {
+      const compKey = __lithentGetComponentKey();
+      const instance = compKey && __lithentComponentMap.get(compKey);
+      if (instance && entry.registrations.get(compKey) !== instance) {
+        entry.registrations.set(compKey, instance);
+        // Direct calls rerender the caller's existing closure; they have no
+        // independent VDOM that can be replaced with this component's tag.
+        const callerCtor = instance.ctor && instance.ctor !== entry.component
+          ? instance.ctor : undefined;
+        const unregister = entry.boundary.register(compKey, callerCtor);
+        __lithentMountCallback(() => () => {
+          if (entry.registrations.get(compKey) === instance) {
+            entry.registrations.delete(compKey);
+          }
+          unregister();
+        });
+      }
+      const implementation = entry.implementation;
+      return implementation(props, children);
+    };
+    __lithentModuleHotStore[name] = entry;
   }
-
-  console.warn(
-    \`[Lithent HMR] 변경된 경계를 적용하지 못해 전체 리프레시합니다. (시도 \${count}/\${MAX_INVALIDATE_ATTEMPTS})\`,
-    reason
-  );
-  import.meta.hot?.invalidate?.();
+  entry.implementation = implementation;
+  __lithentCurrentComponents[name] = entry;
+  return entry.component;
 };
-
 const __lithentSetupHmrHooks = () => {
-  if (!import.meta.hot) {
-    return;
-  }
-
-  import.meta.hot.accept(mod => {
-    let applied = false;
-    const nextModule = mod ?? {};
-    const missing = [];
-    const knownNames = new Set([
-      ...${JSON.stringify(Array.from(new Set(componentNames)))},
-      ...__lithentHmrTargets,
-    ]);
-
-    for (const name of knownNames) {
-      const nextCtor =
-        name === 'default'
-          ? nextModule.default
-          : nextModule[name] ||
-            __lithentModuleHotStore?.[name];
-
-      if (!nextCtor) {
-        missing.push(name);
-        continue;
-      }
-
-      if (counterBoundary.update(nextCtor)) {
-        applied = true;
+  if (!import.meta.hot) return;
+  // Entries without components must propagate to importers, not accept an update
+  // that cannot render anything (e.g. the render-only application entry).
+  if (${JSON.stringify(componentNames)}.length) {
+    import.meta.hot.accept(mod => {
+      const current = __lithentHotData.currentComponents || {};
+      const missing = ${JSON.stringify(componentNames)}.filter(name => !current[name]);
+      if (!mod || missing.length) {
+        import.meta.hot.invalidate('removed or unavailable components: ' + missing.join(', '));
+        return;
       }
-    }
-
-    if (applied) {
-      __lithentResetInvalidateCount();
-    } else {
-      if (missing.length && __lithentModuleHotStore) {
-        queueMicrotask(() => {
-          let retried = false;
-          for (const name of missing) {
-            const retryCtor = __lithentModuleHotStore?.[name];
-            if (retryCtor && counterBoundary.update(retryCtor)) {
-              retried = true;
-            }
-          }
-          if (retried) {
-            __lithentResetInvalidateCount();
-          } else {
-            __lithentSafeInvalidate(\`missing components: \${missing.join(', ')}\`);
-          }
-        });
+      const previousExports = __lithentExportSnapshot;
+      if (!previousExports || Object.keys(previousExports).length !== Object.keys(mod).length
+        || Object.keys(previousExports).some(name => !Object.prototype.hasOwnProperty.call(mod, name)
+          || !Object.is(previousExports[name], mod[name]))) {
+        import.meta.hot.invalidate('module exports changed');
         return;
       }
-      __lithentSafeInvalidate('no components applied');
-    }
-  });
-
-  import.meta.hot.dispose(data => {
-    data.counterBoundary = counterBoundary;
-
-    if (disposeApp) {
-      data.disposeApp = disposeApp;
-    }
-
-    if (__lithentGlobalStore) {
-      __lithentGlobalStore[__lithentBoundaryStoreKey] = counterBoundary;
-
-      if (disposeApp) {
-        __lithentGlobalStore[__lithentDisposeStoreKey] = disposeApp;
+      for (const name of Object.keys(current)) {
+        const entry = current[name];
+        // Existing imports and future parent redraws keep the stable proxy.
+        if (!entry.boundary.update(entry.component)) {
+          __lithentResetInvalidateCount(name);
+        }
       }
-
-      // Reset invalidate count on dispose to allow fresh attempts on next load
+      // An unmounted component is a valid update: its proxy is already refreshed.
       __lithentResetInvalidateCount();
+    });
+  }
+  import.meta.hot.dispose(data => {
+    data.components = __lithentModuleHotStore;
+    data.currentComponents = undefined;
+    data.renderDisposers = __lithentRenderDisposers;
+    // Keep the failure count across invalidation-driven module replacements.
+  });
+  import.meta.hot.prune(() => {
+    // App disposers need the live component map to locate the current root.
+    for (const dispose of __lithentRenderDisposers.values()) dispose();
+    __lithentRenderDisposers.clear();
+    for (const [name, entry] of Object.entries(__lithentModuleHotStore)) {
+      entry.boundary.dispose();
+      __lithentResetInvalidateCount(name);
     }
+    __lithentResetInvalidateCount();
   });
 };
-
 __lithentSetupHmrHooks();
 `;
 };

package/src/tests/bootstrap.test.ts

@@ -0,0 +1,312 @@
+// @vitest-environment node
+import { describe, expect, it, vi } from 'vitest';
+import { transformWithEsbuild } from 'vite';
+import { transformWithoutMarker } from '../noMarkerParse';
+
+const compile = async (source: string) => {
+  const transformed = transformWithoutMarker({
+    code: source,
+    boundaryImportSpecifier: 'lithent/devHelper',
+    tagFunctionImportSpecifier: 'lithent',
+  });
+  return (
+    await transformWithEsbuild(
+      transformed.code.replaceAll('import.meta', '__meta'),
+      'Component.tsx',
+      { format: 'cjs', jsx: 'automatic', jsxImportSource: 'lithent' }
+    )
+  ).code;
+};
+
+const runtime = () => {
+  const data: Record<string, any> = {};
+  const boundaries = new Map<string, any>();
+  const hot = {
+    data,
+    accept: vi.fn(),
+    dispose: vi.fn(),
+    prune: vi.fn(),
+    invalidate: vi.fn(),
+  };
+  const createBoundary = vi.fn(
+    (id: string, failure: (reason: string) => void, applied: () => void) => {
+      const boundary = {
+        register: vi.fn(() => vi.fn()),
+        update: vi.fn(() => true),
+        dispose: vi.fn(),
+        failure,
+        applied,
+      };
+      boundaries.set(id, boundary);
+      return boundary;
+    }
+  );
+  const libraries: Record<string, any> = {
+    lithent: {
+      getComponentKey: () => null,
+      mountCallback: vi.fn(),
+      componentMap: new WeakMap(),
+      render: vi.fn(() => vi.fn()),
+    },
+    'lithent/devHelper': { createBoundary },
+    'lithent/jsx-runtime': {
+      jsx: (tag: string, props: any) => ({ tag, ...props }),
+    },
+  };
+  const load = async (
+    source: string,
+    url = 'http://localhost/Component.tsx',
+    hmr = true
+  ) => {
+    const exports = {};
+    const module = { exports };
+    new Function(
+      'require',
+      'module',
+      'exports',
+      '__meta',
+      await compile(source)
+    )((name: string) => libraries[name], module, exports, {
+      url,
+      hot: hmr ? hot : undefined,
+    });
+    return module.exports as Record<string, any>;
+  };
+  return { hot, load, boundaries, createBoundary, libraries };
+};
+
+const badge = (label: string) =>
+  `export const Badge = () => <span>${label}</span>;`;
+
+describe('HMR component proxies and invalidation budget', () => {
+  it('refreshes existing imports and keeps per-component identities', async () => {
+    const r = runtime();
+    const first = await r.load(
+      badge('first') + '\nexport const Card = () => <div/>;'
+    );
+    const accept = r.hot.accept.mock.calls[0][0];
+    r.hot.dispose.mock.calls[0][0](r.hot.data);
+    const next = await r.load(
+      badge('next') + '\nexport const Card = () => <article/>;',
+      'http://localhost/Component.tsx?t=1'
+    );
+    accept(next);
+    expect(next.Badge).toBe(first.Badge);
+    expect(next.Card).toBe(first.Card);
+    expect(first.Badge({}, [])).toEqual({ tag: 'span', children: 'next' });
+    expect(first.Card({}, [])).toEqual({ tag: 'article' });
+    expect(r.createBoundary).toHaveBeenCalledTimes(2);
+    expect(
+      r.boundaries.get('/Component.tsx#Badge').update
+    ).toHaveBeenCalledTimes(1);
+    expect(
+      r.boundaries.get('/Component.tsx#Card').update
+    ).toHaveBeenCalledTimes(1);
+    expect(r.hot.invalidate).not.toHaveBeenCalled();
+  });
+
+  it('does not reset failed replacement counts on dispose or sibling success', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    const r = runtime();
+    const url = 'http://localhost/failure-budget.tsx';
+    let exports = await r.load(
+      badge('first') + '\nexport const Card = () => <div/>;',
+      url
+    );
+    const boundary = r.boundaries.get('/failure-budget.tsx#Badge');
+    for (let i = 0; i < 6; i++) {
+      const accept = r.hot.accept.mock.lastCall![0];
+      r.hot.dispose.mock.lastCall![0](r.hot.data);
+      exports = await r.load(
+        badge('next') + '\nexport const Card = () => <div/>;',
+        url + '?t=' + i
+      );
+      accept(exports);
+      r.boundaries.get('/failure-budget.tsx#Card').applied();
+      boundary.failure('failed DOM');
+    }
+    expect(r.hot.invalidate).toHaveBeenCalledTimes(2);
+    boundary.applied();
+    boundary.failure('after recovery');
+    expect(r.hot.invalidate).toHaveBeenCalledTimes(3);
+    r.hot.prune.mock.lastCall![0]();
+    warn.mockRestore();
+  });
+
+  it('invalidates removed components instead of accepting stale registrations', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    const r = runtime();
+    await r.load(badge('first'), 'http://localhost/removed.tsx');
+    const accept = r.hot.accept.mock.lastCall![0];
+    r.hot.dispose.mock.lastCall![0](r.hot.data);
+    const next = await r.load(
+      'export const value = 1;',
+      'http://localhost/removed.tsx?t=1'
+    );
+    accept(next);
+    expect(r.hot.invalidate).toHaveBeenCalledTimes(1);
+    expect(
+      r.boundaries.get('/removed.tsx#Badge').update
+    ).not.toHaveBeenCalled();
+    r.hot.prune.mock.lastCall![0]();
+    warn.mockRestore();
+  });
+
+  it('keeps meaningful URL queries distinct while discarding HMR timestamps', async () => {
+    const first = runtime();
+    const second = runtime();
+    await first.load(
+      badge('first'),
+      'http://localhost/Component.tsx?variant=one&t=1'
+    );
+    await second.load(
+      badge('second'),
+      'http://localhost/Component.tsx?variant=two&t=2'
+    );
+    expect([...first.boundaries.keys()]).toEqual([
+      '/Component.tsx?variant=one#Badge',
+    ]);
+    expect([...second.boundaries.keys()]).toEqual([
+      '/Component.tsx?variant=two#Badge',
+    ]);
+  });
+
+  it('propagates changed non-component exports and export aliases', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    for (const nextSource of [
+      badge('next') + '\nexport const value = 2;',
+      badge('next') + '\nexport const value = 1; export {Badge as NewName};',
+      badge('next') + '\nexport const value = 1;',
+    ]) {
+      const r = runtime();
+      await r.load(
+        badge('first') + '\nexport const value = 1; export {Badge as OldName};'
+      );
+      const accept = r.hot.accept.mock.lastCall![0];
+      r.hot.dispose.mock.lastCall![0](r.hot.data);
+      accept(await r.load(nextSource));
+      expect(r.hot.invalidate).toHaveBeenCalledTimes(1);
+      expect(
+        r.boundaries.get('/Component.tsx#Badge').update
+      ).not.toHaveBeenCalled();
+      r.hot.prune.mock.lastCall![0]();
+    }
+    warn.mockRestore();
+  });
+
+  it('accepts component edits with unchanged primitive exports', async () => {
+    const r = runtime();
+    await r.load(badge('first') + '\nexport const value = 1;');
+    const accept = r.hot.accept.mock.lastCall![0];
+    r.hot.dispose.mock.lastCall![0](r.hot.data);
+    accept(await r.load(badge('next') + '\nexport const value = 1;'));
+    expect(r.hot.invalidate).not.toHaveBeenCalled();
+    expect(
+      r.boundaries.get('/Component.tsx#Badge').update
+    ).toHaveBeenCalledTimes(1);
+  });
+
+  it('keeps propagating intentional export changes beyond the failure retry limit', async () => {
+    const r = runtime();
+    await r.load(badge('first') + '\nexport const value = 0;');
+    for (let value = 1; value <= 5; value++) {
+      const accept = r.hot.accept.mock.lastCall![0];
+      r.hot.dispose.mock.lastCall![0](r.hot.data);
+      accept(await r.load(badge('next') + `\nexport const value = ${value};`));
+    }
+    expect(r.hot.invalidate).toHaveBeenCalledTimes(5);
+    r.hot.prune.mock.lastCall![0]();
+  });
+
+  it('wraps hoisted functions before their first top-level use', async () => {
+    const r = runtime();
+    const first = await r.load(`
+export const reference = Badge;
+export function Badge() {return <span>first</span>;}
+`);
+    const accept = r.hot.accept.mock.lastCall![0];
+    r.hot.dispose.mock.lastCall![0](r.hot.data);
+    const next = await r.load(`
+export const reference = Badge;
+export function Badge() {return <span>next</span>;}
+`);
+    accept(next);
+    expect(first.reference).toBe(first.Badge);
+    expect(first.reference({}, []).children).toBe('next');
+  });
+
+  it('keeps every top-level app mount, guards aliases, and leaves function mounts repeatable', async () => {
+    const r = runtime();
+    const source = `
+import {render as attach} from 'lithent';
+export const Badge = () => <span/>;
+attach(Badge, 'first');
+attach(Badge, 'second');
+export function attachMore(target) {return attach(Badge, target);}
+`;
+    const first = await r.load(source);
+    const renderer = r.libraries.lithent.render;
+    expect(renderer).toHaveBeenCalledTimes(2);
+    const firstDispose = renderer.mock.results[0].value;
+    const secondDispose = renderer.mock.results[1].value;
+    first.attachMore('third');
+    first.attachMore('fourth');
+    expect(renderer).toHaveBeenCalledTimes(4);
+    r.hot.dispose.mock.lastCall![0](r.hot.data);
+    await r.load(source);
+    expect(renderer).toHaveBeenCalledTimes(4);
+    r.hot.prune.mock.lastCall![0]();
+    expect(firstDispose).toHaveBeenCalledTimes(1);
+    expect(secondDispose).toHaveBeenCalledTimes(1);
+    expect(firstDispose.mock.invocationCallOrder[0]).toBeLessThan(
+      r.boundaries.get('/Component.tsx#Badge').dispose.mock
+        .invocationCallOrder[0]
+    );
+  });
+
+  it('preserves ordinary render helpers, local boundary helpers and SSR mounts', async () => {
+    const r = runtime();
+    const source = `
+import {render as attach} from 'lithent';
+const createBoundary = () => 'local';
+function render(value) {return value;}
+export const Badge = () => <span/>;
+export const result = render(createBoundary());
+attach(Badge, 'first');
+attach(Badge, 'second');
+`;
+    const first = await r.load(source, undefined, false);
+    expect(first.result).toBe('local');
+    expect(r.libraries.lithent.render).toHaveBeenCalledTimes(2);
+    expect(r.hot.accept).not.toHaveBeenCalled();
+    expect(r.createBoundary).not.toHaveBeenCalled();
+  });
+
+  it('registers direct calls to rerender their caller and rendered tags to replace themselves', async () => {
+    const r = runtime();
+    const exports = await r.load(`
+export const Badge = ({label}) => <span>{label}</span>;
+export const Parent = props => <div>{Badge(props)}</div>;
+`);
+    const parentKey = { label: 'direct' };
+    let key = parentKey;
+    r.libraries.lithent.getComponentKey = () => key;
+    r.libraries.lithent.componentMap.set(key, { ctor: exports.Parent });
+    expect(exports.Parent(key, []).children.children).toBe('direct');
+    expect(
+      r.boundaries.get('/Component.tsx#Parent').register
+    ).toHaveBeenCalledTimes(1);
+    expect(
+      r.boundaries.get('/Component.tsx#Badge').register
+    ).toHaveBeenCalledWith(parentKey, exports.Parent);
+    key = { label: 'rendered' };
+    r.libraries.lithent.componentMap.set(key, { ctor: exports.Badge });
+    expect(exports.Badge(key, []).children).toBe('rendered');
+    expect(
+      r.boundaries.get('/Component.tsx#Badge').register
+    ).toHaveBeenCalledTimes(2);
+    expect(
+      r.boundaries.get('/Component.tsx#Badge').register
+    ).toHaveBeenLastCalledWith(key, undefined);
+  });
+});