akanjs 2.3.10 → 2.3.11-rc.1

package/document/into.ts

@@ -4,7 +4,7 @@ import type { DocumentModel, QueryOf } from "akanjs/constant";
 import type { FilterCls, FilterQueryOf, FilterSortOf, SchemaOf } from ".";
 import type { CacheDatabase, QueryMethodPart } from "./database";
 import type { DataLoader } from "./dataLoader";
-import type { DocumentUpdate, DocumentUpdateOptions } from "./documentQuery";
+import type { DocumentQuery, DocumentUpdate, DocumentUpdateOptions } from "./documentQuery";
 import { type LoaderBuilder, type ModelCls, makeLoaderBuilder } from "./loaderInfo";
 import type { DocumentProjection } from "./types";
 
@@ -15,7 +15,7 @@ interface DefaultMdlStats<
   TDocument,
   TSchema,
   _Partial extends Partial<TSchema> = Partial<TSchema>,
-  _FilterQuery extends QueryOf<TSchema> = QueryOf<TSchema>,
+  _FilterQuery extends DocumentQuery<TSchema> = DocumentQuery<TSchema>,
   _Projection = DocumentProjection<TSchema>,
 > {
   pickOneAndWrite: (query: _FilterQuery, rawData: _Partial) => Promise<TDocument>;
@@ -47,7 +47,7 @@ export interface UpdateResult {
   modifiedCount: number;
   upsertedId?: string | null;
 }
-export interface BulkWriteOperation<Raw, _RawDoc = DocumentModel<Raw>, _RawQuery = QueryOf<_RawDoc>> {
+export interface BulkWriteOperation<Raw, _RawDoc = DocumentModel<Raw>, _RawQuery = DocumentQuery<_RawDoc>> {
   updateOne: {
     filter: _RawQuery;
     update: DocumentUpdate;
@@ -69,7 +69,7 @@ export type Mdl<
   Doc,
   Raw,
   _RawDoc = DocumentModel<Raw>,
-  _RawQuery = QueryOf<_RawDoc>,
+  _RawQuery extends DocumentQuery<_RawDoc> = DocumentQuery<_RawDoc>,
   _Projection extends DocumentProjection<Raw> = DocumentProjection<Raw>,
 > = DefaultMdlStats<Doc, _RawDoc, Partial<_RawDoc>, _RawQuery, _Projection> & {
   refName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.10",
+  "version": "2.3.11-rc.1",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/server/proxy/hostBasePathWebProxy.ts

@@ -5,8 +5,6 @@ import type { BaseBuildArtifact } from "../types";
 import { AkanResponse } from "./akanResponse";
 import type { WebProxy } from "./types";
 
-const RESERVED_BASE_PATHS = new Set(["admin"]);
-
 export class HostBasePathWebProxy implements WebProxy {
   static readonly refName = "HostBasePathWebProxy";
   #domainMap: Map<string, string> | null = null;
@@ -37,8 +35,6 @@ export class HostBasePathWebProxy implements WebProxy {
       );
     }
 
-    if (RESERVED_BASE_PATHS.has(firstPath)) return AkanResponse.next({ request: { headers } });
-
     const internalPath = `/${[locale, basePath, ...segments.slice(2)].filter(Boolean).join("/")}`;
     targetUrl.pathname = internalPath;
     return AkanResponse.rewrite(toProxyRequestUrl(requestUrl, targetUrl), { request: { headers } });

package/server/webRouter.ts

@@ -53,7 +53,6 @@ import type { RscTraceMetadata, SsrManifest } from "./ssrTypes";
 import { createSystemPageResponse, getSystemPageHomeHref } from "./systemPages";
 import type { BaseBuildArtifact, HttpRoutes, RenderState } from "./types";
 
-const RESERVED_BASE_PATHS = new Set(["admin"]);
 const CLIENT_CLOSED_REQUEST_STATUS = 499;
 export const DEFAULT_HTML_RESULT_CACHE_MAX_BODY_BYTES = 2 * 1024 * 1024;
 const APPLE_APP_SITE_ASSOCIATION_PATH = "/.well-known/apple-app-site-association";
@@ -228,8 +227,6 @@ export function normalizeRscTargetUrlForHostBasePath(
 
   const targetBasePath = firstPath && basePaths.includes(firstPath) ? firstPath : null;
   if (seedEntries && routeMatches(targetUrl)) return { url: targetUrl, basePath: targetBasePath ?? basePath };
-  if (RESERVED_BASE_PATHS.has(firstPath ?? "")) return { url: targetUrl, basePath: basePath ?? targetBasePath };
-
   const candidates = [...new Set([basePath, ...basePaths].filter((bp): bp is string => Boolean(bp)))];
   for (const candidate of candidates) {
     if (firstPath === candidate) continue;
@@ -1075,8 +1072,7 @@ export class WebRouter {
     }
     const assetLinks = associations
       .filter(
-        (association) =>
-          association.domains.length > 0 && (association.androidSha256CertFingerprints?.length ?? 0) > 0,
+        (association) => association.domains.length > 0 && (association.androidSha256CertFingerprints?.length ?? 0) > 0,
       )
       .map((association) => ({
         relation: ["delegate_permission/common.handle_all_urls"],

package/types/document/into.d.ts

@@ -3,12 +3,12 @@ import type { DocumentModel, QueryOf } from "akanjs/constant";
 import type { FilterCls, FilterQueryOf, FilterSortOf } from ".";
 import type { CacheDatabase, QueryMethodPart } from "./database.d.ts";
 import type { DataLoader } from "./dataLoader.d.ts";
-import type { DocumentUpdate, DocumentUpdateOptions } from "./documentQuery.d.ts";
+import type { DocumentQuery, DocumentUpdate, DocumentUpdateOptions } from "./documentQuery.d.ts";
 import { type LoaderBuilder, type ModelCls } from "./loaderInfo.d.ts";
 import type { DocumentProjection } from "./types.d.ts";
 export type CRUDEventType = "create" | "update" | "remove";
 export type SaveEventType = "save" | CRUDEventType;
-interface DefaultMdlStats<TDocument, TSchema, _Partial extends Partial<TSchema> = Partial<TSchema>, _FilterQuery extends QueryOf<TSchema> = QueryOf<TSchema>, _Projection = DocumentProjection<TSchema>> {
+interface DefaultMdlStats<TDocument, TSchema, _Partial extends Partial<TSchema> = Partial<TSchema>, _FilterQuery extends DocumentQuery<TSchema> = DocumentQuery<TSchema>, _Projection = DocumentProjection<TSchema>> {
     pickOneAndWrite: (query: _FilterQuery, rawData: _Partial) => Promise<TDocument>;
     pickAndWrite: (docId: string, rawData: _Partial) => Promise<TDocument>;
     pickOne: (query: _FilterQuery, projection?: _Projection) => Promise<TDocument>;
@@ -32,7 +32,7 @@ export interface UpdateResult {
     modifiedCount: number;
     upsertedId?: string | null;
 }
-export interface BulkWriteOperation<Raw, _RawDoc = DocumentModel<Raw>, _RawQuery = QueryOf<_RawDoc>> {
+export interface BulkWriteOperation<Raw, _RawDoc = DocumentModel<Raw>, _RawQuery = DocumentQuery<_RawDoc>> {
     updateOne: {
         filter: _RawQuery;
         update: DocumentUpdate;
@@ -50,7 +50,7 @@ type FindOneChain<Doc> = Promise<Doc | null> & {
     skip(skip: number): FindOneChain<Doc>;
     select(projection?: unknown): FindOneChain<Doc>;
 };
-export type Mdl<Doc, Raw, _RawDoc = DocumentModel<Raw>, _RawQuery = QueryOf<_RawDoc>, _Projection extends DocumentProjection<Raw> = DocumentProjection<Raw>> = DefaultMdlStats<Doc, _RawDoc, Partial<_RawDoc>, _RawQuery, _Projection> & {
+export type Mdl<Doc, Raw, _RawDoc = DocumentModel<Raw>, _RawQuery extends DocumentQuery<_RawDoc> = DocumentQuery<_RawDoc>, _Projection extends DocumentProjection<Raw> = DocumentProjection<Raw>> = DefaultMdlStats<Doc, _RawDoc, Partial<_RawDoc>, _RawQuery, _Projection> & {
     refName: string;
     new (data: Partial<_RawDoc> | Partial<Doc>): Doc;
     find(query: _RawQuery, projection?: _Projection): FindManyChain<Doc>;