@akanjs/document 0.9.42 → 0.9.43

package/cjs/src/database.js

@@ -88,7 +88,6 @@ class DatabaseModelStorage {
   __ModelType__ = "DatabaseModelStorage";
 }
 const databaseModelOf = (database, model, redis, meili) => {
-  //! 잘되는지 확인 필요
   const [modelName, className] = [database.refName, (0, import_common.capitalize)(database.refName)];
   const insightFieldMetas = (0, import_constant.getFieldMetas)(database.Insight);
   const accumulator = Object.fromEntries(insightFieldMetas.map((fieldMeta) => [fieldMeta.key, fieldMeta.accumulate]));
@@ -182,15 +181,18 @@ const databaseModelOf = (database, model, redis, meili) => {
       const data = res[0];
       return data ?? defaultInsight;
     }
-    async getDefaultSummary(addQuery = {}) {
+    async _preSummary() {
+      return Promise.resolve({});
+    }
+    async getSummary() {
       if (!database.Summary)
         return {};
+      const summary = await this._preSummary();
       const fieldMetas = (0, import_constant.getFieldMetas)(database.Summary);
-      const summary = {};
       await Promise.all(
         fieldMetas.filter((fieldMeta) => !!fieldMeta.query).map(async (fieldMeta) => {
           const query = typeof fieldMeta.query === "function" ? fieldMeta.query() : fieldMeta.query;
-          summary[fieldMeta.key] = query ? await model.countDocuments({ ...query, ...addQuery }) : fieldMeta.default;
+          summary[fieldMeta.key] = query ? await model.countDocuments({ ...query }) : fieldMeta.default;
         })
       );
       return summary;

package/esm/src/database.js

@@ -72,7 +72,6 @@ class DatabaseModelStorage {
   __ModelType__ = "DatabaseModelStorage";
 }
 const databaseModelOf = (database, model, redis, meili) => {
-  //! 잘되는지 확인 필요
   const [modelName, className] = [database.refName, capitalize(database.refName)];
   const insightFieldMetas = getFieldMetas(database.Insight);
   const accumulator = Object.fromEntries(insightFieldMetas.map((fieldMeta) => [fieldMeta.key, fieldMeta.accumulate]));
@@ -166,15 +165,18 @@ const databaseModelOf = (database, model, redis, meili) => {
       const data = res[0];
       return data ?? defaultInsight;
     }
-    async getDefaultSummary(addQuery = {}) {
+    async _preSummary() {
+      return Promise.resolve({});
+    }
+    async getSummary() {
       if (!database.Summary)
         return {};
+      const summary = await this._preSummary();
       const fieldMetas = getFieldMetas(database.Summary);
-      const summary = {};
       await Promise.all(
         fieldMetas.filter((fieldMeta) => !!fieldMeta.query).map(async (fieldMeta) => {
           const query = typeof fieldMeta.query === "function" ? fieldMeta.query() : fieldMeta.query;
-          summary[fieldMeta.key] = query ? await model.countDocuments({ ...query, ...addQuery }) : fieldMeta.default;
+          summary[fieldMeta.key] = query ? await model.countDocuments({ ...query }) : fieldMeta.default;
         })
       );
       return summary;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/document",
-  "version": "0.9.42",
+  "version": "0.9.43",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/database.d.ts

@@ -1,4 +1,4 @@
-import { type Dayjs } from "@akanjs/base";
+import { type Dayjs, type MergedValues } from "@akanjs/base";
 import { Logger } from "@akanjs/common";
 import { type DocumentModel, type FilterType, type FindQueryOption, type GetActionObject, type ListQueryOption, type QueryOf, type SortOf } from "@akanjs/constant";
 import type DataLoader from "dataloader";
@@ -41,25 +41,53 @@ declare class SearchDatabase<T = any> {
         sort?: string | null;
     }): Promise<number>;
 }
-export type DatabaseModel<T extends string, Input, Doc, Obj, Insight, Filter, Summary = any> = DatabaseModelWithQuerySort<T, Input, Doc, Obj, Insight, GetActionObject<Filter>, SortOf<Filter>, Summary>;
-type DatabaseModelWithQuerySort<T extends string, Input, Doc, Obj, Insight, Query, Sort, Summary = any> = {
+type QueryMethodOfKey<CapitalizedK extends string, Doc, Insight, _Args extends any[], _ListArgs extends any[], _FindArgs extends any[]> = {
+    [K in `list${CapitalizedK}`]: (...args: _ListArgs) => Promise<Doc[]>;
+} & {
+    [K in `listIds${CapitalizedK}`]: (...args: _ListArgs) => Promise<string[]>;
+} & {
+    [K in `find${CapitalizedK}`]: (...args: _FindArgs) => Promise<Doc | null>;
+} & {
+    [K in `findId${CapitalizedK}`]: (...args: _FindArgs) => Promise<string | null>;
+} & {
+    [K in `pick${CapitalizedK}`]: (...args: _FindArgs) => Promise<Doc>;
+} & {
+    [K in `pickId${CapitalizedK}`]: (...args: _FindArgs) => Promise<string>;
+} & {
+    [K in `exists${CapitalizedK}`]: (...args: _Args) => Promise<string | null>;
+} & {
+    [K in `count${CapitalizedK}`]: (...args: _Args) => Promise<number>;
+} & {
+    [K in `insight${CapitalizedK}`]: (...args: _Args) => Promise<Insight>;
+};
+export type QueryMethodPart<Query, Sort, Obj, Doc, Insight, _FindQueryOption = FindQueryOption<Sort, Obj>, _ListQueryOption = ListQueryOption<Sort, Obj>> = MergedValues<{
+    [K in keyof Query]: K extends string ? Query[K] extends (...args: infer Args) => any ? QueryMethodOfKey<Capitalize<K>, Doc, Insight, Args, [
+        ...Args,
+        queryOption?: _ListQueryOption
+    ], [
+        ...Args,
+        queryOption?: _FindQueryOption
+    ]> : never : never;
+}>;
+type DatabaseModelWithQuerySort<T extends string, Input, Doc, Obj, Insight, Query, Sort, Summary = any, _CapitalizedT extends string = Capitalize<T>, _QueryOfDoc = QueryOf<Doc>, _DataInput = DataInputOf<Input, DocumentModel<Obj>>, _FindQueryOption = FindQueryOption<Sort, Obj>, _ListQueryOption = ListQueryOption<Sort, Obj>> = {
     logger: Logger;
     __model: Mdl<Doc, Obj>;
     __cache: CacheDatabase<T>;
     __search: SearchDatabase<T>;
     __loader: DataLoader<string, Doc, string>;
-    __list(query?: QueryOf<Doc>, queryOption?: ListQueryOption<Sort, Obj>): Promise<Doc[]>;
-    __listIds(query?: QueryOf<Doc>, queryOption?: ListQueryOption<Sort, Obj>): Promise<string[]>;
-    __find(query?: QueryOf<Doc>, queryOption?: FindQueryOption<Sort, Obj>): Promise<Doc | null>;
-    __findId(query?: QueryOf<Doc>, queryOption?: FindQueryOption<Sort, Obj>): Promise<string | null>;
-    __pick(query?: QueryOf<Doc>, queryOption?: FindQueryOption<Sort, Obj>): Promise<Doc>;
-    __pickId(query?: QueryOf<Doc>, queryOption?: FindQueryOption<Sort, Obj>): Promise<string>;
-    __exists(query?: QueryOf<Doc>): Promise<string | null>;
-    __count(query?: QueryOf<Doc>): Promise<number>;
-    __insight(query?: QueryOf<Doc>): Promise<Insight>;
-    getDefaultSummary(addQuery?: QueryOf<Doc>): Promise<Summary>;
-} & {
-    [key in Capitalize<T>]: Mdl<Doc, Obj>;
+    __list(query: _QueryOfDoc, queryOption?: _ListQueryOption): Promise<Doc[]>;
+    __listIds(query: _QueryOfDoc, queryOption?: _ListQueryOption): Promise<string[]>;
+    __find(query: _QueryOfDoc, queryOption?: _FindQueryOption): Promise<Doc | null>;
+    __findId(query: _QueryOfDoc, queryOption?: _FindQueryOption): Promise<string | null>;
+    __pick(query: _QueryOfDoc, queryOption?: _FindQueryOption): Promise<Doc>;
+    __pickId(query: _QueryOfDoc, queryOption?: _FindQueryOption): Promise<string>;
+    __exists(query: _QueryOfDoc): Promise<string | null>;
+    __count(query: _QueryOfDoc): Promise<number>;
+    __insight(query: _QueryOfDoc): Promise<Insight>;
+    _preSummary(): Promise<Partial<Summary>>;
+    getSummary(): Promise<Summary>;
+} & {
+    [key in _CapitalizedT]: Mdl<Doc, Obj>;
 } & {
     [key in `${T}Loader`]: DataLoader<string, Doc, string>;
 } & {
@@ -67,44 +95,27 @@ type DatabaseModelWithQuerySort<T extends string, Input, Doc, Obj, Insight, Quer
 } & {
     [key in `${T}Search`]: SearchDatabase<T>;
 } & {
-    [K in `get${Capitalize<T>}`]: (id: string) => Promise<Doc>;
+    [K in `get${_CapitalizedT}`]: (id: string) => Promise<Doc>;
 } & {
-    [K in `load${Capitalize<T>}`]: (id?: string) => Promise<Doc | null>;
+    [K in `load${_CapitalizedT}`]: (id?: string) => Promise<Doc | null>;
 } & {
-    [K in `load${Capitalize<T>}Many`]: (ids: string) => Promise<Doc[]>;
+    [K in `load${_CapitalizedT}Many`]: (ids: string[]) => Promise<Doc[]>;
 } & {
-    [K in `create${Capitalize<T>}`]: (data: DataInputOf<Input, DocumentModel<Obj>>) => Promise<Doc>;
+    [K in `create${_CapitalizedT}`]: (data: _DataInput) => Promise<Doc>;
 } & {
-    [K in `update${Capitalize<T>}`]: (id: string, data: DataInputOf<Input, DocumentModel<Obj>>) => Promise<Doc>;
+    [K in `update${_CapitalizedT}`]: (id: string, data: _DataInput) => Promise<Doc>;
 } & {
-    [K in `remove${Capitalize<T>}`]: (id: string) => Promise<Doc>;
+    [K in `remove${_CapitalizedT}`]: (id: string) => Promise<Doc>;
 } & {
-    [K in `search${Capitalize<T>}`]: (searchText: string, queryOption?: ListQueryOption<Sort, Obj>) => Promise<{
+    [K in `search${_CapitalizedT}`]: (searchText: string, queryOption?: _ListQueryOption) => Promise<{
         docs: Doc[];
         count: number;
     }>;
 } & {
-    [K in `searchDocs${Capitalize<T>}`]: (searchText: string, queryOption?: ListQueryOption<Sort, Obj>) => Promise<Doc[]>;
-} & {
-    [K in `searchCount${Capitalize<T>}`]: (searchText: string) => Promise<number>;
+    [K in `searchDocs${_CapitalizedT}`]: (searchText: string, queryOption?: _ListQueryOption) => Promise<Doc[]>;
 } & {
-    [K in keyof Query as K extends string ? `list${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: ListQueryOption<Sort, Obj>]) => Promise<Doc[]> : never;
-} & {
-    [K in keyof Query as K extends string ? `listIds${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: ListQueryOption<Sort, Obj>]) => Promise<string[]> : never;
-} & {
-    [K in keyof Query as K extends string ? `find${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: FindQueryOption<Sort, Obj>]) => Promise<Doc | null> : never;
-} & {
-    [K in keyof Query as K extends string ? `findId${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: FindQueryOption<Sort, Obj>]) => Promise<string | null> : never;
-} & {
-    [K in keyof Query as K extends string ? `pick${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: FindQueryOption<Sort, Obj>]) => Promise<Doc> : never;
-} & {
-    [K in keyof Query as K extends string ? `pickId${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args, queryOption?: FindQueryOption<Sort, Obj>]) => Promise<string> : never;
-} & {
-    [K in keyof Query as K extends string ? `exists${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args]) => Promise<string | null> : never;
-} & {
-    [K in keyof Query as K extends string ? `count${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args]) => Promise<number> : never;
-} & {
-    [K in keyof Query as K extends string ? `insight${Capitalize<K>}` : never]: Query[K] extends (...args: infer Args) => any ? (...args: [...Args]) => Promise<Insight> : never;
-};
+    [K in `searchCount${_CapitalizedT}`]: (searchText: string) => Promise<number>;
+} & QueryMethodPart<Query, Sort, Obj, Doc, Insight, _FindQueryOption, _ListQueryOption>;
+export type DatabaseModel<T extends string, Input, Doc, Obj, Insight, Filter, Summary = any, _CapitalizedT extends string = Capitalize<T>, _QueryOfDoc = QueryOf<Doc>, _Query = GetActionObject<Filter>, _Sort = SortOf<Filter>, _DataInput = DataInputOf<Input, DocumentModel<Obj>>, _FindQueryOption = FindQueryOption<_Sort, Obj>, _ListQueryOption = ListQueryOption<_Sort, Obj>> = DatabaseModelWithQuerySort<T, Input, Doc, Obj, Insight, _Query, _Sort, Summary, _CapitalizedT, _QueryOfDoc, _DataInput, _FindQueryOption, _ListQueryOption>;
 export declare const databaseModelOf: <T extends string, Input, Doc extends HydratedDocument<any>, Model extends Mdl<any, any>, Middleware extends BaseMiddleware, Insight, Obj, Filter extends FilterType, Summary>(database: Database<T, Input, Doc, Model, Middleware, Insight, Obj, Filter, Summary>, model: Mdl<any, any>, redis: RedisClientType, meili: MeiliSearch) => DatabaseModel<T, Input, Doc, Model, Insight, Filter, Summary>;
 export {};

package/src/dbDecorators.d.ts

@@ -12,16 +12,16 @@ type HydratedDocumentWithId<TDocument> = Omit<HydratedDocument<TDocument, Defaul
     id: string;
 } & DefaultDocMtds<TDocument>;
 export type Doc<M> = HydratedDocumentWithId<DocumentModel<M>>;
-interface DefaultMdlStats<TDocument, TSchema> {
-    pickOneAndWrite: (query: FilterQuery<TSchema>, rawData: Partial<TSchema>) => Promise<TDocument>;
-    pickAndWrite: (docId: string, rawData: Partial<TSchema>) => Promise<TDocument>;
-    pickOne: (query: FilterQuery<TSchema>, projection?: ProjectionType<TSchema>) => Promise<TDocument>;
-    pickById: (docId: string | undefined, projection?: ProjectionType<TSchema>) => Promise<TDocument>;
+interface DefaultMdlStats<TDocument, TSchema, _Partial extends Partial<TSchema> = Partial<TSchema>, _FilterQuery extends FilterQuery<TSchema> = FilterQuery<TSchema>, _Projection extends ProjectionType<TSchema> = ProjectionType<TSchema>> {
+    pickOneAndWrite: (query: _FilterQuery, rawData: _Partial) => Promise<TDocument>;
+    pickAndWrite: (docId: string, rawData: _Partial) => Promise<TDocument>;
+    pickOne: (query: _FilterQuery, projection?: _Projection) => Promise<TDocument>;
+    pickById: (docId: string | undefined, projection?: _Projection) => Promise<TDocument>;
     addSummary: (prefix?: string | string[], num?: number) => Promise<void>;
     moveSummary: (prev: string, next: string, num?: number) => Promise<void>;
     subSummary: (prefix?: string | string[], num?: number) => Promise<void>;
-    sample: (query: FilterQuery<TSchema>, size?: number, aggregations?: PipelineStage[]) => Promise<TDocument[]>;
-    sampleOne: (query: FilterQuery<TSchema>, aggregations?: PipelineStage[]) => Promise<TDocument | null>;
+    sample: (query: _FilterQuery, size?: number, aggregations?: PipelineStage[]) => Promise<TDocument[]>;
+    sampleOne: (query: _FilterQuery, aggregations?: PipelineStage[]) => Promise<TDocument | null>;
 }
 export type Mdl<Doc extends HydratedDocument<any>, Raw> = MongooseModel<Raw, unknown, unknown, unknown, Doc> & DefaultMdlStats<Doc, DocumentModel<Raw>>;
 export type SchemaOf<Mdl, Doc> = Schema<null, Mdl, Doc, undefined, null, Mdl>;
@@ -55,8 +55,8 @@ export declare const Database: {
     Model: (returns: () => Type) => (target: any) => void;
     Middleware: (returns: () => Type) => (target: any) => void;
 };
-export declare const into: <Doc, T extends string, Input, Full, Light, Insight, Summary, Filter extends FilterType>(docRef: Type<Doc>, cnst: ConstantModel<T, Input, Full, Light, Insight, Filter, Summary>) => Type<DatabaseModel<T, DocumentModel<Input>, Doc, Full, Insight, Filter, Summary>>;
-export declare const inside: <Doc, T extends string, Input, Full, Light, Insight, Filter extends FilterType, Summary>(modelRef: Type, cnst: ConstantModel<T, Input, Full, Light, Insight, Filter, Summary>) => Type<DatabaseModel<T, DocumentModel<Input>, Doc, Full, Insight, Filter, Summary>>;
+export declare const into: <Doc, T extends string, Input, Full, Light, Insight, Summary, Filter extends FilterType, _CapitalizedT extends string, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _Doc, _DocInput, _QueryOfDoc, _Query, _Sort>(docRef: Type<Doc>, cnst: ConstantModel<T, Input, Full, Light, Insight, Filter, Summary, _CapitalizedT, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _Doc, _DocInput, _QueryOfDoc, _Query, _Sort>) => Type<DatabaseModel<T, _DocInput, Doc, Full, Insight, Filter, Summary, _CapitalizedT, _QueryOfDoc, _Query, _Sort>>;
+export declare const inside: <Doc, T extends string, Input, Full, Light, Insight, Filter extends FilterType, Summary, _CapitalizedT extends string, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _Doc, _DocInput, _QueryOfDoc, _Query, _Sort>(modelRef: Type, cnst: ConstantModel<T, Input, Full, Light, Insight, Filter, Summary, _CapitalizedT, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _Doc, _DocInput, _QueryOfDoc, _Query, _Sort>) => Type<DatabaseModel<T, _DocInput, Doc, Full, Insight, Filter, Summary, _CapitalizedT, _QueryOfDoc, _Query, _Sort>>;
 export declare const by: <Model, AddModel>(modelRef: Type<Model>, addRef?: Type<AddModel>) => AddModel extends {
     [key: string]: any;
 } ? Type<Model & (AddModel extends BaseObject ? Doc<AddModel> : DocumentModel<AddModel>)> : Type<Model extends BaseObject ? Doc<Model> : DocumentModel<Model>>;

package/src/types.d.ts

@@ -1,5 +1,3 @@
 export type DataInputOf<Input, Obj> = {
-    [K in keyof Input as Input[K] extends any[] ? never : K]: Input[K];
-} & {
-    [K in keyof Input as Input[K] extends any[] ? K : never]?: Input[K];
+    [K in keyof Input as K extends K ? K : never]: Input[K] extends any[] ? Input[K] | undefined : Input[K];
 } & Partial<Obj>;