@absolutejs/absolute 0.19.0-beta.886 → 0.19.0-beta.888

package/dist/index.js

@@ -9829,7 +9829,8 @@ var init_angularLinkerPlugin = __esm(() => {
 // src/dev/angular/hmrInjectionPlugin.ts
 var exports_hmrInjectionPlugin = {};
 __export(exports_hmrInjectionPlugin, {
-  createAngularHmrInjectionPlugin: () => createAngularHmrInjectionPlugin
+  createAngularHmrInjectionPlugin: () => createAngularHmrInjectionPlugin,
+  applyAngularHmrInjection: () => applyAngularHmrInjection
 });
 import { readFile as readFile5 } from "fs/promises";
 import { relative as relative6, resolve as resolve15 } from "path";
@@ -9993,50 +9994,53 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, TOP_LEVEL_DECL_RE, extractAllTopLevelNames =
     });
   }
 }
-`, createAngularHmrInjectionPlugin = (params) => {
+`, applyAngularHmrInjection = (jsSource, componentJsAbsPath, params) => {
   const { generatedAngularRoot, userAngularRoot, projectRoot } = params;
   const normalizedGenRoot = resolve15(generatedAngularRoot).replace(/\\/g, "/");
-  return {
-    name: "absolute-angular-hmr-injection",
-    setup(build2) {
-      build2.onLoad({ filter: /\.component\.js$/ }, async (args) => {
-        const normalizedPath = args.path.replace(/\\/g, "/");
-        if (!normalizedPath.startsWith(normalizedGenRoot + "/"))
-          return;
-        const text = await readFile5(args.path, "utf8");
-        const seen = new Set;
-        const classNames = [];
-        let match;
-        const re2 = new RegExp(ENTITY_DECORATOR_RE.source, ENTITY_DECORATOR_RE.flags);
-        while ((match = re2.exec(text)) !== null) {
-          const className = match[1];
-          if (className && !seen.has(className)) {
-            seen.add(className);
-            classNames.push(className);
-          }
-        }
-        if (classNames.length === 0)
-          return;
-        const relFromGenRoot = relative6(generatedAngularRoot, args.path).replace(/\\/g, "/");
-        const userTsPath = resolve15(userAngularRoot, relFromGenRoot.replace(/\.js$/, ".ts"));
-        const projectRel = relative6(projectRoot, userTsPath).replace(/\\/g, "/");
-        const tail = classNames.map((className) => {
-          const id = `${projectRel}@${className}`;
-          return buildHmrTail(className, JSON.stringify(id));
-        }).join("");
-        const topLevelNames = extractAllTopLevelNames(text);
-        const depsKeys = topLevelNames.filter((n) => !classNames.includes(n)).join(", ");
-        const depsBlock = classNames.length > 0 && depsKeys ? `
+  const normalizedPath = componentJsAbsPath.replace(/\\/g, "/");
+  if (!normalizedPath.startsWith(normalizedGenRoot + "/"))
+    return;
+  const seen = new Set;
+  const classNames = [];
+  let match;
+  const re2 = new RegExp(ENTITY_DECORATOR_RE.source, ENTITY_DECORATOR_RE.flags);
+  while ((match = re2.exec(jsSource)) !== null) {
+    const className = match[1];
+    if (className && !seen.has(className)) {
+      seen.add(className);
+      classNames.push(className);
+    }
+  }
+  if (classNames.length === 0)
+    return;
+  const relFromGenRoot = relative6(generatedAngularRoot, componentJsAbsPath).replace(/\\/g, "/");
+  const userTsPath = resolve15(userAngularRoot, relFromGenRoot.replace(/\.js$/, ".ts"));
+  const projectRel = relative6(projectRoot, userTsPath).replace(/\\/g, "/");
+  const tail = classNames.map((className) => {
+    const id = `${projectRel}@${className}`;
+    return buildHmrTail(className, JSON.stringify(id));
+  }).join("");
+  const topLevelNames = extractAllTopLevelNames(jsSource);
+  const depsKeys = topLevelNames.filter((n) => !classNames.includes(n)).join(", ");
+  const depsBlock = classNames.length > 0 && depsKeys ? `
 
 // absolutejs HMR \u2014 Tier 1a class-deps registry
 ` + classNames.map((c) => `try { ${c}.__abs_deps = { ${depsKeys} }; } catch {}`).join(`
 `) + `
 ` : "";
-        return { contents: text + tail + depsBlock, loader: "js" };
-      });
-    }
-  };
-};
+  return jsSource + tail + depsBlock;
+}, createAngularHmrInjectionPlugin = (params) => ({
+  name: "absolute-angular-hmr-injection",
+  setup(build2) {
+    build2.onLoad({ filter: /\.component\.js$/ }, async (args) => {
+      const text = await readFile5(args.path, "utf8");
+      const transformed = applyAngularHmrInjection(text, args.path, params);
+      if (transformed === undefined)
+        return;
+      return { contents: transformed, loader: "js" };
+    });
+  }
+});
 var init_hmrInjectionPlugin = __esm(() => {
   ENTITY_DECORATOR_RE = /([A-Z][A-Za-z0-9_$]*)\s*=\s*__legacyDecorateClassTS[A-Za-z0-9_$]*\s*\(\s*\[[\s\S]*?\b(?:Component|Directive|Pipe|Injectable)[A-Za-z0-9_$]*\s*\(/g;
   IMPORT_RE = /^\s*import\s+(?:(?:(\*)\s+as\s+([A-Za-z_$][\w$]*)\s+from)|(?:([A-Za-z_$][\w$]*)(?:\s*,\s*\{([^}]*)\})?\s+from)|(?:\{([^}]*)\}\s+from))\s*['"][^'"]+['"]/gm;
@@ -15040,13 +15044,14 @@ ${content.slice(firstUseIdx)}`;
   ];
   const reactClientEntryPoints = [...reactEntries];
   const urlReferencedFiles = await urlReferencedFilesPromise;
+  const skipAngularClientBundle = hmr && angularClientPaths.length > 0;
   const nonReactClientEntryPoints = [
     ...svelteIndexPaths,
     ...svelteClientPaths,
     ...htmlEntries,
     ...vueIndexPaths,
     ...vueClientPaths,
-    ...angularClientPaths,
+    ...skipAngularClientBundle ? [] : angularClientPaths,
     ...islandBootstrapPath ? [islandBootstrapPath] : [],
     ...urlReferencedFiles
   ];
@@ -15432,6 +15437,13 @@ ${content.slice(firstUseIdx)}`;
     const fileBase = basename9(serverPath, ".js");
     manifest[toPascal(fileBase)] = serverPath;
   }
+  if (skipAngularClientBundle) {
+    for (const clientPath of angularClientPaths) {
+      const fileBase = basename9(clientPath, ".js");
+      const relFromCwd = relative11(projectRoot, clientPath).replace(/\\/g, "/");
+      manifest[`${toPascal(fileBase)}Index`] = `/@src/${relFromCwd}`;
+    }
+  }
   const shouldCopyHtmx = !isIncremental || normalizedIncrementalFiles?.some((f2) => f2.includes("/htmx/") && f2.endsWith(".html"));
   const shouldUpdateHtmlAssetPaths = !isIncremental || normalizedIncrementalFiles?.some((f2) => f2.includes("/html/") && (f2.endsWith(".html") || isStylePath(f2)));
   const shouldUpdateHtmxAssetPaths = !isIncremental || normalizedIncrementalFiles?.some((f2) => f2.includes("/htmx/") && (f2.endsWith(".html") || isStylePath(f2)));
@@ -17469,10 +17481,31 @@ export default {};
     return;
   const stat3 = statSync2(filePath);
   const resolvedVueDir = vueDir ? resolve31(vueDir) : undefined;
-  const content = REACT_EXTENSIONS.has(ext) ? transformReactFile(filePath, projectRoot, rewriter) : transformPlainFile(filePath, projectRoot, rewriter, resolvedVueDir);
+  let content = REACT_EXTENSIONS.has(ext) ? transformReactFile(filePath, projectRoot, rewriter) : transformPlainFile(filePath, projectRoot, rewriter, resolvedVueDir);
+  const isComponentJs = ext === ".js" && filePath.endsWith(".component.js") && filePath.replace(/\\/g, "/").includes("/.absolutejs/generated/angular/");
+  if (isComponentJs) {
+    const userAngularRoot = await getAngularUserRoot(projectRoot);
+    if (userAngularRoot) {
+      const { applyAngularHmrInjection: applyAngularHmrInjection2 } = await Promise.resolve().then(() => (init_hmrInjectionPlugin(), exports_hmrInjectionPlugin));
+      const { getFrameworkGeneratedDir: getFrameworkGeneratedDir2 } = await Promise.resolve().then(() => (init_generatedDir(), exports_generatedDir));
+      const generatedAngularRoot = getFrameworkGeneratedDir2("angular");
+      const transformed = applyAngularHmrInjection2(content, filePath, {
+        generatedAngularRoot,
+        projectRoot,
+        userAngularRoot
+      });
+      if (transformed !== undefined)
+        content = transformed;
+    }
+  }
   setTransformed(filePath, content, stat3.mtimeMs, extractImportedFiles(content, projectRoot));
   return jsResponse(content);
-}, transformAndCacheSvelte = async (filePath, projectRoot, rewriter, stylePreprocessors) => {
+}, cachedAngularUserRoot, getAngularUserRoot = async (_projectRoot) => {
+  if (cachedAngularUserRoot !== undefined)
+    return cachedAngularUserRoot;
+  cachedAngularUserRoot = configuredAngularUserRoot ?? null;
+  return cachedAngularUserRoot;
+}, configuredAngularUserRoot, transformAndCacheSvelte = async (filePath, projectRoot, rewriter, stylePreprocessors) => {
   const stat3 = statSync2(filePath);
   const content = await transformSvelteFile(filePath, projectRoot, rewriter, stylePreprocessors);
   setTransformed(filePath, content, stat3.mtimeMs, extractImportedFiles(content, projectRoot));
@@ -17491,6 +17524,10 @@ export default {};
 }, createModuleServer = (config) => {
   const { projectRoot, vendorPaths, frameworkDirs, stylePreprocessors } = config;
   const rewriter = buildImportRewriter(vendorPaths);
+  if (frameworkDirs?.angular) {
+    configuredAngularUserRoot = frameworkDirs.angular;
+    cachedAngularUserRoot = undefined;
+  }
   return async (pathname) => {
     if (pathname.startsWith("/@stub/"))
       return handleStubRequest(pathname);
@@ -20307,6 +20344,13 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
     }
     return ctx.debouncedPromise;
   };
+}, runAngularHmrIncremental = async (state) => {
+  try {
+    const { compileAngularForHmr: compileAngularForHmr2 } = await Promise.resolve().then(() => (init_hmrCompiler(), exports_hmrCompiler));
+    await compileAngularForHmr2([], state.resolvedPaths.buildDir, state.lastUserEditedFiles ?? null);
+  } catch (err) {
+    logWarn(`[hmr] surgical-HMR shadow compile skipped: ${err instanceof Error ? err.message : String(err)}`);
+  }
 }, compileAndBundleAngular = async (state, pageEntries, angularDir) => {
   const { compileAngular: compileAngular2 } = await Promise.resolve().then(() => (init_compileAngular(), exports_compileAngular));
   const { clientPaths, serverPaths } = await compileAngular2(pageEntries, angularDir, true, getStyleTransformConfig(state.config));
@@ -20352,19 +20396,15 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
   const runBundle = scheduleAngularBundleRebuild(state, pageEntries, angularDir);
   const queueDescription = (queue) => queue.map((e) => e.className).join(", ");
   if (verdict.tier === 0) {
+    await runAngularHmrIncremental(state);
     broadcastSurgical(state, verdict.queue);
     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") {
+    await runAngularHmrIncremental(state);
     broadcastRemount(state, verdict.queue);
     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)}`);
-    });
   } else if (verdict.tier === 1 && verdict.kind === "rebootstrap") {
     await runBundle({ immediate: true });
     await broadcastRebootstrap(state, verdict.reason);
@@ -30670,5 +30710,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=59FE78EE649876C664756E2164756E21
+//# debugId=4D0BEC65366DBDA064756E2164756E21
 //# sourceMappingURL=index.js.map