@akanjs/constant 0.9.56 → 0.9.57

package/cjs/src/baseGql.js

@@ -193,12 +193,12 @@ const extendModelObjects = (inputRef, fieldMap, ...libObjectModelRefs) => {
 const extendModelInsights = (fieldMap, ...insightModelRefs) => {
   const baseInsightModelRef = insightModelRefs.at(0);
   const insightFieldMetaMap = baseInsightModelRef ? (0, import_scalar.getFieldMetaMap)(baseInsightModelRef) : new Map([...baseInsightFieldMetaMap]);
-  class BaseInsight {
+  class BaseInsight2 {
   }
-  (0, import_scalar.setFieldMetaMap)(BaseInsight, insightFieldMetaMap);
-  import_constantInfo.constantInfo.setModelType(BaseInsight, "insight");
+  (0, import_scalar.setFieldMetaMap)(BaseInsight2, insightFieldMetaMap);
+  import_constantInfo.constantInfo.setModelType(BaseInsight2, "insight");
   Object.entries(fieldMap).forEach(([key, fieldInfo]) => {
-    fieldInfo.applyFieldMeta(BaseInsight, key);
+    fieldInfo.applyFieldMeta(BaseInsight2, key);
   });
-  return BaseInsight;
+  return BaseInsight2;
 };

package/cjs/src/default.js

@@ -49,8 +49,6 @@ const makeDefault = (modelRef, option = {}) => {
     else if (metadata.default) {
       if (typeof metadata.default === "function")
         result[metadata.key] = metadata.default();
-      else if (metadata.default instanceof import_base.Enum)
-        result[metadata.key] = [...metadata.default.values];
       else
         result[metadata.key] = metadata.default;
     } else if (metadata.isArray)

package/cjs/src/fieldInfo.js

@@ -32,10 +32,10 @@ class FieldInfo {
   constructor(value, option) {
     this.value = value;
     const [singleValue, arrDepth] = (0, import_base.getNonArrayModel)(value);
-    const isEnum = singleValue instanceof import_base.Enum;
-    const valueType = isEnum ? (0, import_base.arraiedModel)(singleValue.type, arrDepth) : value;
+    const isEnumValue = (0, import_base.isEnum)(singleValue);
+    const valueType = isEnumValue ? (0, import_base.arraiedModel)(singleValue.type, arrDepth) : value;
     this.type = valueType;
-    this.option = { ...option, ...isEnum ? { enum: singleValue } : {} };
+    this.option = { ...option, ...isEnumValue ? { enum: singleValue } : {} };
   }
   optional() {
     return new FieldInfo(this.value, { ...this.option, nullable: true });

package/cjs/src/types.js

@@ -28,5 +28,6 @@ var import_base = require("@akanjs/base");
 const DEFAULT_PAGE_SIZE = 20;
 const unsetDate = (0, import_base.dayjs)(/* @__PURE__ */ new Date("0000"));
 const MAX_INT = 2147483647;
-const Responsive = (0, import_base.enumOf)(["xl", "lg", "md", "sm", "xs"]);
+class Responsive extends (0, import_base.enumOf)("responsive", ["xl", "lg", "md", "sm", "xs"]) {
+}
 const responsiveWidths = [1200, 992, 768, 576, 0];

package/esm/src/baseGql.js

@@ -174,14 +174,14 @@ const extendModelObjects = (inputRef, fieldMap, ...libObjectModelRefs) => {
 const extendModelInsights = (fieldMap, ...insightModelRefs) => {
   const baseInsightModelRef = insightModelRefs.at(0);
   const insightFieldMetaMap = baseInsightModelRef ? getFieldMetaMap(baseInsightModelRef) : new Map([...baseInsightFieldMetaMap]);
-  class BaseInsight {
+  class BaseInsight2 {
   }
-  setFieldMetaMap(BaseInsight, insightFieldMetaMap);
-  constantInfo.setModelType(BaseInsight, "insight");
+  setFieldMetaMap(BaseInsight2, insightFieldMetaMap);
+  constantInfo.setModelType(BaseInsight2, "insight");
   Object.entries(fieldMap).forEach(([key, fieldInfo]) => {
-    fieldInfo.applyFieldMeta(BaseInsight, key);
+    fieldInfo.applyFieldMeta(BaseInsight2, key);
   });
-  return BaseInsight;
+  return BaseInsight2;
 };
 export {
   via

package/esm/src/default.js

@@ -1,4 +1,4 @@
-import { Enum, scalarDefaultMap } from "@akanjs/base";
+import { scalarDefaultMap } from "@akanjs/base";
 import { capitalize } from "@akanjs/common";
 import { constantInfo } from "./constantInfo";
 import { getFieldMetas } from "./scalar";
@@ -27,8 +27,6 @@ const makeDefault = (modelRef, option = {}) => {
     else if (metadata.default) {
       if (typeof metadata.default === "function")
         result[metadata.key] = metadata.default();
-      else if (metadata.default instanceof Enum)
-        result[metadata.key] = [...metadata.default.values];
       else
         result[metadata.key] = metadata.default;
     } else if (metadata.isArray)

package/esm/src/fieldInfo.js

@@ -1,7 +1,7 @@
 import {
   arraiedModel,
-  Enum,
   getNonArrayModel,
+  isEnum,
   isGqlMap,
   isGqlScalar
 } from "@akanjs/base";
@@ -18,10 +18,10 @@ class FieldInfo {
   constructor(value, option) {
     this.value = value;
     const [singleValue, arrDepth] = getNonArrayModel(value);
-    const isEnum = singleValue instanceof Enum;
-    const valueType = isEnum ? arraiedModel(singleValue.type, arrDepth) : value;
+    const isEnumValue = isEnum(singleValue);
+    const valueType = isEnumValue ? arraiedModel(singleValue.type, arrDepth) : value;
     this.type = valueType;
-    this.option = { ...option, ...isEnum ? { enum: singleValue } : {} };
+    this.option = { ...option, ...isEnumValue ? { enum: singleValue } : {} };
   }
   optional() {
     return new FieldInfo(this.value, { ...this.option, nullable: true });

package/esm/src/types.js

@@ -2,7 +2,8 @@ import { dayjs, enumOf } from "@akanjs/base";
 const DEFAULT_PAGE_SIZE = 20;
 const unsetDate = dayjs(/* @__PURE__ */ new Date("0000"));
 const MAX_INT = 2147483647;
-const Responsive = enumOf(["xl", "lg", "md", "sm", "xs"]);
+class Responsive extends enumOf("responsive", ["xl", "lg", "md", "sm", "xs"]) {
+}
 const responsiveWidths = [1200, 992, 768, 576, 0];
 export {
   DEFAULT_PAGE_SIZE,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/constant",
-  "version": "0.9.56",
+  "version": "0.9.57",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/baseGql.d.ts

@@ -1,14 +1,12 @@
 import "reflect-metadata";
-import { BaseObject, type MergeAllTypes, type Prettify, Type } from "@akanjs/base";
+import { BaseInsight, BaseObject, type MergeAllTypes, type Prettify, Type } from "@akanjs/base";
 import { type ExtractFieldInfoObject, type FieldBuilder, type FieldInfoObject, FieldResolver } from "./fieldInfo";
 import type { NonFunctionalKeys } from "./types";
 type BaseFields = "id" | "createdAt" | "updatedAt" | "removedAt";
 type OmitBase<T> = Omit<T, BaseFields>;
 export declare function via<T extends BaseObject, K extends NonFunctionalKeys<OmitBase<T>>, ResolveField extends (resolve: FieldResolver) => FieldInfoObject, LightModels extends Type[]>(modelRef: Type<T>, fields: readonly K[], resolveField: ResolveField, ...lightModelRefs: LightModels): Type<Prettify<MergeAllTypes<LightModels> & Pick<T, K> & BaseObject & ExtractFieldInfoObject<ReturnType<ResolveField>>>>;
 export declare function via<BuildField extends (builder: FieldBuilder) => FieldInfoObject, Inputs extends Type[]>(buildField: BuildField, ...extendInputRefs: Inputs): Type<MergeAllTypes<Inputs> & ExtractFieldInfoObject<ReturnType<BuildField>>>;
-export declare function via<T extends BaseObject, BuildField extends (builder: FieldBuilder) => FieldInfoObject, Insights extends Type[]>(modelRef: Type<T>, buildField: BuildField, ...extendInsightRefs: Insights): Type<MergeAllTypes<Insights> & {
-    count: number;
-} & ExtractFieldInfoObject<ReturnType<BuildField>>>;
+export declare function via<T extends BaseObject, BuildField extends (builder: FieldBuilder) => FieldInfoObject, Insights extends Type[]>(modelRef: Type<T>, buildField: BuildField, ...extendInsightRefs: Insights): Type<MergeAllTypes<Insights> & BaseInsight & ExtractFieldInfoObject<ReturnType<BuildField>>>;
 export declare function via<T, BuildField extends (builder: FieldBuilder) => FieldInfoObject, ObjectModels extends Type[]>(inputRef: Type<T>, buildField: BuildField, ...extendObjectRefs: ObjectModels): Type<Prettify<MergeAllTypes<ObjectModels> & T & BaseObject & ExtractFieldInfoObject<ReturnType<BuildField>>>>;
 export declare function via<T, Light, ResolveField extends (resolve: FieldResolver) => FieldInfoObject, FullModels extends Type[]>(objectRef: Type<T>, lightModelRef: Type<Light>, resolveField: ResolveField, ...fullModelRefs: FullModels): Type<Prettify<MergeAllTypes<FullModels> & T & Light & ExtractFieldInfoObject<ReturnType<ResolveField>>>>;
 export {};

package/src/classMeta.d.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { type Enum, type Type } from "@akanjs/base";
+import { type EnumInstance, type Type } from "@akanjs/base";
 export declare const setExtendRef: (modelRef: Type, extendRef: Type) => void;
 export declare const getExtendRef: <AllowEmpty extends boolean = false>(modelRef: Type, { allowEmpty }?: {
     allowEmpty?: AllowEmpty;
@@ -7,6 +7,6 @@ export declare const getExtendRef: <AllowEmpty extends boolean = false>(modelRef
 export declare const getChildClassRefs: (target: Type) => Type[];
 export declare const getFieldEnumMetas: (modelRef: Type) => {
     key: string;
-    enum: Enum;
+    enum: EnumInstance;
 }[];
 export declare const hasTextField: (modelRef: Type) => boolean;

package/src/constantInfo.d.ts

@@ -6,7 +6,7 @@ export type ModelType = "input" | "object" | "full" | "light" | "insight" | "fil
 export declare const constantInfo: {
     database: Map<string, ConstantModel<any, any, any, any, any, any, DefaultOf<any>, DefaultOf<any>, GetStateObject<any>, GetStateObject<any>, DefaultOf<any>, any, any, any, QueryOf<any>>>;
     scalar: Map<string, ScalarConstantModel<any, any, any, any, any>>;
-    modelRefNameMap: Map<Type, string>;
+    modelRefNameMap: Map<new (...args: any[]) => any, string>;
     getRefName<AllowEmpty extends boolean = false>(modelRef: Type, { allowEmpty }?: {
         allowEmpty?: AllowEmpty;
     }): AllowEmpty extends true ? string | undefined : string;

package/src/fieldInfo.d.ts

@@ -1,9 +1,9 @@
-import { type Dayjs, Enum, Float, type GqlScalar, ID, Int, JSON, type Type, type UnType } from "@akanjs/base";
+import { type Dayjs, EnumInstance, Float, type GqlScalar, ID, Int, JSON, type Type, type UnType } from "@akanjs/base";
 import { ConstantFieldProps } from "./scalar";
-export type ParamFieldType = typeof ID | typeof Int | StringConstructor | typeof Date | BooleanConstructor | Enum<string>;
-export type ConstantFieldType = ParamFieldType | DateConstructor | typeof Float | typeof JSON | Type | MapConstructor | Enum<number>;
+export type ParamFieldType = typeof ID | typeof Int | StringConstructor | typeof Date | BooleanConstructor | EnumInstance<string, string>;
+export type ConstantFieldType = ParamFieldType | DateConstructor | typeof Float | typeof JSON | Type | MapConstructor | EnumInstance<string, number>;
 export type ConstantFieldTypeInput = ConstantFieldType | ConstantFieldType[] | ConstantFieldType[][] | ConstantFieldType[][][];
-export type FieldToValue<Field, MapValue = any> = Field extends null ? FieldToValue<Exclude<Field, null>> | null : Field extends MapConstructor ? Map<string, FieldToValue<MapValue>> : Field extends (infer F)[] ? FieldToValue<F>[] : Field extends typeof ID ? string : Field extends DateConstructor ? Dayjs : Field extends StringConstructor ? string : Field extends BooleanConstructor ? boolean : Field extends typeof Int ? number : Field extends typeof Float ? number : Field extends typeof JSON ? any : Field extends Type ? UnType<Field> : Field extends Enum<infer V> ? V : never;
+export type FieldToValue<Field, MapValue = any> = Field extends null ? FieldToValue<Exclude<Field, null>> | null : Field extends MapConstructor ? Map<string, FieldToValue<MapValue>> : Field extends (infer F)[] ? FieldToValue<F>[] : Field extends typeof ID ? string : Field extends DateConstructor ? Dayjs : Field extends StringConstructor ? string : Field extends BooleanConstructor ? boolean : Field extends typeof Int ? number : Field extends typeof Float ? number : Field extends typeof JSON ? any : Field extends EnumInstance<string, infer V> ? V : Field extends Type ? UnType<Field> : never;
 export interface FieldInfoObject {
     [key: string]: FieldInfo<ConstantFieldTypeInput | null, any>;
 }
@@ -28,8 +28,8 @@ type FieldOption<Value extends ConstantFieldTypeInput, MapValue = Value extends
 export type PlainTypeToFieldType<PlainType> = PlainType extends [infer First, ...infer Rest] ? PlainTypeToFieldType<First>[] : PlainType extends number ? typeof Int | typeof Float : PlainType extends string ? StringConstructor : typeof JSON;
 export declare const field: {
     <ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof Int | typeof import("@akanjs/base").Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<Value, ExplicitType, MapValue>;
-    secret<ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof Int | typeof import("@akanjs/base").Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<Value | null, ExplicitType, MapValue>;
-    hidden<ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof Int | typeof import("@akanjs/base").Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<Value | null, ExplicitType, MapValue>;
+    secret<ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof Int | typeof import("@akanjs/base").Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<Value | null, ExplicitType | null, MapValue>;
+    hidden<ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? typeof Int | typeof import("@akanjs/base").Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor : never>(value: Value, option?: FieldOption<Value, MapValue>): FieldInfo<Value | null, ExplicitType | null, MapValue>;
 };
 export declare const resolve: <ExplicitType, Value extends ConstantFieldTypeInput = PlainTypeToFieldType<ExplicitType>, MapValue = Value extends MapConstructor ? GqlScalar : never>(value: Value, option?: FieldOption<Value, MapValue>) => FieldInfo<Value, ExplicitType, MapValue>;
 export type FieldBuilder = typeof field;

package/src/purify.d.ts

@@ -6,7 +6,7 @@ type Purified<O> = O extends BaseObject ? string : O extends BaseObject[] ? stri
 type PurifiedWithObjectToId<T, StateKeys extends keyof GetStateObject<T> = keyof GetStateObject<T>> = {
     [K in StateKeys]: Purified<T[K]>;
 };
-export type PurifiedModel<T> = T extends (infer S)[] ? PurifiedModel<S>[] : T extends string | number | boolean | Dayjs | Upload ? T : T extends Map<infer K, infer V> ? Map<K, PurifiedModel<V>> : PurifiedWithObjectToId<T>;
+export type PurifiedModel<T> = T extends Upload[] ? FileList : T extends (infer S)[] ? PurifiedModel<S>[] : T extends string | number | boolean | Dayjs ? T : T extends Map<infer K, infer V> ? Map<K, PurifiedModel<V>> : PurifiedWithObjectToId<T>;
 export type PurifyFunc<Input, _DefaultInput = DefaultOf<Input>, _PurifiedInput = PurifiedModel<Input>> = (self: _DefaultInput, isChild?: boolean) => _PurifiedInput | null;
 export declare const makePurify: <I>(modelRef: Type<I>, option?: {
     overwrite?: any;

package/src/scalar.d.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { type Enum, Float, type GqlScalar, ID, Int, JSON, type SingleFieldType, type Type, Upload } from "@akanjs/base";
+import { EnumInstance, Float, type GqlScalar, ID, Int, JSON, type SingleFieldType, type Type, Upload } from "@akanjs/base";
 import type { AccumulatorOperator } from "mongoose";
 export declare const scalarExampleMap: Map<typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor, string | number | boolean | object>;
 export declare const getScalarExample: (ref: GqlScalar) => string | number | boolean | object | null;
@@ -29,7 +29,7 @@ export interface ConstantFieldProps<FieldValue = any, MapValue = any, Metadata =
     immutable?: boolean;
     min?: number;
     max?: number;
-    enum?: Enum;
+    enum?: EnumInstance;
     select?: boolean;
     minlength?: number;
     maxlength?: number;

package/src/types.d.ts

@@ -1,4 +1,4 @@
-import { type BaseObject, Dayjs, enumOf, type GetStateObject, Upload } from "@akanjs/base";
+import { type BaseObject, Dayjs, type GetStateObject, Upload } from "@akanjs/base";
 import type { FilterQuery, HydratedDocument } from "mongoose";
 export type { FilterQuery as QueryOf };
 type ObjectToId<O> = O extends BaseObject ? string : O extends BaseObject[] ? string[] : O extends Dayjs ? Dayjs : O extends {
@@ -63,6 +63,7 @@ export interface TextDoc {
 export type NonFunctionalKeys<T> = keyof T extends (...any: any[]) => any ? never : keyof T;
 export declare const unsetDate: Dayjs;
 export declare const MAX_INT = 2147483647;
-export declare const Responsive: import("@akanjs/base").Enum<"xl" | "lg" | "md" | "sm" | "xs">;
-export type Responsive = enumOf<typeof Responsive>;
+declare const Responsive_base: import("@akanjs/base").EnumInstance<"responsive", "xl" | "lg" | "md" | "sm" | "xs">;
+export declare class Responsive extends Responsive_base {
+}
 export declare const responsiveWidths: readonly [1200, 992, 768, 576, 0];