akanjs 2.1.0-rc.7 → 2.1.0-rc.8

package/document/filterMeta.ts

@@ -93,6 +93,11 @@ export const getFilterSortByKey = (modelRef: FilterCls, key: string) => {
   return filterMeta.sort[key];
 };
 
+export const fillMissingFilterArgs = (filterInfo: FilterInfo, args: unknown[]) => {
+  if (args.length >= filterInfo.args.length) return args;
+  return [...args, ...Array(filterInfo.args.length - args.length).fill(undefined)];
+};
+
 export type BaseFilterSortKey = "latest" | "oldest";
 export type BaseFilterQueryKey = "any";
 export type BaseFilterKey = BaseFilterSortKey | BaseFilterQueryKey;

package/package.json

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

package/server/resolver/database.resolver.ts

@@ -11,6 +11,7 @@ import {
   DocumentSchema,
   documentQueryHelper,
   type FindQueryOption,
+  fillMissingFilterArgs,
   getFilterInfoByKey,
   getFilterMeta,
   getFilterSortByKey,
@@ -338,7 +339,8 @@ export class DatabaseResolver {
       const filterInfo = getFilterInfoByKey(database.filter, queryKey);
       const queryFn = filterInfo.queryFn;
       if (!queryFn) throw new Error(`No query function for key: ${queryKey}`);
-      const query = queryFn(...(hasQueryOption ? args.slice(0, -1) : args), documentQueryHelper);
+      const queryArgs = fillMissingFilterArgs(filterInfo, hasQueryOption ? args.slice(0, -1) : args);
+      const query = queryFn(...queryArgs, documentQueryHelper);
       const queryOption = hasQueryOption ? lastArg : {};
       return { query, queryOption };
     };
@@ -371,18 +373,19 @@ export class DatabaseResolver {
           return (this as unknown as DatabaseInstance).__pickId(query, queryOption);
         },
         [`exists${capitalize(queryKey)}`]: async function (...args: any) {
-          const query = queryFn(...args, documentQueryHelper);
+          const query = queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper);
           return (this as unknown as DatabaseInstance).__exists(query);
         },
         [`count${capitalize(queryKey)}`]: async function (...args: any) {
-          const query = queryFn(...args, documentQueryHelper);
+          const query = queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper);
           return (this as unknown as DatabaseInstance).__count(query);
         },
         [`insight${capitalize(queryKey)}`]: async function (...args: any) {
-          const query = queryFn(...args, documentQueryHelper);
+          const query = queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper);
           return (this as unknown as DatabaseInstance).__insight(query);
         },
-        [`query${capitalize(queryKey)}`]: (...args: any) => queryFn(...args, documentQueryHelper),
+        [`query${capitalize(queryKey)}`]: (...args: any) =>
+          queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper),
       });
     });
     applyMixins(DatabaseModelInstance, [database.model]);

package/server/resolver/service.resolver.ts

@@ -8,6 +8,7 @@ import {
   type Doc,
   documentQueryHelper,
   type FindQueryOption,
+  fillMissingFilterArgs,
   getFilterInfoByKey,
   getFilterMeta,
   type ListQueryOption,
@@ -116,9 +117,11 @@ export class ServiceResolver {
           typeof lastArg.skip === "number" ||
           typeof lastArg.limit === "number" ||
           typeof lastArg.sort === "string");
-      const queryFn = getFilterInfoByKey(database.filter, queryKey).queryFn;
+      const filterInfo = getFilterInfoByKey(database.filter, queryKey);
+      const queryFn = filterInfo.queryFn;
       if (!queryFn) throw new Error(`No query function for key: ${queryKey}`);
-      const query = queryFn(...(hasQueryOption ? args.slice(0, -1) : args), documentQueryHelper);
+      const queryArgs = fillMissingFilterArgs(filterInfo, hasQueryOption ? args.slice(0, -1) : args);
+      const query = queryFn(...queryArgs, documentQueryHelper);
       const queryOption = hasQueryOption ? lastArg : {};
       return { query, queryOption };
     };
@@ -167,7 +170,7 @@ export class ServiceResolver {
           return this.__insight(query);
         },
         [`query${capitalize(queryKey)}`]: function (this: DatabaseService, ...args: any) {
-          return queryFn(...args, documentQueryHelper);
+          return queryFn(...fillMissingFilterArgs(filterInfo, args), documentQueryHelper);
         },
       });
     });

package/service/predefinedAdaptor/database.adaptor.ts

@@ -1003,7 +1003,8 @@ export class SqliteDocumentStore {
     const store = this;
     const original = JSON.parse(JSON.stringify(sanitizeJson(originalData) ?? {})) as Record<string, unknown>;
     const isNew = !originalData.id;
-    const doc = Object.assign(Object.create(this.database.doc.prototype), data);
+    const hydratedData = isNew ? this.prepareDocument(data) : data;
+    const doc = Object.assign(Object.create(this.database.doc.prototype), hydratedData);
     Object.defineProperties(doc, {
       set: {
         value(patch: DocumentRecord) {

package/types/document/filterMeta.d.ts

@@ -18,6 +18,7 @@ export declare const setFilterMeta: (filterRef: Cls<unknown, {
 export declare const getFilterInfoByKey: <ArgNames extends string[] = [], Args extends any[] = any[], Model = any>(modelRef: FilterCls, key: string) => FilterInfo<ArgNames, Args, Model>;
 export declare const setFilterInfoByKey: <ArgNames extends string[] = [], Args extends any[] = any[], Model = any>(modelRef: Cls<Model>, key: string, filterInfo: FilterInfo<ArgNames, Args, Model>) => void;
 export declare const getFilterSortByKey: (modelRef: FilterCls, key: string) => unknown;
+export declare const fillMissingFilterArgs: (filterInfo: FilterInfo, args: unknown[]) => any[];
 export type BaseFilterSortKey = "latest" | "oldest";
 export type BaseFilterQueryKey = "any";
 export type BaseFilterKey = BaseFilterSortKey | BaseFilterQueryKey;