@absolutejs/absolute 0.19.0-beta.881 → 0.19.0-beta.884

package/dist/index.js

@@ -9883,6 +9883,15 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, TOP_LEVEL_DECL_RE, extractAllTopLevelNames =
 // patch the prototype, no view recreation needed).
 {
   const __ng_hmr_id = ${encodedIdLiteral};
+  // Per-class sequence counter. Each \`__ng_hmr_load\` /
+  // \`__ng_hmr_remount\` invocation captures \`seq\` at start, then
+  // checks after the async fetch + before the apply. If a NEWER
+  // event has bumped the counter while we were awaiting (rapid
+  // edits), this older invocation aborts so the latest payload
+  // is the one that lands. Without this guard, racing
+  // \`\u0275\u0275replaceMetadata\` calls can complete out of order and an
+  // older edit's def stomps a newer one's.
+  let __ng_hmr_seq = 0;
   // Send a server-side ack so the dev terminal can log the
   // full HMR latency (server compile + WS hop + client apply +
   // CD pulse) rather than just the server-side compile time.
@@ -9902,11 +9911,13 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, TOP_LEVEL_DECL_RE, extractAllTopLevelNames =
     } catch {}
   };
   const __ng_hmr_load = async (t) => {
+    const mySeq = ++__ng_hmr_seq;
     const t0 = performance.now();
     const [u, core] = await Promise.all([
       import('/@ng/component?c=' + encodeURIComponent(__ng_hmr_id) + '&t=' + t),
       import('@angular/core')
     ]);
+    if (mySeq !== __ng_hmr_seq) return; // superseded by a newer event
     if (!u || typeof u.default !== 'function') return;
     if (${className}.\u0275cmp && typeof core.\u0275\u0275replaceMetadata === 'function') {
       try {
@@ -9940,11 +9951,13 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, TOP_LEVEL_DECL_RE, extractAllTopLevelNames =
   // shared implementation is on \`globalThis.__absAngularRemount\` \u2014
   // installed by hmrClient.ts's import-time wiring.
   const __ng_hmr_remount = async (t) => {
+    const mySeq = ++__ng_hmr_seq;
     const t0 = performance.now();
     const [u, core] = await Promise.all([
       import('/@ng/component?c=' + encodeURIComponent(__ng_hmr_id) + '&t=' + t),
       import('@angular/core')
     ]);
+    if (mySeq !== __ng_hmr_seq) return; // superseded by a newer event
     if (!u || typeof u.default !== 'function') return;
     if (typeof globalThis.__absAngularRemount === 'function' && ${className}.\u0275cmp) {
       try {
@@ -9956,6 +9969,7 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, TOP_LEVEL_DECL_RE, extractAllTopLevelNames =
           core,
           ${JSON.stringify(className)}
         );
+        if (mySeq !== __ng_hmr_seq) return; // newer event arrived during remount
         __ng_hmr_ack('tier-1a', performance.now() - t0);
       } catch (err) {
         console.error('[abs-hmr] remount threw for ${className}:', err);
@@ -17623,7 +17637,8 @@ var init_rewriteImports = __esm(() => {
 // src/dev/angular/resolveOwningComponents.ts
 var exports_resolveOwningComponents = {};
 __export(exports_resolveOwningComponents, {
-  resolveOwningComponents: () => resolveOwningComponents
+  resolveOwningComponents: () => resolveOwningComponents,
+  invalidateResourceIndex: () => invalidateResourceIndex
 });
 import { readdirSync as readdirSync2, readFileSync as readFileSync19, statSync as statSync3 } from "fs";
 import { dirname as dirname18, extname as extname9, join as join29, resolve as resolve32 } from "path";
@@ -17754,27 +17769,42 @@ var ENTITY_DECORATORS, isAngularSourceFile = (file5) => file5.endsWith(".ts") ||
   }
   if (!rootStat.isDirectory())
     return out;
+  const index = getOrBuildResourceIndex(userAngularRoot);
+  const owners = index.get(changedAbs);
+  if (owners) {
+    out.push(...owners);
+  }
+  return out;
+}, resourceIndexByRoot, getOrBuildResourceIndex = (userAngularRoot) => {
+  const cached = resourceIndexByRoot.get(userAngularRoot);
+  if (cached)
+    return cached;
+  const index = new Map;
   for (const tsPath of walkAngularSourceFiles(userAngularRoot)) {
     const classes = parseDecoratedClasses(tsPath);
     const componentDir = dirname18(tsPath);
-    const matchesResource = (relativeUrl) => {
-      const abs = safeNormalize(resolve32(componentDir, relativeUrl));
-      return abs === changedAbs;
-    };
     for (const cls of classes) {
       if (cls.kind !== "component")
         continue;
-      const referencesChanged = cls.templateUrls.some(matchesResource) || cls.styleUrls.some(matchesResource);
-      if (!referencesChanged)
-        continue;
-      out.push({
+      const owner = {
         className: cls.className,
         componentFilePath: tsPath,
         kind: "component"
-      });
+      };
+      for (const url of [...cls.templateUrls, ...cls.styleUrls]) {
+        const abs = safeNormalize(resolve32(componentDir, url));
+        const existing = index.get(abs);
+        if (existing)
+          existing.push(owner);
+        else
+          index.set(abs, [owner]);
+      }
     }
   }
-  return out;
+  resourceIndexByRoot.set(userAngularRoot, index);
+  return index;
+}, invalidateResourceIndex = () => {
+  resourceIndexByRoot.clear();
 };
 var init_resolveOwningComponents = __esm(() => {
   ENTITY_DECORATORS = {
@@ -17783,6 +17813,7 @@ var init_resolveOwningComponents = __esm(() => {
     Pipe: "pipe",
     Injectable: "service"
   };
+  resourceIndexByRoot = new Map;
 });
 
 // src/dev/angular/hmrImportGenerator.ts
@@ -20099,21 +20130,51 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
   const clientManifest = generateManifest2(clientResult.outputs, buildDir);
   Object.assign(state.manifest, clientManifest);
   await populateAssetStore(state.assetStore, clientManifest, buildDir);
+}, angularDispatcherModules = null, loadAngularDispatcherModules = async () => {
+  if (angularDispatcherModules)
+    return angularDispatcherModules;
+  const [resolveMod, hmrMod, fastMod] = await Promise.all([
+    Promise.resolve().then(() => (init_resolveOwningComponents(), exports_resolveOwningComponents)),
+    Promise.resolve().then(() => (init_hmrCompiler(), exports_hmrCompiler)),
+    Promise.resolve().then(() => (init_fastHmrCompiler(), exports_fastHmrCompiler))
+  ]);
+  angularDispatcherModules = {
+    encodeHmrComponentId: hmrMod.encodeHmrComponentId,
+    invalidateResourceIndex: resolveMod.invalidateResourceIndex,
+    resolveOwningComponents: resolveMod.resolveOwningComponents,
+    tryFastHmr: fastMod.tryFastHmr
+  };
+  return angularDispatcherModules;
 }, decideAngularTier = async (state, angularDir) => {
   const userEdited = state.lastUserEditedFiles ?? new Set;
   if (userEdited.size === 0)
     return { queue: [], tier: 0 };
-  const { resolveOwningComponents: resolveOwningComponents2 } = await Promise.resolve().then(() => (init_resolveOwningComponents(), exports_resolveOwningComponents));
-  const { encodeHmrComponentId: encodeHmrComponentId2 } = await Promise.resolve().then(() => (init_hmrCompiler(), exports_hmrCompiler));
-  const { tryFastHmr: tryFastHmr2 } = await Promise.resolve().then(() => (init_fastHmrCompiler(), exports_fastHmrCompiler));
+  const importsStart = performance.now();
+  const {
+    resolveOwningComponents: resolveOwningComponents2,
+    invalidateResourceIndex: invalidateResourceIndex2,
+    encodeHmrComponentId: encodeHmrComponentId2,
+    tryFastHmr: tryFastHmr2
+  } = await loadAngularDispatcherModules();
+  const importsMs = performance.now() - importsStart;
+  for (const editedFile of userEdited) {
+    if (editedFile.endsWith(".ts") || editedFile.endsWith(".tsx")) {
+      invalidateResourceIndex2();
+      break;
+    }
+  }
   const queue = [];
   const queueIds = new Set;
   let anyFingerprintChanged = false;
+  let totalResolveMs = 0;
+  let totalCompileMs = 0;
   for (const editedFile of userEdited) {
+    const resolveStart = performance.now();
     const owners = resolveOwningComponents2({
       changedFilePath: editedFile,
       userAngularRoot: angularDir
     });
+    totalResolveMs += performance.now() - resolveStart;
     if (owners.length === 0 && (editedFile.endsWith(".component.ts") || editedFile.endsWith(".directive.ts") || editedFile.endsWith(".pipe.ts") || editedFile.endsWith(".service.ts"))) {
       return {
         kind: "rebootstrap",
@@ -20125,11 +20186,13 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
       const id = encodeHmrComponentId2(componentFilePath, className);
       if (queueIds.has(id))
         continue;
+      const compileStart = performance.now();
       const result = await tryFastHmr2({
         className,
         componentFilePath,
         kind
       });
+      totalCompileMs += performance.now() - compileStart;
       if (!result.ok) {
         return {
           kind: "rebootstrap",
@@ -20144,10 +20207,15 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
       queue.push({ className, id });
     }
   }
+  const breakdown = {
+    importsMs: Math.round(importsMs),
+    resolveMs: Math.round(totalResolveMs),
+    compileMs: Math.round(totalCompileMs)
+  };
   if (anyFingerprintChanged) {
-    return { kind: "remount", queue, tier: 1 };
+    return { breakdown, kind: "remount", queue, tier: 1 };
   }
-  return { queue, tier: 0 };
+  return { breakdown, queue, tier: 0 };
 }, broadcastSurgical = (state, queue) => {
   const timestamp = Date.now();
   for (const { id } of queue) {
@@ -20227,13 +20295,15 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
   const queueDescription = (queue) => queue.map((e) => e.className).join(", ");
   if (verdict.tier === 0) {
     broadcastSurgical(state, verdict.queue);
-    logInfo(`[ng-hmr] tier-0 ${queueDescription(verdict.queue)} (server ${tierMs}ms; awaiting client apply)`);
+    const b2 = verdict.breakdown;
+    logInfo(`[ng-hmr] tier-0 ${queueDescription(verdict.queue)} (server ${tierMs}ms: imports ${b2.importsMs}/resolve ${b2.resolveMs}/compile ${b2.compileMs}; awaiting client apply)`);
     runBundle().catch((err) => {
       logWarn(`[ng-hmr async bundle] rebuild failed: ${err instanceof Error ? err.message : String(err)}`);
     });
   } else if (verdict.tier === 1 && verdict.kind === "remount") {
     broadcastRemount(state, verdict.queue);
-    logInfo(`[ng-hmr] tier-1a remount ${queueDescription(verdict.queue)} (server ${tierMs}ms; awaiting client apply)`);
+    const b2 = verdict.breakdown;
+    logInfo(`[ng-hmr] tier-1a remount ${queueDescription(verdict.queue)} (server ${tierMs}ms: imports ${b2.importsMs}/resolve ${b2.resolveMs}/compile ${b2.compileMs}; awaiting client apply)`);
     runBundle().catch((err) => {
       logWarn(`[ng-hmr async bundle] rebuild failed: ${err instanceof Error ? err.message : String(err)}`);
     });
@@ -30541,5 +30611,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=95397A3CB2938E4164756E2164756E21
+//# debugId=8DCA359899760D3964756E2164756E21
 //# sourceMappingURL=index.js.map