@absolutejs/absolute 0.19.0-beta.951 → 0.19.0-beta.953

package/dist/index.js

@@ -8686,11 +8686,22 @@ var init_startupTimings = __esm(() => {
 var exports_devRouteRegistrationCallsite = {};
 __export(exports_devRouteRegistrationCallsite, {
   patchElysiaRouteRegistrationCallsites: () => patchElysiaRouteRegistrationCallsites,
+  isPageHandler: () => isPageHandler,
   getCurrentRouteRegistrationCallsite: () => getCurrentRouteRegistrationCallsite
 });
 import { AsyncLocalStorage } from "async_hooks";
 import { Elysia } from "elysia";
-var ROUTE_CALLSITE_STORAGE_KEY, ROUTE_CALLSITE_PATCHED_KEY, ROUTE_METHOD_NAMES, isObjectRecord3 = (value) => Boolean(value) && typeof value === "object", isAsyncLocalStorage2 = (value) => isObjectRecord3(value) && ("getStore" in value) && typeof value.getStore === "function" && ("run" in value) && typeof value.run === "function", isRouteMethod = (value) => typeof value === "function", getRouteCallsiteStorage = () => {
+var ROUTE_CALLSITE_STORAGE_KEY, ROUTE_CALLSITE_PATCHED_KEY, ROUTE_METHOD_NAMES, PAGE_HANDLER_NAMES, pageHandlerWrappers, handlerSourceMentionsPageHelper = (handler) => {
+  const source = handler.toString();
+  return PAGE_HANDLER_NAMES.some((name) => source.includes(name));
+}, isPageHandler = (handler) => {
+  if (typeof handler !== "function")
+    return false;
+  const fn2 = handler;
+  if (pageHandlerWrappers.has(fn2))
+    return true;
+  return handlerSourceMentionsPageHelper(fn2);
+}, isObjectRecord3 = (value) => Boolean(value) && typeof value === "object", isAsyncLocalStorage2 = (value) => isObjectRecord3(value) && ("getStore" in value) && typeof value.getStore === "function" && ("run" in value) && typeof value.run === "function", isRouteMethod = (value) => typeof value === "function", getRouteCallsiteStorage = () => {
   const value = Reflect.get(globalThis, ROUTE_CALLSITE_STORAGE_KEY);
   if (value === null || typeof value === "undefined") {
     return;
@@ -8723,13 +8734,13 @@ var ROUTE_CALLSITE_STORAGE_KEY, ROUTE_CALLSITE_PATCHED_KEY, ROUTE_METHOD_NAMES,
   return function wrappedRouteHandler(...args) {
     return storage.run({ callsite }, () => Reflect.apply(routeHandler, this, args));
   };
-}, createPatchedRouteMethod = (originalMethod) => function patchedRouteMethod(path, handler, ...rest) {
+}, createPatchedRouteMethod = (originalMethod, methodName) => function patchedRouteMethod(path, handler, ...rest) {
   const callsite = captureRouteRegistrationCallsite();
-  return Reflect.apply(originalMethod, this, [
-    path,
-    wrapRouteHandlerWithCallsite(handler, callsite),
-    ...rest
-  ]);
+  const wrapped = wrapRouteHandlerWithCallsite(handler, callsite);
+  if (methodName === "get" && typeof handler === "function" && typeof wrapped === "function" && handlerSourceMentionsPageHelper(handler)) {
+    pageHandlerWrappers.add(wrapped);
+  }
+  return Reflect.apply(originalMethod, this, [path, wrapped, ...rest]);
 }, getCurrentRouteRegistrationCallsite = () => getRouteCallsiteStorage()?.getStore()?.callsite, patchElysiaRouteRegistrationCallsites = () => {
   if (false) {}
   if (Reflect.get(globalThis, ROUTE_CALLSITE_PATCHED_KEY) === true) {
@@ -8740,7 +8751,7 @@ var ROUTE_CALLSITE_STORAGE_KEY, ROUTE_CALLSITE_PATCHED_KEY, ROUTE_METHOD_NAMES,
     const originalMethod = Reflect.get(prototype, methodName);
     if (!isRouteMethod(originalMethod))
       return;
-    Reflect.set(prototype, methodName, createPatchedRouteMethod(originalMethod));
+    Reflect.set(prototype, methodName, createPatchedRouteMethod(originalMethod, methodName));
   });
   Reflect.set(globalThis, ROUTE_CALLSITE_PATCHED_KEY, true);
 };
@@ -8757,6 +8768,15 @@ var init_devRouteRegistrationCallsite = __esm(() => {
     "post",
     "put"
   ];
+  PAGE_HANDLER_NAMES = [
+    "handleReactPageRequest",
+    "handleSveltePageRequest",
+    "handleVuePageRequest",
+    "handleAngularPageRequest",
+    "handleHTMLPageRequest",
+    "handleHTMXPageRequest"
+  ];
+  pageHandlerWrappers = new WeakSet;
 });
 
 // src/utils/startupBanner.ts
@@ -11976,6 +11996,24 @@ var init_compileVue = __esm(() => {
   vueHmrMetadata = new Map;
 });
 
+// src/build/rewriteProvideRouter.ts
+var ROUTER_IMPORT_PATTERN, PROVIDE_ROUTER_CALL_PATTERN, CAPTURE_IMPORT_STATEMENT = `import { __abs_provideRouter } from '@absolutejs/absolute/angular';
+`, SHIM_MARKER = "__abs_provideRouter", rewriteAngularProvideRouter = (source) => {
+  if (source.includes(SHIM_MARKER))
+    return source;
+  if (!ROUTER_IMPORT_PATTERN.test(source))
+    return source;
+  if (!PROVIDE_ROUTER_CALL_PATTERN.test(source))
+    return source;
+  PROVIDE_ROUTER_CALL_PATTERN.lastIndex = 0;
+  const rewritten = source.replace(PROVIDE_ROUTER_CALL_PATTERN, "__abs_provideRouter(");
+  return `${CAPTURE_IMPORT_STATEMENT}${rewritten}`;
+};
+var init_rewriteProvideRouter = __esm(() => {
+  ROUTER_IMPORT_PATTERN = /import\s*(?:type\s+)?\{[^}]*\bprovideRouter\b[^}]*\}\s*from\s*['"]@angular\/router['"]/;
+  PROVIDE_ROUTER_CALL_PATTERN = /\bprovideRouter\s*\(/g;
+});
+
 // src/angular/lowerDeferSyntax.ts
 var isInterpolatedExpressionStart = (value, index) => value[index] === "{" && value[index + 1] === "{", skipInterpolatedExpression = (value, start) => {
   const cursor = start + 2;
@@ -12671,9 +12709,11 @@ var traceAngularPhase = async (name, fn2, metadata2) => {
   return candidates.map((candidate) => resolve24(candidate)).find((candidate) => existsSync18(candidate) && !candidate.endsWith(".d.ts")) ?? null;
 }, readFileForAotTransform = async (fileName, readFile6) => {
   const hostSource = readFile6?.(fileName);
-  if (typeof hostSource === "string")
-    return hostSource;
-  return fs.readFile(fileName, "utf-8");
+  if (typeof hostSource === "string") {
+    return rewriteAngularProvideRouter(hostSource);
+  }
+  const raw = await fs.readFile(fileName, "utf-8");
+  return rewriteAngularProvideRouter(raw);
 }, safeStableStringify = (value) => {
   const seen = new WeakSet;
   return JSON.stringify(value, (_key, entry) => {
@@ -13267,6 +13307,7 @@ ${fields}
     if (!existsSync18(actualPath))
       return;
     let sourceCode = await fs.readFile(actualPath, "utf-8");
+    sourceCode = rewriteAngularProvideRouter(sourceCode);
     const inlined = await inlineResources(sourceCode, dirname15(actualPath), stylePreprocessors);
     sourceCode = inlineTemplateAndLowerDeferSync(inlined.source, dirname15(actualPath)).source;
     const inputDir = dirname15(actualPath);
@@ -13640,6 +13681,7 @@ if (pageHasRawStreamingSlots) {
   };
 };
 var init_compileAngular = __esm(() => {
+  init_rewriteProvideRouter();
   init_constants();
   init_sourceMetadata();
   init_lowerDeferSyntax();
@@ -25578,6 +25620,29 @@ var init_imageOptimizer = __esm(() => {
   avifInProgress = new Set;
 });
 
+// src/utils/spaRouteEnumeration.ts
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "async_hooks";
+var STORAGE_KEY, isObjectRecord4 = (value) => Boolean(value) && typeof value === "object", isStorage = (value) => isObjectRecord4(value) && typeof value.getStore === "function" && typeof value.run === "function", getStorage = () => {
+  const existing = Reflect.get(globalThis, STORAGE_KEY);
+  if (isStorage(existing))
+    return existing;
+  const fresh = new AsyncLocalStorage2;
+  Reflect.set(globalThis, STORAGE_KEY, fresh);
+  return fresh;
+}, isCollectingSpaRoutes = () => getStorage().getStore() !== undefined, recordSpaRoutes = (entries) => {
+  const store = getStorage().getStore();
+  if (!store)
+    return;
+  store.entries.push(...entries);
+}, collectSpaRoutes = async (task) => {
+  const store = { entries: [] };
+  await getStorage().run(store, task);
+  return store.entries;
+};
+var init_spaRouteEnumeration = __esm(() => {
+  STORAGE_KEY = Symbol.for("absolutejs.spaRouteEnumerationStorage");
+});
+
 // src/utils/generateSitemap.ts
 var exports_generateSitemap = {};
 __export(exports_generateSitemap, {
@@ -25592,11 +25657,6 @@ var DEFAULT_PRIORITY = 0.8, escapeXml = (str) => str.replace(/&/g, "&").repl
       return true;
   }
   return false;
-}, PAGE_HANDLER_NAMES, isPageHandler = (handler) => {
-  if (typeof handler !== "function")
-    return false;
-  const source = handler.toString();
-  return PAGE_HANDLER_NAMES.some((name) => source.includes(name));
 }, discoverPageRoutes = (routes, exclude) => {
   const seen = new Set;
   return routes.filter((route) => {
@@ -25612,55 +25672,105 @@ var DEFAULT_PRIORITY = 0.8, escapeXml = (str) => str.replace(/&/g, "&").repl
       return false;
     seen.add(route.path);
     return true;
-  }).map((route) => route.path);
-}, buildSitemapXml = (pageRoutes, baseUrl, config) => {
+  });
+}, joinMountAndSubPath = (mount, sub) => {
+  const trimmedMount = mount.replace(/\/+$/, "");
+  const trimmedSub = sub.replace(/^\/+/, "");
+  if (!trimmedSub)
+    return trimmedMount || "/";
+  if (!trimmedMount)
+    return `/${trimmedSub}`;
+  return `${trimmedMount}/${trimmedSub}`;
+}, buildSitemapXml = (entries, baseUrl, config) => {
   const normalizedBase = baseUrl.replace(/\/$/, "");
-  const entries = [];
-  for (const path of pageRoutes) {
-    const override = config.overrides?.[path];
-    const changefreq = override?.changefreq ?? config.defaultChangefreq ?? "weekly";
-    const priority = override?.priority ?? config.defaultPriority ?? DEFAULT_PRIORITY;
-    const lastmod = override?.lastmod;
-    const url = escapeXml(`${normalizedBase}${path}`);
-    let entry = `  <url>
+  const xml = [];
+  for (const entry of entries) {
+    const override = config.overrides?.[entry.path];
+    const changefreq = override?.changefreq ?? entry.changefreq ?? config.defaultChangefreq ?? "weekly";
+    const priority = override?.priority ?? entry.priority ?? config.defaultPriority ?? DEFAULT_PRIORITY;
+    const lastmod = override?.lastmod ?? entry.lastmod;
+    const url = escapeXml(`${normalizedBase}${entry.path}`);
+    let urlBlock = `  <url>
     <loc>${url}</loc>`;
     if (lastmod)
-      entry += `
+      urlBlock += `
     <lastmod>${lastmod}</lastmod>`;
-    entry += `
+    urlBlock += `
     <changefreq>${changefreq}</changefreq>`;
-    entry += `
+    urlBlock += `
     <priority>${priority}</priority>`;
-    entry += `
+    urlBlock += `
   </url>`;
-    entries.push(entry);
+    xml.push(urlBlock);
   }
   return [
     '<?xml version="1.0" encoding="UTF-8"?>',
     '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">',
-    ...entries,
+    ...xml,
     "</urlset>"
   ].join(`
 `);
-}, generateSitemap = async (routes, serverUrl, outDir, config = {}) => {
+}, resolveSpaEntryMetadata = (entry) => {
+  if (!entry.sitemap || typeof entry.sitemap !== "object")
+    return {};
+  return {
+    changefreq: entry.sitemap.changefreq,
+    lastmod: entry.sitemap.lastmod,
+    priority: entry.sitemap.priority
+  };
+}, collectPageSubRoutes = async (app, route, serverUrl) => {
+  const request = new Request(`${serverUrl}${route.path}`, {
+    headers: { "x-absolutejs-enumeration": "1" },
+    method: "GET"
+  });
+  return collectSpaRoutes(async () => {
+    try {
+      await app.handle(request);
+    } catch (err) {
+      console.warn(`[sitemap] enumeration request failed for ${route.path}:`, err);
+    }
+  });
+}, generateSitemap = async (app, serverUrl, outDir, config = {}) => {
   const exclude = config.exclude ?? [];
-  const discoveredRoutes = discoverPageRoutes(routes, exclude);
-  const dynamicRoutes = config.routes ? await config.routes() : [];
-  const filteredDynamic = dynamicRoutes.filter((path) => !isExcluded(path, exclude));
-  const allRoutes = [...discoveredRoutes, ...filteredDynamic];
+  const pageRoutes = discoverPageRoutes(app.routes, exclude);
+  const entries = [];
+  const seenPaths = new Set;
+  for (const route of pageRoutes) {
+    if (!seenPaths.has(route.path)) {
+      entries.push({ path: route.path });
+      seenPaths.add(route.path);
+    }
+    const subRoutes = await collectPageSubRoutes(app, route, serverUrl);
+    for (const sub of subRoutes) {
+      if (sub.dynamic)
+        continue;
+      if (sub.sitemap === "exclude")
+        continue;
+      const fullPath = joinMountAndSubPath(route.path, sub.path);
+      if (seenPaths.has(fullPath))
+        continue;
+      if (isExcluded(fullPath, exclude))
+        continue;
+      entries.push({ path: fullPath, ...resolveSpaEntryMetadata(sub) });
+      seenPaths.add(fullPath);
+    }
+  }
+  const dynamicConfigRoutes = config.routes ? await config.routes() : [];
+  for (const path of dynamicConfigRoutes) {
+    if (seenPaths.has(path))
+      continue;
+    if (isExcluded(path, exclude))
+      continue;
+    entries.push({ path });
+    seenPaths.add(path);
+  }
   const baseUrl = config.baseUrl ?? serverUrl;
-  const xml = buildSitemapXml(allRoutes, baseUrl, config);
+  const xml = buildSitemapXml(entries, baseUrl, config);
   await write4(`${outDir}/sitemap.xml`, xml);
 };
 var init_generateSitemap = __esm(() => {
-  PAGE_HANDLER_NAMES = [
-    "handleReactPageRequest",
-    "handleSveltePageRequest",
-    "handleVuePageRequest",
-    "handleAngularPageRequest",
-    "handleHTMLPageRequest",
-    "handleHTMXPageRequest"
-  ];
+  init_devRouteRegistrationCallsite();
+  init_spaRouteEnumeration();
 });
 
 // src/core/prerender.ts
@@ -27061,7 +27171,7 @@ var createSitemapPlugin = (buildDir, sitemapConfig) => new Elysia5({ name: "abso
   const { server } = started;
   if (!server)
     return;
-  Promise.resolve().then(() => (init_generateSitemap(), exports_generateSitemap)).then(({ generateSitemap: generateSitemap2 }) => generateSitemap2(started.routes, server.url.origin, buildDir, sitemapConfig)).catch((err) => console.error("[sitemap] Generation failed:", err));
+  Promise.resolve().then(() => (init_generateSitemap(), exports_generateSitemap)).then(({ generateSitemap: generateSitemap2 }) => generateSitemap2(started, server.url.origin, buildDir, sitemapConfig)).catch((err) => console.error("[sitemap] Generation failed:", err));
 });
 var createNotFoundPlugin = () => new Elysia5({ name: "absolutejs-not-found" }).onError({ as: "global" }, async ({ code }) => {
   if (code !== "NOT_FOUND")
@@ -33865,5 +33975,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=382821EB1FA3E9F764756E2164756E21
+//# debugId=27DB5119E1E545AE64756E2164756E21
 //# sourceMappingURL=index.js.map