akanjs 2.3.11-rc.6 → 2.3.11-rc.7

package/package.json

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

package/server/proxy/localeWebProxy.ts

@@ -49,7 +49,12 @@ export class LocaleWebProxy implements WebProxy {
       (locale) => !pathname.startsWith(`/${locale}/`) && pathname !== `/${locale}`,
     );
 
-    if (!isInternalProxyRequest(requestUrl) && !isWellKnownRequest(pathname) && pathnameIsMissingLocale) {
+    if (
+      !isInternalProxyRequest(requestUrl) &&
+      !isWellKnownRequest(pathname) &&
+      !isApiRequest(pathname) &&
+      pathnameIsMissingLocale
+    ) {
       return Response.redirect(
         new URL(`/${getLocale(request)}/${pathname.slice(1)}${targetUrl.search}`, getPublicRequestUrl(request)),
         307,
@@ -90,3 +95,7 @@ function isInternalProxyRequest(requestUrl: URL): boolean {
 function isWellKnownRequest(pathname: string): boolean {
   return pathname === "/.well-known" || pathname.startsWith("/.well-known/");
 }
+
+function isApiRequest(pathname: string): boolean {
+  return pathname === "/api" || pathname.startsWith("/api/");
+}

package/server/resolver/signal.resolver.ts

@@ -158,6 +158,16 @@ export class SignalResolver {
     const serviceName = `${refName}Service`;
     const capitalizedRefName = capitalize(refName);
 
+    const assertSliceQuery = (query: unknown, key: string) => {
+      if (Array.isArray(query))
+        throw new Error(
+          `Slice "${refName}.${key}" exec returned an array instead of a query descriptor. ` +
+            `Return a query from the slice's service (e.g. this.${refName}Service.queryBy...(...)), ` +
+            `not an executed list (listBy.../findMany...), which resolves to an array.`,
+        );
+      return query;
+    };
+
     class SliceEndpoint extends sliceEndpoint(sliceCls.srv, (builder) => {
       const endpointObj: { [key: string]: EndpointInfo } = {};
       Object.entries(sliceMeta).forEach(([key, sliceInfo]) => {
@@ -179,7 +189,10 @@ export class SignalResolver {
             const limit = Number(requestArgs[argLength + 1] ?? 20);
             const sort = requestArgs[argLength + 2] ?? "latest";
             const internalArgs = requestArgs.slice(argLength + 3);
-            const query = await sliceInfo.execFn?.apply(this, [...args, ...internalArgs, documentQueryHelper]);
+            const query = assertSliceQuery(
+              await sliceInfo.execFn?.apply(this, [...args, ...internalArgs, documentQueryHelper]),
+              key,
+            );
             return (await this[serviceName].__list(query, {
               skip,
               limit,
@@ -196,7 +209,10 @@ export class SignalResolver {
           .exec(async function (this: any, ...requestArgs: any) {
             const args = requestArgs.slice(0, argLength);
             const internalArgs = requestArgs.slice(argLength);
-            const query = await sliceInfo.execFn?.apply(this, [...args, ...internalArgs, documentQueryHelper]);
+            const query = assertSliceQuery(
+              await sliceInfo.execFn?.apply(this, [...args, ...internalArgs, documentQueryHelper]),
+              key,
+            );
             return await this[serviceName].__insight(query);
           });
       });

package/service/predefinedAdaptor/database.adaptor.ts

@@ -816,7 +816,15 @@ class QueryCompiler {
   private assertPath(path: string) {
     const root = path.split(".")[0];
     if (BASE_COLUMNS.has(root)) return;
-    if (!this.fields[root]) throw new Error(`Unknown document field path: ${path}`);
+    if (!this.fields[root]) {
+
+      if (/^\d+$/.test(root))
+        throw new Error(
+          `Query received an array instead of a query object (field path "${path}"). ` +
+            `A query must be a descriptor object; a slice exec must return queryBy...(...), not an executed list.`,
+        );
+      throw new Error(`Unknown document field path: ${path}`);
+    }
   }
 
   private isQueryNode(value: unknown): value is DocumentQueryNode {