@akanjs/base 0.9.48 → 0.9.49

package/cjs/src/base.js

@@ -23,14 +23,25 @@ __export(base_exports, {
   logo: () => logo
 });
 module.exports = __toCommonJS(base_exports);
+var import_scalar = require("./scalar");
 class Enum {
   constructor(values) {
     this.values = values;
     this.valueMap = new Map(values.map((value, idx) => [value, idx]));
+    const firstValue = values.at(0);
+    if (firstValue === void 0)
+      throw new Error("Enum values are empty");
+    if (typeof firstValue === "string")
+      this.type = String;
+    else if (values.every((value) => value % 1 === 0))
+      this.type = import_scalar.Int;
+    else
+      this.type = import_scalar.Float;
   }
   value;
   // for type
   valueMap;
+  type;
   has(value) {
     return this.valueMap.has(value);
   }

package/cjs/src/scalar.js

@@ -38,6 +38,7 @@ __export(scalar_exports, {
   arraiedModel: () => arraiedModel,
   dayjs: () => dayjs,
   getNonArrayModel: () => getNonArrayModel,
+  gqlScalarMap: () => gqlScalarMap,
   gqlScalarNames: () => gqlScalarNames,
   gqlScalars: () => gqlScalars,
   isGqlClass: () => isGqlClass,
@@ -99,6 +100,17 @@ const applyFnToArrayObjects = (arraiedData, fn) => {
 const gqlScalars = [String, Boolean, Date, ID, Int, Float, Upload, JSON, Map];
 const gqlScalarNames = ["ID", "Int", "Float", "String", "Boolean", "Date", "Upload", "JSON", "Map"];
 const scalarSet = /* @__PURE__ */ new Set([String, Boolean, Date, ID, Int, Float, Upload, JSON, Map]);
+const gqlScalarMap = /* @__PURE__ */ new Map([
+  ["ID", ID],
+  ["Int", Int],
+  ["Float", Float],
+  ["String", String],
+  ["Boolean", Boolean],
+  ["Date", Date],
+  ["Upload", Upload],
+  ["JSON", JSON],
+  ["Map", Map]
+]);
 const scalarNameMap = /* @__PURE__ */ new Map([
   [ID, "ID"],
   [Int, "Int"],

package/esm/src/base.js

@@ -1,11 +1,22 @@
+import { Float, Int } from "./scalar";
 class Enum {
   constructor(values) {
     this.values = values;
     this.valueMap = new Map(values.map((value, idx) => [value, idx]));
+    const firstValue = values.at(0);
+    if (firstValue === void 0)
+      throw new Error("Enum values are empty");
+    if (typeof firstValue === "string")
+      this.type = String;
+    else if (values.every((value) => value % 1 === 0))
+      this.type = Int;
+    else
+      this.type = Float;
   }
   value;
   // for type
   valueMap;
+  type;
   has(value) {
     return this.valueMap.has(value);
   }

package/esm/src/scalar.js

@@ -48,6 +48,17 @@ const applyFnToArrayObjects = (arraiedData, fn) => {
 const gqlScalars = [String, Boolean, Date, ID, Int, Float, Upload, JSON, Map];
 const gqlScalarNames = ["ID", "Int", "Float", "String", "Boolean", "Date", "Upload", "JSON", "Map"];
 const scalarSet = /* @__PURE__ */ new Set([String, Boolean, Date, ID, Int, Float, Upload, JSON, Map]);
+const gqlScalarMap = /* @__PURE__ */ new Map([
+  ["ID", ID],
+  ["Int", Int],
+  ["Float", Float],
+  ["String", String],
+  ["Boolean", Boolean],
+  ["Date", Date],
+  ["Upload", Upload],
+  ["JSON", JSON],
+  ["Map", Map]
+]);
 const scalarNameMap = /* @__PURE__ */ new Map([
   [ID, "ID"],
   [Int, "Int"],
@@ -93,6 +104,7 @@ export {
   arraiedModel,
   dayjs,
   getNonArrayModel,
+  gqlScalarMap,
   gqlScalarNames,
   gqlScalars,
   isGqlClass,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/base",
-  "version": "0.9.48",
+  "version": "0.9.49",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/base.d.ts

@@ -1,8 +1,10 @@
-export declare class Enum<T> {
-    readonly values: T[];
+import { Float, Int } from "./scalar";
+export declare class Enum<T = string | number> {
+    readonly values: readonly T[];
     readonly value: T;
     readonly valueMap: Map<T, number>;
-    constructor(values: T[]);
+    readonly type: StringConstructor | typeof Int | typeof Float;
+    constructor(values: readonly T[]);
     has(value: T): boolean;
     indexOf(value: T): number;
     find(callback: (value: T, index: number, array: T[]) => boolean): T;
@@ -11,7 +13,7 @@ export declare class Enum<T> {
     map<R>(callback: (value: T, index: number, array: T[]) => R): R[];
     forEach(callback: (value: T, index: number, array: T[]) => void): void;
 }
-export declare const enumOf: <T>(values: T[]) => Enum<T>;
+export declare const enumOf: <V>(values: readonly V[]) => Enum<V>;
 export type enumOf<E> = E extends Enum<infer T> ? T : never;
 export type EnumType<E> = E extends Enum<infer T> ? T : never;
 export declare class DataList<Light extends {

package/src/scalar.d.ts

@@ -30,17 +30,18 @@ export declare class JSON {
     __Scalar__: "json";
 }
 export type SingleFieldType = Int | Float | StringConstructor | BooleanConstructor | ID | DateConstructor | JSON | Type | GraphQLJSON | GraphQLUpload;
-export declare const getNonArrayModel: <T = Type>(arraiedModel: T | T[]) => [T, number];
+export declare const getNonArrayModel: <T>(arraiedModel: T | T[]) => [T, number];
 export declare const arraiedModel: <T = any>(modelRef: T, arrDepth?: number) => T | T[];
 export declare const applyFnToArrayObjects: (arraiedData: any, fn: (arg: any) => any) => any[];
 export declare const gqlScalars: readonly [StringConstructor, BooleanConstructor, DateConstructor, typeof ID, typeof Int, typeof Float, typeof Upload, typeof JSON, MapConstructor];
 export type GqlScalar = (typeof gqlScalars)[number];
 export declare const gqlScalarNames: readonly ["ID", "Int", "Float", "String", "Boolean", "Date", "Upload", "JSON", "Map"];
 export type GqlScalarName = (typeof gqlScalarNames)[number];
-export declare const scalarSet: Set<MapConstructor | typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor>;
-export declare const scalarNameMap: Map<MapConstructor | typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor, "ID" | "Int" | "Float" | "String" | "Boolean" | "Date" | "Upload" | "JSON" | "Map">;
-export declare const scalarArgMap: Map<MapConstructor | typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor, any>;
-export declare const scalarDefaultMap: Map<MapConstructor | typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor, any>;
+export declare const scalarSet: Set<typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor>;
+export declare const gqlScalarMap: Map<"ID" | "Int" | "Float" | "String" | "Boolean" | "Date" | "Upload" | "JSON" | "Map", typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor>;
+export declare const scalarNameMap: Map<typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor, "ID" | "Int" | "Float" | "String" | "Boolean" | "Date" | "Upload" | "JSON" | "Map">;
+export declare const scalarArgMap: Map<typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor, any>;
+export declare const scalarDefaultMap: Map<typeof Int | typeof Upload | typeof Float | typeof ID | typeof JSON | StringConstructor | BooleanConstructor | DateConstructor | MapConstructor, any>;
 export declare const isGqlClass: (modelRef: Type) => boolean;
 export declare const isGqlScalar: (modelRef: Type) => boolean;
 export declare const isGqlMap: (modelRef: any) => boolean;

package/src/types.d.ts

@@ -70,9 +70,20 @@ export type MergeAllKeyOfTypes<T extends Type<{
     infer First extends Type,
     ...infer Rest extends Type[]
 ] ? Rest extends [] ? UnType<First>[Key] : MergeAllKeyOfTypes<Rest, Key> & UnType<First>[Key] : unknown;
+export type MergeAllKeyOfObjects<T extends {
+    [key: string]: any;
+}[], Key extends string> = T extends [
+    infer First extends {
+        [key: string]: any;
+    },
+    ...infer Rest extends {
+        [key: string]: any;
+    }[]
+] ? Rest extends [] ? First[Key] : MergeAllKeyOfObjects<Rest, Key> & First[Key] : unknown;
 export type Primitive = string | number | boolean | null | undefined;
 export type NestedKeysWithAllowed<T, Allowed = Primitive> = T extends Primitive ? never : T extends any[] ? never : T extends (...args: any[]) => any ? never : {
     [K in keyof T & string]: T[K] extends Allowed ? K : T[K] extends Dayjs ? never : T[K] extends {
         [key: string]: any;
     } ? K | `${K}.${NestedKeysWithAllowed<T[K], Allowed>}` : never;
 }[keyof T & string];
+export type SingleValue<Value> = Value extends (infer V)[] ? SingleValue<V> : Value;