@akanjs/document 1.0.5-canary.4 → 1.0.6

package/cjs/src/dataLoader.js

@@ -107,7 +107,7 @@ const createQueryLoader = (model, queryKeys, defaultQuery = {}) => {
   );
 };
 const getLoaderMetaMapByPrototype = (prototype) => {
-  const loaderMetaMap = Reflect.getOwnMetadata("loaders", prototype) ?? /* @__PURE__ */ new Map();
+  const loaderMetaMap = Reflect.getMetadata("loaders", prototype) ?? /* @__PURE__ */ new Map();
   return loaderMetaMap;
 };
 const getLoaderMetas = (target) => {
@@ -116,24 +116,24 @@ const getLoaderMetas = (target) => {
 };
 const Loader = {
   ByField: (fieldName, defaultQuery = {}) => {
-    return function(target, key) {
-      const loaderMetaMap = getLoaderMetaMapByPrototype(target);
+    return function(prototype, key) {
+      const loaderMetaMap = getLoaderMetaMapByPrototype(prototype);
       loaderMetaMap.set(key, { key, type: "Field", fieldName, defaultQuery });
-      Reflect.defineMetadata("loaders", loaderMetaMap, target);
+      Reflect.defineMetadata("loaders", loaderMetaMap, prototype);
     };
   },
   ByArrayField: (fieldName, defaultQuery = {}) => {
-    return function(target, key) {
-      const loaderMetaMap = getLoaderMetaMapByPrototype(target);
+    return function(prototype, key) {
+      const loaderMetaMap = getLoaderMetaMapByPrototype(prototype);
       loaderMetaMap.set(key, { key, type: "ArrayField", fieldName, defaultQuery });
-      Reflect.defineMetadata("loaders", loaderMetaMap, target);
+      Reflect.defineMetadata("loaders", loaderMetaMap, prototype);
     };
   },
   ByQuery: (queryKeys, defaultQuery = {}) => {
-    return function(target, key) {
-      const loaderMetaMap = getLoaderMetaMapByPrototype(target);
+    return function(prototype, key) {
+      const loaderMetaMap = getLoaderMetaMapByPrototype(prototype);
       loaderMetaMap.set(key, { key, type: "Query", queryKeys, defaultQuery });
-      Reflect.defineMetadata("loaders", loaderMetaMap, target);
+      Reflect.defineMetadata("loaders", loaderMetaMap, prototype);
     };
   }
 };

package/cjs/src/database.js

@@ -88,10 +88,11 @@ class 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]));
+  const accumulator = Object.fromEntries(
+    Object.entries(database.Insight.field).map(([key, field]) => [key, field.accumulate])
+  );
   const defaultInsight = Object.fromEntries(
-    insightFieldMetas.map((fieldMeta) => [fieldMeta.key, fieldMeta.default])
+    Object.entries(database.Insight.field).map(([key, field]) => [key, field.default])
   );
   const makeSafeQuery = (query) => ({ removedAt: { $exists: false }, ...query ?? {} });
   const makeSafeMatchStage = (query) => ({

package/cjs/src/dbDecorators.js

@@ -22,7 +22,6 @@ __export(dbDecorators_exports, {
   into: () => into
 });
 module.exports = __toCommonJS(dbDecorators_exports);
-var import_constant = require("@akanjs/constant");
 var import_loaderInfo = require("./loaderInfo");
 const Model = (docRef, filterRef, cnst, loaderBuilder, ...addMdls) => {
   class DefaultModel {
@@ -35,15 +34,7 @@ const Model = (docRef, filterRef, cnst, loaderBuilder, ...addMdls) => {
 };
 const into = Model;
 const by = (modelRef, ...addRefs) => {
-  addRefs.forEach((addRef) => {
-    AddInputOrDocument(modelRef, addRef);
-  });
-  return modelRef;
-};
-const AddInputOrDocument = (modelRef, addRef) => {
-  const fieldMetaMap = (0, import_constant.getFieldMetaMap)(modelRef);
-  const addFieldMetas = (0, import_constant.getFieldMetaMap)(addRef);
-  (0, import_constant.setFieldMetaMap)(modelRef, new Map([...fieldMetaMap, ...addFieldMetas]));
+  Object.assign(modelRef.field, ...addRefs.map((addRef) => addRef.field));
   return modelRef;
 };
 const beyond = (model, doc) => {

package/esm/src/dataLoader.js

@@ -66,7 +66,7 @@ const createQueryLoader = (model, queryKeys, defaultQuery = {}) => {
   );
 };
 const getLoaderMetaMapByPrototype = (prototype) => {
-  const loaderMetaMap = Reflect.getOwnMetadata("loaders", prototype) ?? /* @__PURE__ */ new Map();
+  const loaderMetaMap = Reflect.getMetadata("loaders", prototype) ?? /* @__PURE__ */ new Map();
   return loaderMetaMap;
 };
 const getLoaderMetas = (target) => {
@@ -75,24 +75,24 @@ const getLoaderMetas = (target) => {
 };
 const Loader = {
   ByField: (fieldName, defaultQuery = {}) => {
-    return function(target, key) {
-      const loaderMetaMap = getLoaderMetaMapByPrototype(target);
+    return function(prototype, key) {
+      const loaderMetaMap = getLoaderMetaMapByPrototype(prototype);
       loaderMetaMap.set(key, { key, type: "Field", fieldName, defaultQuery });
-      Reflect.defineMetadata("loaders", loaderMetaMap, target);
+      Reflect.defineMetadata("loaders", loaderMetaMap, prototype);
     };
   },
   ByArrayField: (fieldName, defaultQuery = {}) => {
-    return function(target, key) {
-      const loaderMetaMap = getLoaderMetaMapByPrototype(target);
+    return function(prototype, key) {
+      const loaderMetaMap = getLoaderMetaMapByPrototype(prototype);
       loaderMetaMap.set(key, { key, type: "ArrayField", fieldName, defaultQuery });
-      Reflect.defineMetadata("loaders", loaderMetaMap, target);
+      Reflect.defineMetadata("loaders", loaderMetaMap, prototype);
     };
   },
   ByQuery: (queryKeys, defaultQuery = {}) => {
-    return function(target, key) {
-      const loaderMetaMap = getLoaderMetaMapByPrototype(target);
+    return function(prototype, key) {
+      const loaderMetaMap = getLoaderMetaMapByPrototype(prototype);
       loaderMetaMap.set(key, { key, type: "Query", queryKeys, defaultQuery });
-      Reflect.defineMetadata("loaders", loaderMetaMap, target);
+      Reflect.defineMetadata("loaders", loaderMetaMap, prototype);
     };
   }
 };

package/esm/src/database.js

@@ -1,6 +1,6 @@
 import { dayjs } from "@akanjs/base";
 import { capitalize, Logger, lowerlize } from "@akanjs/common";
-import { DEFAULT_PAGE_SIZE, getFieldMetas } from "@akanjs/constant";
+import { DEFAULT_PAGE_SIZE } from "@akanjs/constant";
 import { createArrayLoader, createLoader, createQueryLoader, getLoaderMetas } from "./dataLoader";
 import {
   getFilterKeyMetaMapOnPrototype,
@@ -70,10 +70,11 @@ class 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]));
+  const accumulator = Object.fromEntries(
+    Object.entries(database.Insight.field).map(([key, field]) => [key, field.accumulate])
+  );
   const defaultInsight = Object.fromEntries(
-    insightFieldMetas.map((fieldMeta) => [fieldMeta.key, fieldMeta.default])
+    Object.entries(database.Insight.field).map(([key, field]) => [key, field.default])
   );
   const makeSafeQuery = (query) => ({ removedAt: { $exists: false }, ...query ?? {} });
   const makeSafeMatchStage = (query) => ({

package/esm/src/dbDecorators.js

@@ -1,4 +1,3 @@
-import { getFieldMetaMap, setFieldMetaMap } from "@akanjs/constant";
 import { makeLoaderBuilder } from "./loaderInfo";
 const Model = (docRef, filterRef, cnst, loaderBuilder, ...addMdls) => {
   class DefaultModel {
@@ -11,15 +10,7 @@ const Model = (docRef, filterRef, cnst, loaderBuilder, ...addMdls) => {
 };
 const into = Model;
 const by = (modelRef, ...addRefs) => {
-  addRefs.forEach((addRef) => {
-    AddInputOrDocument(modelRef, addRef);
-  });
-  return modelRef;
-};
-const AddInputOrDocument = (modelRef, addRef) => {
-  const fieldMetaMap = getFieldMetaMap(modelRef);
-  const addFieldMetas = getFieldMetaMap(addRef);
-  setFieldMetaMap(modelRef, new Map([...fieldMetaMap, ...addFieldMetas]));
+  Object.assign(modelRef.field, ...addRefs.map((addRef) => addRef.field));
   return modelRef;
 };
 const beyond = (model, doc) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/document",
-  "version": "1.0.5-canary.4",
+  "version": "1.0.6",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/dataLoader.d.ts

@@ -7,8 +7,8 @@ export declare const ObjectId: typeof Schema.Types.ObjectId;
 export declare const Mixed: typeof Schema.Types.Mixed;
 export { DataLoader };
 export declare const createLoader: <Key, Value>(model: Model<any>, fieldName?: string, defaultQuery?: FilterQuery<unknown>) => DataLoader<Key, Value, Key>;
-export declare const createArrayLoader: <K, V>(model: Model<unknown, unknown, unknown, unknown>, fieldName?: string, defaultQuery?: FilterQuery<unknown>) => DataLoader<K, V, K>;
-export declare const createArrayElementLoader: <K, V>(model: Model<unknown>, fieldName?: string, defaultQuery?: FilterQuery<unknown>) => DataLoader<K, V, K>;
+export declare const createArrayLoader: <K, V>(model: Model<any>, fieldName?: string, defaultQuery?: FilterQuery<unknown>) => DataLoader<K, V, K>;
+export declare const createArrayElementLoader: <K, V>(model: Model<any>, fieldName?: string, defaultQuery?: FilterQuery<unknown>) => DataLoader<K, V, K>;
 export declare const createQueryLoader: <Key, Value>(model: Model<any>, queryKeys: string[], defaultQuery?: FilterQuery<unknown>) => DataLoader<Key, Value, Key>;
 export interface LoaderMeta {
     key: string;
@@ -20,7 +20,7 @@ export interface LoaderMeta {
 export declare const getLoaderMetas: (target: Type) => LoaderMeta[];
 export type Loader<Field, Value> = DataLoader<Field, Value | null>;
 export declare const Loader: {
-    ByField: (fieldName: string, defaultQuery?: FilterQuery<unknown>) => (target: object, key: string) => void;
-    ByArrayField: (fieldName: string, defaultQuery?: FilterQuery<unknown>) => (target: object, key: string) => void;
-    ByQuery: (queryKeys: string[], defaultQuery?: FilterQuery<unknown>) => (target: object, key: string) => void;
+    ByField: (fieldName: string, defaultQuery?: FilterQuery<unknown>) => (prototype: object, key: string) => void;
+    ByArrayField: (fieldName: string, defaultQuery?: FilterQuery<unknown>) => (prototype: object, key: string) => void;
+    ByQuery: (queryKeys: string[], defaultQuery?: FilterQuery<unknown>) => (prototype: object, key: string) => void;
 };

package/src/dbDecorators.d.ts

@@ -1,5 +1,5 @@
 import { BaseObject, type MergeAllActionTypes, PromiseOrObject, Type } from "@akanjs/base";
-import { type ConstantModel, type DocumentModel } from "@akanjs/constant";
+import { type ConstantModel, type DocumentModel, FieldObject } from "@akanjs/constant";
 import type { FilterQuery, HydratedDocument, Model as MongooseModel, PipelineStage, ProjectionType, Schema } from "mongoose";
 import { ExtractQuery, FilterInstance } from ".";
 import type { DatabaseModel } from "./database";
@@ -40,7 +40,9 @@ export interface BaseMiddleware {
     onSchema: (schema: SchemaOf<any, any>) => void;
 }
 export declare const into: <Doc, Filter extends FilterInstance, T extends string, Input, Obj, Full, Light, Insight, AddDbModels extends Type[], _CapitalizedT extends string, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc, _Query = ExtractQuery<Filter>, _Sort = keyof Filter["sort"], _DatabaseModel = DatabaseModel<T, _DocInput, Doc, Full, Insight, Filter, _CapitalizedT, _QueryOfDoc, _Query, _Sort>, _LoaderBuilder extends LoaderBuilder<_Doc> = LoaderBuilder<_Doc>>(docRef: Type<Doc>, filterRef: Type<Filter>, cnst: ConstantModel<T, Input, Obj, Full, Light, Insight, _CapitalizedT, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc>, loaderBuilder: _LoaderBuilder, ...addMdls: AddDbModels) => Type<MergeAllActionTypes<AddDbModels, keyof _DatabaseModel & string> & _DatabaseModel & ExtractLoaderInfoObject<ReturnType<_LoaderBuilder>>>;
-export declare const by: <Model, AddDbModels extends Type[], _DocModel = Model extends BaseObject ? Doc<Model> : DocumentModel<Model>>(modelRef: Type<Model>, ...addRefs: AddDbModels) => Type<MergeAllActionTypes<AddDbModels, keyof _DocModel & string> & _DocModel>;
+export declare const by: <Model, AddDbModels extends Type[], _DocModel = Model extends BaseObject ? Doc<Model> : DocumentModel<Model>>(modelRef: Type<Model, {
+    field: FieldObject;
+}>, ...addRefs: AddDbModels) => Type<MergeAllActionTypes<AddDbModels, keyof _DocModel & string> & _DocModel>;
 export declare const beyond: <DbModel, Doc>(model: Type<DbModel>, doc: Type<Doc>) => {
     new (): {
         onSchema(schema: SchemaOf<DbModel, Doc>): void;

package/src/documentInfo.d.ts

@@ -1,6 +1,6 @@
 import type { Type } from "@akanjs/base";
+import { Cnst } from "@akanjs/constant";
 import type { HydratedDocument } from "mongoose";
-import type { DatabaseModel } from "./database";
 import type { BaseMiddleware } from "./dbDecorators";
 import { FilterInstance } from "./filterMeta";
 export interface DatabaseDocumentModelInfo {
@@ -49,11 +49,11 @@ export interface Database<T extends string, Input, Doc extends HydratedDocument<
     Doc: Type<Doc>;
     Model: Type<Model>;
     Middleware: Type<Middleware>;
-    Obj: Type<Obj>;
-    Insight: Type<Insight>;
+    Obj: Cnst<Obj>;
+    Insight: Cnst<Insight>;
     Filter: Type<Filter>;
 }
-export declare const dbOf: <T extends string, Input, Doc extends HydratedDocument<any>, Model extends DatabaseModel<T, Input, any, Obj, Insight, Filter>, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterInstance>(refName: T, Input: Type<Input>, Doc: Type<Doc>, Model: Type<Model>, Middleware: Type<Middleware>, Obj: Type<Obj>, Insight: Type<Insight>, Filter: Type<Filter>) => Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter>;
+export declare const dbOf: <T extends string, Input, Doc extends HydratedDocument<any>, Model, Middleware extends BaseMiddleware, Obj, Insight, Filter extends FilterInstance>(refName: T, Input: Type<Input>, Doc: Type<Doc>, Model: Type<Model>, Middleware: Type<Middleware>, Obj: Cnst<Obj>, Insight: Cnst<Insight>, Filter: Type<Filter>) => Database<T, Input, Doc, Model, Middleware, Obj, Insight, Filter>;
 export declare const scalarDbOf: <T extends string, Model>(refName: T, Model: Type<Model>) => {
     refName: T;
     Model: Type<Model>;

package/src/filterMeta.d.ts

@@ -1,5 +1,5 @@
 import { type BaseObject, MergeAllKeyOfTypes, type Type } from "@akanjs/base";
-import { ConstantFieldTypeInput, FieldToValue, PlainTypeToFieldType, QueryOf } from "@akanjs/constant";
+import { ConstantFieldTypeInput, DocumentModel, FieldToValue, PlainTypeToFieldType, QueryOf } from "@akanjs/constant";
 import type { ConstantFilterMeta, FilterArgMeta, FilterKeyMeta } from "./types";
 export declare const isFilterModel: (filterRef: Type) => boolean;
 export declare const getFilterMeta: (filterRef: Type) => ConstantFilterMeta;
@@ -54,8 +54,8 @@ export declare class FilterInfo<ArgNames extends string[] = [], Args extends any
     }[];
     queryFn: ((...args: Args) => QueryOf<any>) | null;
     constructor();
-    arg<ExplicitType, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, ArgName extends string = "unknown", _FieldToValue = FieldToValue<Arg>>(name: ArgName, argRef: Arg, option?: Omit<ArgProps<_FieldToValue>, "nullable">): FilterInfo<[...ArgNames, ArgName], [...Args, arg: _FieldToValue], Model>;
-    opt<ExplicitType, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, ArgName extends string = "unknown", _FieldToValue = FieldToValue<Arg>>(name: ArgName, argRef: Arg, option?: Omit<ArgProps<_FieldToValue>, "nullable">): FilterInfo<[...ArgNames, ArgName], [...Args, opt?: _FieldToValue | null], Model>;
+    arg<ExplicitType, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, ArgName extends string = "unknown", _FieldToValue = DocumentModel<FieldToValue<Arg>>>(name: ArgName, argRef: Arg, option?: Omit<ArgProps<_FieldToValue>, "nullable">): FilterInfo<[...ArgNames, ArgName], [...Args, arg: _FieldToValue], Model>;
+    opt<ExplicitType, Arg extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, ArgName extends string = "unknown", _FieldToValue = DocumentModel<FieldToValue<Arg>>>(name: ArgName, argRef: Arg, option?: Omit<ArgProps<_FieldToValue>, "nullable">): FilterInfo<[...ArgNames, ArgName], [...Args, opt?: _FieldToValue | null], Model>;
     query(query: (...args: Args) => QueryOf<Model>): this;
     applyFilterMeta(filterRef: Type, key: string): void;
 }