@absolutejs/absolute 0.19.0-beta.965 → 0.19.0-beta.967

package/dist/angular/server.js

@@ -174,7 +174,7 @@ var normalizeSlug = (str) => str.trim().replace(/\s+/g, "-").replace(/[^A-Za-z0-
     return str.charAt(0).toUpperCase() + str.slice(1);
   }
   return normalizeSlug(str).split(/[-_]/).filter(Boolean).map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1).toLowerCase()).join("");
-}, toScreamingSnake = (str) => str.replace(/([a-z0-9])([A-Z])/g, "$1_$2").toUpperCase();
+};
 
 // src/utils/registerClientScript.ts
 var scriptRegistry, requestCounter = 0, getRequestId = () => `req_${Date.now()}_${++requestCounter}`, ssrContextGetter = null, getSsrContextId = () => ssrContextGetter?.() || Object.getOwnPropertyDescriptor(globalThis, "__absolutejs_requestId")?.value, registerClientScript = (script, requestId) => {
@@ -512,37 +512,19 @@ var buildRequestProviders = (deps, request, requestContext, responseInit) => [
 ];
 
 // src/angular/ssrRender.ts
-var routePropsCache, cacheRouteData = (pagePath, data) => {
+var routeContextCache, cacheRouteData = (pagePath, data) => {
   const cacheKey = pagePath.split("?")[0] ?? pagePath;
-  routePropsCache.set(cacheKey, data);
-}, getCachedRouteData = (pagePath) => routePropsCache.get(pagePath), selectorCache, buildProviders = (deps, sanitizer, maybeProps, tokenMap, request, requestContext, responseInit, userProviders = []) => {
-  const providers = [
-    deps.provideServerRendering(),
-    deps.provideClientHydration(deps.withHttpTransferCacheOptions(buildAbsoluteHttpTransferCacheOptions())),
-    deps.provideZonelessChangeDetection(),
-    { provide: deps.APP_BASE_HREF, useValue: "/" },
-    {
-      provide: deps.DomSanitizer,
-      useValue: sanitizer
-    },
-    { provide: deps.Sanitizer, useValue: sanitizer },
-    ...buildRequestProviders(deps, request, requestContext, responseInit),
-    ...userProviders
-  ];
-  if (!maybeProps) {
-    return providers;
-  }
-  const propProviders = Object.entries(maybeProps).map(([propName, propValue]) => ({
-    token: tokenMap.get(toScreamingSnake(propName)),
-    value: propValue
-  })).filter((entry) => entry.token).map((entry) => ({ provide: entry.token, useValue: entry.value }));
-  return [...providers, ...propProviders];
-}, isInjectionToken = (value) => {
-  if (!value || typeof value !== "object") {
-    return false;
-  }
-  return "ngMetadataName" in value && value.ngMetadataName === "InjectionToken";
-}, discoverTokens = (pageModule) => new Map(Object.entries(pageModule).filter(([, value]) => isInjectionToken(value))), resolveSelector = (deps, pagePath, PageComponent) => {
+  routeContextCache.set(cacheKey, data);
+}, getCachedRouteData = (pagePath) => routeContextCache.get(pagePath), selectorCache, buildProviders = (deps, sanitizer, request, requestContext, responseInit, userProviders = []) => [
+  deps.provideServerRendering(),
+  deps.provideClientHydration(deps.withHttpTransferCacheOptions(buildAbsoluteHttpTransferCacheOptions())),
+  deps.provideZonelessChangeDetection(),
+  { provide: deps.APP_BASE_HREF, useValue: "/" },
+  { provide: deps.DomSanitizer, useValue: sanitizer },
+  { provide: deps.Sanitizer, useValue: sanitizer },
+  ...buildRequestProviders(deps, request, requestContext, responseInit),
+  ...userProviders
+], resolveSelector = (deps, pagePath, PageComponent) => {
   const cached = selectorCache.get(pagePath);
   if (cached) {
     return cached;
@@ -558,14 +540,14 @@ var routePropsCache, cacheRouteData = (pagePath, data) => {
     return html.replace("</html>", `${snippet}</html>`);
   }
   return html + snippet;
-}, injectSsrScripts = (html, requestId, indexPath, props) => {
+}, injectSsrScripts = (html, requestId, indexPath, requestContext) => {
   let result = html;
   const registeredScripts = getAndClearClientScripts(requestId);
   if (registeredScripts.length > 0) {
     result = injectBeforeClose(result, generateClientScriptCode(registeredScripts));
   }
-  if (props) {
-    result = injectBeforeClose(result, `<script>window.__ABS_ANGULAR_PAGE_PROPS__ = ${JSON.stringify(props)};</script>`);
+  if (requestContext !== undefined) {
+    result = injectBeforeClose(result, `<script>window.__ABS_ANGULAR_REQUEST_CONTEXT__ = ${JSON.stringify(requestContext)};</script>`);
   }
   if (indexPath) {
     const escapedIndexPath = JSON.stringify(indexPath);
@@ -595,7 +577,7 @@ var routePropsCache, cacheRouteData = (pagePath, data) => {
 };
 var init_ssrRender = __esm(() => {
   init_registerClientScript();
-  routePropsCache = new Map;
+  routeContextCache = new Map;
   selectorCache = new Map;
 });
 
@@ -4541,26 +4523,21 @@ import '@angular/compiler';
 import { bootstrapApplication } from '@angular/platform-browser';
 import { provideClientHydration } from '@angular/platform-browser';
 import { withHttpTransferCacheOptions } from '@angular/platform-browser';
-import { provideZonelessChangeDetection } from '@angular/core';
+import { provideZonelessChangeDetection, REQUEST_CONTEXT } from '@angular/core';
 import * as pageModule from '${normalizedImportPath}';
 
 var ${componentClassName} = pageModule.default;
-var toScreamingSnake = function(str) {
-    return str.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toUpperCase();
-};
-var isInjectionToken = function(value) {
-    return Boolean(value) && typeof value === 'object' && value.ngMetadataName === 'InjectionToken';
-};
-var pageProps = window.__ABS_ANGULAR_PAGE_PROPS__ || {};
+// REQUEST_CONTEXT is hydrated from the SSR-serialized payload so client-side
+// \`inject(REQUEST_CONTEXT)\` (or \`usePageContext<T>()\`) returns the same
+// object the server rendered with \u2014 no second round-trip, no transferState
+// dance for callers.
+var requestContext = Object.prototype.hasOwnProperty.call(window, '__ABS_ANGULAR_REQUEST_CONTEXT__')
+    ? window.__ABS_ANGULAR_REQUEST_CONTEXT__
+    : null;
 var pageHasIslands = Boolean(pageModule.__ABSOLUTE_PAGE_HAS_ISLANDS__) || Boolean(document.querySelector('[data-island="true"]'));
 var pageHasRawStreamingSlots = Boolean(document.querySelector('[data-absolute-raw-slot="true"]'));
 var pageHasStreamingSlots = Boolean(document.querySelector('[data-absolute-slot="true"]'));
-var propProviders = Object.entries(pageProps).map(function(entry) {
-    var propName = entry[0];
-    var propValue = entry[1];
-    var token = pageModule[toScreamingSnake(propName)];
-    return isInjectionToken(token) ? { provide: token, useValue: propValue } : null;
-}).filter(Boolean);
+var contextProviders = [{ provide: REQUEST_CONTEXT, useValue: requestContext }];
 // Page-level providers, opt-in via \`export const providers = [...]\` in the
 // page module. Required so DI tokens that the component (or any service it
 // injects) needs are available client-side too \u2014 without these, services
@@ -4613,7 +4590,7 @@ if (!window.__HMR_SKIP_HYDRATION__ && !pageHasIslands) {
 }
 delete window.__HMR_SKIP_HYDRATION__;
 providers.push.apply(providers, pageProviders);
-providers.push.apply(providers, propProviders);
+providers.push.apply(providers, contextProviders);
 window.__ABS_SLOT_HYDRATION_PENDING__ = pageHasRawStreamingSlots;
 
 if (pageHasRawStreamingSlots) {
@@ -4641,26 +4618,21 @@ import '@angular/compiler';
 import { bootstrapApplication } from '@angular/platform-browser';
 import { provideClientHydration } from '@angular/platform-browser';
 import { withHttpTransferCacheOptions } from '@angular/platform-browser';
-import { enableProdMode, provideZonelessChangeDetection } from '@angular/core';
+import { enableProdMode, provideZonelessChangeDetection, REQUEST_CONTEXT } from '@angular/core';
 import * as pageModule from '${normalizedImportPath}';
 
 var ${componentClassName} = pageModule.default;
-var toScreamingSnake = function(str) {
-    return str.replace(/([a-z0-9])([A-Z])/g, '$1_$2').toUpperCase();
-};
-var isInjectionToken = function(value) {
-    return Boolean(value) && typeof value === 'object' && value.ngMetadataName === 'InjectionToken';
-};
-var pageProps = window.__ABS_ANGULAR_PAGE_PROPS__ || {};
+// REQUEST_CONTEXT is hydrated from the SSR-serialized payload so client-side
+// \`inject(REQUEST_CONTEXT)\` (or \`usePageContext<T>()\`) returns the same
+// object the server rendered with \u2014 no second round-trip, no transferState
+// dance for callers.
+var requestContext = Object.prototype.hasOwnProperty.call(window, '__ABS_ANGULAR_REQUEST_CONTEXT__')
+    ? window.__ABS_ANGULAR_REQUEST_CONTEXT__
+    : null;
 var pageHasIslands = Boolean(pageModule.__ABSOLUTE_PAGE_HAS_ISLANDS__) || Boolean(document.querySelector('[data-island="true"]'));
 var pageHasRawStreamingSlots = Boolean(document.querySelector('[data-absolute-raw-slot="true"]'));
 var pageHasStreamingSlots = Boolean(document.querySelector('[data-absolute-slot="true"]'));
-var propProviders = Object.entries(pageProps).map(function(entry) {
-    var propName = entry[0];
-    var propValue = entry[1];
-    var token = pageModule[toScreamingSnake(propName)];
-    return isInjectionToken(token) ? { provide: token, useValue: propValue } : null;
-}).filter(Boolean);
+var contextProviders = [{ provide: REQUEST_CONTEXT, useValue: requestContext }];
 // Page-level providers, opt-in via \`export const providers = [...]\` in the
 // page module. Required so DI tokens that the component (or any service it
 // injects) needs are available client-side too \u2014 without these, services
@@ -4677,7 +4649,7 @@ var absoluteHttpTransferCacheOptions = {
 
 enableProdMode();
 
-var providers = [provideZonelessChangeDetection()].concat(pageProviders).concat(propProviders);
+var providers = [provideZonelessChangeDetection()].concat(pageProviders).concat(contextProviders);
 if (!pageHasIslands) {
     providers.unshift(provideClientHydration(withHttpTransferCacheOptions(absoluteHttpTransferCacheOptions)));
 }
@@ -5750,7 +5722,7 @@ var resolvePageComponent = (pageModule) => {
   if (isAngularComponent2(defaultExport)) {
     return defaultExport;
   }
-  return Object.values(pageModule).find((value) => isAngularComponent2(value));
+  return Object.values(pageModule).findLast((value) => isAngularComponent2(value));
 };
 var compilerImportPromise = null;
 var ensureAngularCompiler = () => {
@@ -5856,12 +5828,12 @@ var handleAngularPageRequest = async (input) => {
     const resolvedIndexPath = input.indexPath;
     const options = input;
     const resolvedPagePath = input.pagePath;
-    const maybeProps = input.props;
+    const maybeRequestContext = input.requestContext;
     const responseInit = input.responseInit ?? {};
     const resolvedUrl = resolveRequestRenderUrl(input.request);
     cacheRouteData(resolvedPagePath, {
       headTag: resolvedHeadTag,
-      props: maybeProps
+      requestContext: maybeRequestContext
     });
     try {
       assertNoHandlerProviders(input);
@@ -5881,7 +5853,6 @@ var handleAngularPageRequest = async (input) => {
         const hasIslands = typeof pageModule.__ABSOLUTE_PAGE_HAS_ISLANDS__ === "boolean" ? pageModule.__ABSOLUTE_PAGE_HAS_ISLANDS__ : false;
         const usesLegacyAnimations = pageModule.__ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ === true;
         const deps = baseDeps;
-        const tokenMap = discoverTokens(pageModule);
         const selector = resolveSelector(deps, resolvedPagePath, PageComponent);
         lastSelector = selector;
         const htmlString = `<!DOCTYPE html><html>${resolvedHeadTag}<body><${selector}></${selector}></body></html>`;
@@ -5894,11 +5865,11 @@ var handleAngularPageRequest = async (input) => {
           ...pageProviders,
           ...await buildServerAnimationProviders(usesLegacyAnimations)
         ];
-        const providers = buildProviders(deps, sanitizer, maybeProps, tokenMap, input.request, input.requestContext, responseInit, combinedProviders);
+        const providers = buildProviders(deps, sanitizer, input.request, maybeRequestContext, responseInit, combinedProviders);
         const rawHtml = await renderAngularApp(deps, PageComponent, providers, htmlString, resolvedUrl);
         const shouldProcessIslands = hasIslands || rawHtml.includes("<absolute-island");
         const htmlWithLoweredIslands = shouldProcessIslands ? await lowerAngularServerIslands(rawHtml) : rawHtml;
-        const html = injectIslandPageContext(injectSsrScripts(htmlWithLoweredIslands, requestId, resolvedIndexPath, maybeProps), { hasIslands: shouldProcessIslands });
+        const html = injectIslandPageContext(injectSsrScripts(htmlWithLoweredIslands, requestId, resolvedIndexPath, maybeRequestContext), { hasIslands: shouldProcessIslands });
         return new Response(html, withHtmlContentType(responseInit));
       };
       return await runWithStreamingSlotWarningScope(() => options?.collectStreamingSlots === true ? withRegisteredStreamingSlots(renderPageResponse, options) : renderPageResponse(), { handlerCallsite });
@@ -5937,5 +5908,5 @@ export {
   ABSOLUTE_HTTP_TRANSFER_CACHE_SKIP_HEADER
 };
 
-//# debugId=16B24AB89A49274064756E2164756E21
+//# debugId=FD8A1A3E7357C71B64756E2164756E21
 //# sourceMappingURL=server.js.map