akanjs 2.4.2-rc.0 → 2.4.2-rc.2

package/server/resolver/service.resolver.ts

@@ -1,6 +1,6 @@
 import type { PromiseOrObject } from "akanjs/base";
 import { capitalize } from "akanjs/common";
-import type { ConstantModel, QueryOf } from "akanjs/constant";
+import { type ConstantModel, ConstantRegistry, type QueryOf } from "akanjs/constant";
 import {
   type CRUDEventType,
   type DatabaseModel,
@@ -17,7 +17,11 @@ import {
 import type { DatabaseService, ServiceCls } from "akanjs/service";
 
 export class ServiceResolver {
-  static #getDefaultDbServiceMethods(className: string) {
+  static #getDefaultDbServiceMethods(
+    className: string,
+    cascades: [string, string][],
+    getService: (refName: string) => DatabaseService,
+  ) {
     const dbServiceMethods = {
       async __get(this: DatabaseService, id: string) {
         return await this.__databaseModel.__get(id);
@@ -95,9 +99,18 @@ export class ServiceResolver {
         return this.__update(id, data);
       },
       async __remove(this: DatabaseService, id: string): Promise<Doc> {
+
+        const targets = cascades.map(([key, refName]) => [key, getService(refName)] as const);
         await this.__libsPreRemove(id);
         const doc = await this.__databaseModel.__remove(id);
-        return await this.__libsPostRemove(doc);
+        const removed = await this.__libsPostRemove(doc);
+        for (const [key, target] of targets) {
+          const value = (removed as Record<string, unknown>)[key];
+          const ids = (Array.isArray(value) ? value : [value]).filter((v): v is string => typeof v === "string");
+
+          for (const targetId of ids) await target.__remove(targetId);
+        }
+        return removed;
       },
       async [`remove${className}`](this: DatabaseService, id: string): Promise<Doc> {
         return this.__remove(id);
@@ -105,9 +118,18 @@ export class ServiceResolver {
     };
     return dbServiceMethods;
   }
-  static resolveDatabaseService(constant: ConstantModel, database: DatabaseModel, srvRef: ServiceCls): ServiceCls {
+  static resolveDatabaseService(
+    constant: ConstantModel,
+    database: DatabaseModel,
+    srvRef: ServiceCls,
+    getService: (refName: string) => DatabaseService,
+  ): ServiceCls {
     const className = capitalize(database.refName);
-    Object.assign(srvRef.prototype, ServiceResolver.#getDefaultDbServiceMethods(className));
+
+    const cascades = [...constant.full.cascade.remove].map(
+      ([key, modelRef]) => [key, ConstantRegistry.getRefName(modelRef)] as [string, string],
+    );
+    Object.assign(srvRef.prototype, ServiceResolver.#getDefaultDbServiceMethods(className, cascades, getService));
     const getQueryDataFromKey = (queryKey: string, args: any): { query: any; queryOption: any } => {
       const lastArg = args.at(-1);
       const hasQueryOption =

package/server/webRouter.ts

@@ -7,6 +7,7 @@ import {
   getBasePathFromPathname,
   Logger,
   parseAkanI18nEnv,
+  resolveSubRouteHosts,
 } from "akanjs/common";
 import { type AkanRequestStore, createRequestStore, parseCookieHeader } from "akanjs/fetch";
 import type { AkanMetricsReport } from "akanjs/service";
@@ -267,6 +268,7 @@ export class WebRouter {
   #logger = new Logger("WebRouter");
   #artifactDir = WebRouter.#resolveArtifactDir();
   #artifact: BaseBuildArtifact;
+  #subRoutes: Record<string, string[]>;
   #rsc: RscWorker;
   #hub: HmrWsHub | null = null;
   #prodMode = process.env.NODE_ENV === "production";
@@ -293,6 +295,16 @@ export class WebRouter {
   constructor({ artifact, cssBytesByUrl, rsc, seedIndex, upgradeHmrWs }: WebRouterOptions) {
     this.#logger.verbose(`[SSR] loaded ${Object.keys(cssBytesByUrl).length} CSS assets`);
     this.#artifact = artifact;
+    const { subRoutes, ignoredBasePaths } = resolveSubRouteHosts({
+      subRoutes: artifact.subRoutes,
+      basePaths: artifact.basePaths,
+      env: process.env.AKAN_SUB_ROUTE_HOSTS,
+    });
+    this.#subRoutes = subRoutes;
+    if (ignoredBasePaths.length)
+      this.#logger.warn(
+        `AKAN_SUB_ROUTE_HOSTS names basePaths this build does not serve, ignoring: ${ignoredBasePaths.join(", ")}`,
+      );
     this.#rsc = rsc;
     this.renderState = {
       buildId: 0,
@@ -424,8 +436,7 @@ export class WebRouter {
           const clientOrigin = WebRouter.#clientFacingOrigin(req);
           const target = reqUrl.searchParams.get("url");
           const rawTargetUrl = target ? new URL(target, clientOrigin) : reqUrl;
-          const requestBasePath =
-            req.headers.get("x-base-path") ?? WebRouter.#basePathForRequestHost(req, this.#artifact.subRoutes);
+          const requestBasePath = this.#requestBasePath(req);
           const normalizedTarget = normalizeRscTargetUrlForHostBasePath(rawTargetUrl, {
             basePath: requestBasePath,
             basePaths: this.#artifact.basePaths,
@@ -517,11 +528,7 @@ export class WebRouter {
           });
         }
 
-        const sitemapBasePath = getSitemapBasePath(
-          url.pathname,
-          this.#artifact.basePaths,
-          req.headers.get("x-base-path") ?? WebRouter.#basePathForRequestHost(req, this.#artifact.subRoutes),
-        );
+        const sitemapBasePath = getSitemapBasePath(url.pathname, this.#artifact.basePaths, this.#requestBasePath(req));
         if (sitemapBasePath !== undefined) {
           return new Response(
             createDefaultSitemapXml({
@@ -713,6 +720,17 @@ export class WebRouter {
     return getClientFacingOrigin(req);
   }
 
+  /**
+   * `x-base-path` is set by `HostBasePathWebProxy`, but it reaches here from the wire too, so it is checked against
+   * the basePaths this build serves — the same check `getBasePathFromPathname` already applies to it. An unknown
+   * value falls through to host matching instead of routing the request into a basePath that resolves to nothing.
+   */
+  #requestBasePath(req: Request): string | null {
+    const headerBasePath = req.headers.get("x-base-path");
+    if (headerBasePath && this.#artifact.basePaths.includes(headerBasePath)) return headerBasePath;
+    return WebRouter.#basePathForRequestHost(req, this.#subRoutes);
+  }
+
   static #basePathForRequestHost(req: Request, subRoutes: Record<string, string[]>): string | null {
     const host = (req.headers.get("x-forwarded-host") ?? req.headers.get("host") ?? "")
       .toLowerCase()
@@ -857,8 +875,7 @@ export class WebRouter {
       pathname,
       i18n: this.#artifact.i18n,
       basePaths: this.#artifact.basePaths,
-      headerBasePath:
-        req.headers.get("x-base-path") ?? WebRouter.#basePathForRequestHost(req, this.#artifact.subRoutes),
+      headerBasePath: this.#requestBasePath(req),
     });
   }
 
@@ -866,8 +883,7 @@ export class WebRouter {
     const basePath = getBasePathFromPathname(pathname, {
       basePaths: Object.keys(this.renderState.cssAssets),
       i18n: this.#artifact.i18n,
-      headerBasePath:
-        req.headers.get("x-base-path") ?? WebRouter.#basePathForRequestHost(req, this.#artifact.subRoutes),
+      headerBasePath: this.#requestBasePath(req),
     });
     return this.renderState.cssAssets[basePath ?? ""]?.cssUrl ?? null;
   }