@absolutejs/absolute 0.20.0-beta.182 → 0.20.0-beta.183

package/dist/angular/server.js

@@ -1437,6 +1437,7 @@ var init_angularDeps = __esm(() => {
 });
 
 // src/utils/spaRouteManifest.ts
+import { NotFound } from "elysia";
 import { basename as basename2 } from "path";
 var SPA_ROUTES_KEY = "__absoluteSpaRoutes", setSpaRouteManifest = (hosts) => {
   Reflect.set(globalThis, SPA_ROUTES_KEY, hosts);
@@ -1501,7 +1502,14 @@ var SPA_ROUTES_KEY = "__absoluteSpaRoutes", setSpaRouteManifest = (hosts) => {
 }, renderSpaNotFound = async (framework, pageName, request) => {
   if (isKnownSpaRoute(framework, pageName, request))
     return null;
-  return await renderFirstNotFound() ?? new Response("Not found", {
+  return renderSpaNotFoundResponse(request);
+}, renderSpaNotFoundResponse = async (request) => {
+  if (request && !isPageRequest(request)) {
+    return new NotFound().toResponse();
+  }
+  return await renderFirstNotFound({
+    preferHtmx: request?.headers.get("hx-request") === "true"
+  }) ?? new Response("Not found", {
     headers: { "Content-Type": "text/plain" },
     status: 404
   });
@@ -1558,8 +1566,8 @@ var buildRequestProviders = (deps, request, requestContext, responseInit) => [
 // src/angular/zoneRuntime.ts
 var ZONE_NODE_SPECIFIER = "zone.js/node", MISSING_ZONE_MESSAGE = 'angular.changeDetection is "zone" but zone.js could not be loaded. Install it in your app (bun add zone.js).', isAngularZoneMode = () => globalThis.__absoluteAngularChangeDetection === "zone", setAngularChangeDetection = (mode) => {
   globalThis.__absoluteAngularChangeDetection = mode ?? "zoneless";
-}, isRecord2 = (value) => typeof value === "object" && value !== null, adoptIntoNativePromise = (NativePromise, value) => {
-  if (value instanceof NativePromise || !isRecord2(value))
+}, isRecord3 = (value) => typeof value === "object" && value !== null, adoptIntoNativePromise = (NativePromise, value) => {
+  if (value instanceof NativePromise || !isRecord3(value))
     return value;
   const { then } = value;
   if (typeof then !== "function")
@@ -1576,28 +1584,28 @@ var ZONE_NODE_SPECIFIER = "zone.js/node", MISSING_ZONE_MESSAGE = 'angular.change
 }, wrapRoute = (NativePromise, route) => {
   if (typeof route === "function")
     return wrapHandler(NativePromise, route);
-  if (!isRecord2(route) || route instanceof Response || route instanceof Blob)
+  if (!isRecord3(route) || route instanceof Response || route instanceof Blob)
     return route;
   return Object.fromEntries(Object.entries(route).map(([method, handler]) => [
     method,
     wrapHandler(NativePromise, handler)
   ]));
 }, wrapServeOptions = (NativePromise, options) => {
-  if (!isRecord2(options))
+  if (!isRecord3(options))
     return options;
   const wrapped = { ...options };
   if (options.fetch)
     wrapped.fetch = wrapHandler(NativePromise, options.fetch);
   if (options.error)
     wrapped.error = wrapHandler(NativePromise, options.error);
-  if (isRecord2(options.routes))
+  if (isRecord3(options.routes))
     wrapped.routes = Object.fromEntries(Object.entries(options.routes).map(([path, route]) => [
       path,
       wrapRoute(NativePromise, route)
     ]));
   return wrapped;
 }, wrapServerReload = (NativePromise, server) => {
-  if (!isRecord2(server))
+  if (!isRecord3(server))
     return;
   const { reload } = server;
   if (typeof reload !== "function")
@@ -3475,15 +3483,15 @@ var init_stylePreprocessor = __esm(() => {
 });
 
 // src/svelte/router/lazyModule.ts
-var LAZY_RESOLVED_KEY, LAZY_SOURCE_EXPORT = "__ABSOLUTE_SVELTE_SOURCE__", isRecord3 = (value) => typeof value === "object" && value !== null, isComponent = (value) => typeof value === "function", toLazyComponent = (value) => {
+var LAZY_RESOLVED_KEY, LAZY_SOURCE_EXPORT = "__ABSOLUTE_SVELTE_SOURCE__", isRecord4 = (value) => typeof value === "object" && value !== null, isComponent = (value) => typeof value === "function", toLazyComponent = (value) => {
   if (isComponent(value))
     return value;
-  if (!isRecord3(value))
+  if (!isRecord4(value))
     return;
   const fallback = value.default;
   return isComponent(fallback) ? fallback : undefined;
 }, readSourceFrom = (value) => {
-  if (!isRecord3(value) && !isComponent(value))
+  if (!isRecord4(value) && !isComponent(value))
     return;
   const source = Reflect.get(value, LAZY_SOURCE_EXPORT);
   return typeof source === "string" ? source : undefined;
@@ -3492,7 +3500,7 @@ var LAZY_RESOLVED_KEY, LAZY_SOURCE_EXPORT = "__ABSOLUTE_SVELTE_SOURCE__", isReco
   const fromValue = readSourceFrom(value);
   if (fromValue !== undefined)
     return fromValue;
-  if (!isRecord3(value))
+  if (!isRecord4(value))
     return;
   return readSourceFrom(value.default);
 };
@@ -3876,14 +3884,14 @@ var defineIslandComponent = (component, options) => ({
   component,
   export: options.export,
   source: options.source
-}), defineIslandRegistry = (registry) => registry, isRecord4 = (value) => typeof value === "object" && value !== null, getIslandBuildReference = (component) => {
+}), defineIslandRegistry = (registry) => registry, isRecord5 = (value) => typeof value === "object" && value !== null, getIslandBuildReference = (component) => {
   if (!isIslandComponentDefinition(component))
     return null;
   return {
     export: component.export,
     source: component.source
   };
-}, isIslandComponentDefinition = (value) => isRecord4(value) && ("component" in value) && ("source" in value) && typeof value.source === "string", parseIslandProps = (rawProps) => {
+}, isIslandComponentDefinition = (value) => isRecord5(value) && ("component" in value) && ("source" in value) && typeof value.source === "string", parseIslandProps = (rawProps) => {
   if (!rawProps)
     return {};
   return JSON.parse(rawProps);
@@ -3907,7 +3915,7 @@ var init_islandMarkupAttributes = __esm(() => {
 var islandSequence = 0, resolvedServerComponentCache, resolvedServerBuildComponentCache, syncIslandGeneration3, nextIslandId = () => {
   islandSequence += 1;
   return `island-${islandSequence}`;
-}, isRecord5 = (value) => typeof value === "object" && value !== null, isReactServerIslandComponent = (value) => typeof value === "function", isSvelteServerIslandComponent = (value) => typeof value === "function", isVueServerIslandComponent = (value) => typeof value === "function" || isRecord5(value), isAngularServerIslandComponent = (value) => typeof value === "function", resolveBuildReferencePath = (source, registryPath) => {
+}, isRecord6 = (value) => typeof value === "object" && value !== null, isReactServerIslandComponent = (value) => typeof value === "function", isSvelteServerIslandComponent = (value) => typeof value === "function", isVueServerIslandComponent = (value) => typeof value === "function" || isRecord6(value), isAngularServerIslandComponent = (value) => typeof value === "function", resolveBuildReferencePath = (source, registryPath) => {
   if (source.startsWith("file://"))
     return new URL(source).pathname;
   if (source.startsWith("."))
@@ -4376,13 +4384,13 @@ var ABSOLUTE_MOBILE_PAGE_MEDIA_TYPE = "application/vnd.absolute.page+json", ABSO
 }, headerVaryValues, envelopeResponse = (response, status) => new Response(JSON.stringify({
   protocol: ABSOLUTE_MOBILE_PAGE_PROTOCOL_VERSION,
   response
-}), { headers: responseHeaders(), status }), isRecord7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value), normalizeJsonValue = (value) => {
+}), { headers: responseHeaders(), status }), isRecord8 = (value) => typeof value === "object" && value !== null && !Array.isArray(value), normalizeJsonValue = (value) => {
   const serialized = JSON.stringify(value);
   if (serialized === undefined) {
     throw new TypeError("Mobile page props must be JSON-serializable.");
   }
   const parsed = JSON.parse(serialized);
-  if (!isRecord7(parsed)) {
+  if (!isRecord8(parsed)) {
     throw new TypeError("Mobile page props must serialize to an object.");
   }
   return parsed;
@@ -4784,7 +4792,7 @@ var SLOT_ID_PREFIX = "abs-slot-", CLOSING_BODY_TAG = "</body>", CLOSING_HEAD_TAG
     getStreamingSlotsRuntimeScript()
   ].filter(Boolean).join(";");
   return `<script${createNonceAttr(nonce)}>${escapeScriptContent(runtimeBody)}</script>`;
-}, toUint8 = (value, encoder) => encoder.encode(value), isRecord8 = (value) => Boolean(value) && typeof value === "object", isSafeHtmlLike = (value) => isRecord8(value) && typeof value.changingThisBreaksApplicationSecurity === "string", normalizeSafeHtml = (value) => {
+}, toUint8 = (value, encoder) => encoder.encode(value), isRecord9 = (value) => Boolean(value) && typeof value === "object", isSafeHtmlLike = (value) => isRecord9(value) && typeof value.changingThisBreaksApplicationSecurity === "string", normalizeSafeHtml = (value) => {
   if (isSafeHtmlLike(value)) {
     return value.changingThisBreaksApplicationSecurity;
   }
@@ -4845,7 +4853,7 @@ var SLOT_ID_PREFIX = "abs-slot-", CLOSING_BODY_TAG = "</body>", CLOSING_HEAD_TAG
 }, createTimeoutError = (slot, timeoutMs) => {
   const error = Object.assign(new Error(`Streaming slot "${slot.id}" timed out after ${timeoutMs}ms`), { __absTimeout: true });
   return error;
-}, isSlotPatchPayloadObject = (value) => isRecord8(value) && ("html" in value), isTimeoutError = (error) => isRecord8(error) && error.__absTimeout === true, toStreamingSlot = (slot, policy) => ({
+}, isSlotPatchPayloadObject = (value) => isRecord9(value) && ("html" in value), isTimeoutError = (error) => isRecord9(error) && error.__absTimeout === true, toStreamingSlot = (slot, policy) => ({
   dynamic: slot.dynamic,
   errorHtml: slot.errorHtml === undefined ? policy.errorHtml : slot.errorHtml,
   fallbackHtml: normalizeSlotText(slot.fallbackHtml, policy.fallbackHtml),
@@ -7569,6 +7577,129 @@ var resolveRequestBaseHref = (route, request) => deriveAngularBaseHref(route, re
 // src/angular/pageHandler.ts
 init_spaRouteManifest();
 
+// src/angular/colocatedRouteMatch.ts
+var MAX_ROUTE_DEPTH = 32;
+var isRecord2 = (value) => typeof value === "object" && value !== null;
+var PRIMARY_OUTLET = "primary";
+var routeOutlet = (route) => typeof route.outlet === "string" ? route.outlet : PRIMARY_OUTLET;
+var matchRoute = (route, segments) => {
+  if (!isRecord2(route))
+    return true;
+  if (routeOutlet(route) !== PRIMARY_OUTLET)
+    return false;
+  if (typeof route.matcher === "function")
+    return true;
+  if (typeof route.path !== "string")
+    return true;
+  const { path } = route;
+  const parts = path.split("/").filter((part) => part !== "");
+  if (parts.includes("**"))
+    return true;
+  const isFull = route.pathMatch === "full";
+  if (parts.length > segments.length)
+    return false;
+  if (isFull && parts.length < segments.length)
+    return false;
+  const consumed = parts.every((part, index) => part.startsWith(":") || part === segments[index]);
+  if (!consumed)
+    return false;
+  const rest = segments.slice(parts.length);
+  if (route.redirectTo !== undefined)
+    return true;
+  if (route.loadChildren !== undefined)
+    return true;
+  if (route.children !== undefined)
+    return { children: route.children, rest };
+  return rest.length === 0;
+};
+var matchRoutes = (routes, segments, depth) => {
+  if (!Array.isArray(routes) || depth > MAX_ROUTE_DEPTH)
+    return true;
+  if (segments.length === 0)
+    return true;
+  return routes.some((route) => {
+    const result = matchRoute(route, segments);
+    if (typeof result === "boolean")
+      return result;
+    return matchRoutes(result.children, result.rest, depth + 1);
+  });
+};
+var decodeSegment = (segment) => {
+  try {
+    return decodeURIComponent(segment);
+  } catch {
+    return null;
+  }
+};
+var toUrlSegments = (path) => {
+  if (path.includes("(") || path.includes(")"))
+    return null;
+  const decoded = path.split("/").map((raw) => raw.split(";")[0] ?? "").filter((segment) => segment !== "").map(decodeSegment);
+  if (decoded.some((segment) => segment === null))
+    return null;
+  return decoded.filter((segment) => segment !== null);
+};
+var matchesAngularColocatedRoutes = (routes, path) => {
+  const segments = toUrlSegments(path);
+  if (segments === null)
+    return true;
+  return matchRoutes(routes, segments, 0);
+};
+var pathBelowBaseHref = (pathname, baseHref) => {
+  const collapsed = pathname.replace(/\/{2,}/g, "/");
+  const base = baseHref.endsWith("/") ? baseHref : `${baseHref}/`;
+  if (`${collapsed}/` === base)
+    return "";
+  if (!collapsed.startsWith(base))
+    return null;
+  return collapsed.slice(base.length);
+};
+var WILDCARD_SUFFIX2 = "/*";
+var ROOT_WILDCARD = "/*";
+var MAX_PROVIDER_DEPTH = 8;
+var providesBaseHref = (provider, depth = 0) => {
+  if (depth > MAX_PROVIDER_DEPTH)
+    return true;
+  if (Array.isArray(provider))
+    return provider.some((entry) => providesBaseHref(entry, depth + 1));
+  if (!isRecord2(provider))
+    return false;
+  const nested = Reflect.get(provider, "\u0275providers");
+  if (Array.isArray(nested))
+    return providesBaseHref(nested, depth + 1);
+  if (!("provide" in provider))
+    return false;
+  return String(provider.provide).includes("appBaseHref");
+};
+var isUnmatchedColocatedRoute = ({
+  handlerProviders,
+  pageModule,
+  request,
+  route,
+  runtimeBaseHref
+}) => {
+  if (!request || !route?.endsWith(WILDCARD_SUFFIX2))
+    return false;
+  const { providers, routes } = pageModule;
+  if (!Array.isArray(routes) || !Array.isArray(providers))
+    return false;
+  if (providesBaseHref(handlerProviders))
+    return false;
+  const baseHref = runtimeBaseHref ?? (route === ROOT_WILDCARD ? "/" : null);
+  if (baseHref === null)
+    return false;
+  let pathname;
+  try {
+    ({ pathname } = new URL(request.url));
+  } catch {
+    return false;
+  }
+  const path = pathBelowBaseHref(pathname, baseHref);
+  if (path === null)
+    return false;
+  return !matchesAngularColocatedRoutes(routes, path);
+};
+
 // src/angular/lowerServerIslands.ts
 init_renderIslandMarkup();
 var ANGULAR_ISLAND_TAG_RE = /<absolute-island\b([^>]*)>[\s\S]*?<\/absolute-island>/gi;
@@ -7586,7 +7717,7 @@ var islandHydrationModes = [
   "none"
 ];
 var decodeHtmlAttribute = (value) => value.replaceAll("&quot;", '"').replaceAll("&#34;", '"').replaceAll("&apos;", "'").replaceAll("&#39;", "'").replaceAll("&amp;", "&").replaceAll("&lt;", "<").replaceAll("&gt;", ">");
-var isRecord6 = (value) => typeof value === "object" && value !== null;
+var isRecord7 = (value) => typeof value === "object" && value !== null;
 var isIslandFramework = (value) => islandFrameworks.some((framework) => framework === value);
 var isIslandHydrate = (value) => islandHydrationModes.some((mode) => mode === value);
 var parseAttributes = (attributeString) => {
@@ -7617,7 +7748,7 @@ var parseAngularIslandProps = (attributeString) => {
   let parsedProps = {};
   try {
     const candidate = JSON.parse(serializedProps);
-    parsedProps = isRecord6(candidate) ? candidate : {};
+    parsedProps = isRecord7(candidate) ? candidate : {};
   } catch {}
   return {
     component,
@@ -7986,11 +8117,11 @@ var runWithStreamingSlotWarningScope = (task, metadata) => ensureWarningStorage(
 
 // src/angular/pageHandler.ts
 init_ssrRender();
-var isRecord9 = (value) => typeof value === "object" && value !== null;
+var isRecord10 = (value) => typeof value === "object" && value !== null;
 var isAngularComponent = (value) => typeof value === "function";
 var componentHostsRouterOutlet = (component) => {
   const componentDef = Reflect.get(component, "\u0275cmp");
-  if (!isRecord9(componentDef))
+  if (!isRecord10(componentDef))
     return false;
   const rawDependencies = componentDef.dependencies;
   const dependencies = typeof rawDependencies === "function" ? Reflect.apply(rawDependencies, undefined, []) : rawDependencies;
@@ -8000,7 +8131,7 @@ var componentHostsRouterOutlet = (component) => {
     if (dependency === null || typeof dependency !== "object" && typeof dependency !== "function")
       return false;
     const directiveDef = Reflect.get(dependency, "\u0275dir") ?? dependency;
-    if (!isRecord9(directiveDef))
+    if (!isRecord10(directiveDef))
       return false;
     const { selectors } = directiveDef;
     return Array.isArray(selectors) && JSON.stringify(selectors).includes("router-outlet");
@@ -8030,7 +8161,7 @@ var ensureAngularCompiler = () => {
   }
   return compilerImportPromise;
 };
-var readAngularPageModule = (value) => isRecord9(value) ? value : null;
+var readAngularPageModule = (value) => isRecord10(value) ? value : null;
 var resolveAngularSsrOutDir = (projectRoot = process.cwd(), configuredOutDir = process.env.ABSOLUTE_ANGULAR_SSR_OUTDIR) => configuredOutDir ?? join10(projectRoot, ".absolutejs", "runtime", "angular-ssr");
 var createAngularRuntimeCacheBuster = () => `${Date.now().toString(BASE_36_RADIX)}.${Math.random().toString(BASE_36_RADIX).substring(2, RANDOM_ID_END_INDEX)}`;
 var existingNodeModulesLinkMatches = async (nodeModulesLink, expectedTarget) => {
@@ -8148,7 +8279,7 @@ var handleAngularPageRequest = async (input) => {
       ],
       runtimes: [String(ABSOLUTE_MOBILE_PAGE_PROTOCOL_VERSION)]
     },
-    props: isRecord9(input.requestContext) ? input.requestContext : Object.create(null),
+    props: isRecord10(input.requestContext) ? input.requestContext : Object.create(null),
     request,
     status: input.responseInit?.status,
     route: () => {
@@ -8185,18 +8316,27 @@ var handleAngularPageRequest = async (input) => {
     });
     try {
       const handlerCallsite = options?.collectStreamingSlots === true ? undefined : getCurrentRouteRegistrationCallsite() ?? captureStreamingSlotWarningCallsite();
+      const baseDeps = await getAngularDeps();
+      const runtimePagePath = await resolveRuntimeAngularModulePath(resolvedPagePath);
+      const importedPageModule = await import(buildRuntimeModuleSpecifier(runtimePagePath.path, runtimePagePath.cacheBuster));
+      const pageModule = readAngularPageModule(importedPageModule);
+      if (!pageModule) {
+        throw new Error(`Invalid Angular page module: ${resolvedPagePath}`);
+      }
+      const PageComponent = resolvePageComponent(pageModule);
+      if (!isAngularComponent(PageComponent)) {
+        throw new Error(`Angular page module must export an Angular component: ${resolvedPagePath}`);
+      }
+      if (isUnmatchedColocatedRoute({
+        handlerProviders: input.providers,
+        pageModule,
+        request,
+        route: getCurrentAbsoluteRoute(request),
+        runtimeBaseHref
+      })) {
+        return withPageCacheHeaders(await renderSpaNotFoundResponse(request), request);
+      }
       const renderPageResponse = async () => {
-        const baseDeps = await getAngularDeps();
-        const runtimePagePath = await resolveRuntimeAngularModulePath(resolvedPagePath);
-        const importedPageModule = await import(buildRuntimeModuleSpecifier(runtimePagePath.path, runtimePagePath.cacheBuster));
-        const pageModule = readAngularPageModule(importedPageModule);
-        if (!pageModule) {
-          throw new Error(`Invalid Angular page module: ${resolvedPagePath}`);
-        }
-        const PageComponent = resolvePageComponent(pageModule);
-        if (!isAngularComponent(PageComponent)) {
-          throw new Error(`Angular page module must export an Angular component: ${resolvedPagePath}`);
-        }
         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;
@@ -8264,5 +8404,5 @@ export {
   withPendingTask
 };
 
-//# debugId=5A89E04D00718BF264756E2164756E21
+//# debugId=FE97DE05426DDF8964756E2164756E21
 //# sourceMappingURL=server.js.map