@akanjs/base 0.9.56 → 0.9.58-canary.0

package/cjs/src/base.js

@@ -18,62 +18,61 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var base_exports = {};
 __export(base_exports, {
   DataList: () => DataList,
-  Enum: () => Enum,
   enumOf: () => enumOf,
+  isEnum: () => isEnum,
   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);
-  }
-  indexOf(value) {
-    const idx = this.valueMap.get(value);
-    if (idx === void 0)
-      throw new Error(`Value ${value} is not in enum`);
-    return idx;
-  }
-  find(callback) {
-    const val = this.values.find(callback);
-    if (val === void 0)
-      throw new Error(`Value not found in enum`);
-    return val;
-  }
-  findIndex(callback) {
-    const idx = this.values.findIndex(callback);
-    if (idx === -1)
-      throw new Error(`Value not found in enum`);
-    return idx;
-  }
-  filter(callback) {
-    return this.values.filter(callback);
-  }
-  map(callback) {
-    return this.values.map(callback);
-  }
-  forEach(callback) {
-    this.values.forEach(callback);
-  }
+class EnumPrototype {
 }
-const enumOf = (values) => new Enum(values);
+const isEnum = (enumRef) => Object.getPrototypeOf(Object.getPrototypeOf(enumRef) ?? {}) === EnumPrototype;
+const enumOf = (refName, values) => {
+  const 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");
+  const type = typeof firstValue === "string" ? String : values.every((value) => value % 1 === 0) ? import_scalar.Int : import_scalar.Float;
+  class Enum extends EnumPrototype {
+    static values = values;
+    static valueMap = valueMap;
+    static type = type;
+    static has(value) {
+      return this.valueMap.has(value);
+    }
+    static indexOf(value) {
+      const idx = this.valueMap.get(value);
+      if (idx === void 0)
+        throw new Error(`Value ${value} is not in enum`);
+      return idx;
+    }
+    static find(callback) {
+      const val = this.values.find(callback);
+      if (val === void 0)
+        throw new Error(`Value not found in enum`);
+      return val;
+    }
+    static findIndex(callback) {
+      const idx = this.values.findIndex(callback);
+      if (idx === -1)
+        throw new Error(`Value not found in enum`);
+      return idx;
+    }
+    static filter(callback) {
+      return this.values.filter(callback);
+    }
+    static map(callback) {
+      return this.values.map(callback);
+    }
+    static forEach(callback) {
+      this.values.forEach(callback);
+    }
+    static refName = refName;
+    refName = refName;
+    value;
+  }
+  return Enum;
+};
 class DataList {
   // [immerable] = true;
   #idMap;

package/cjs/src/scalar.js

@@ -27,6 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var scalar_exports = {};
 __export(scalar_exports, {
+  BaseInsight: () => BaseInsight,
   BaseObject: () => BaseObject,
   Dayjs: () => import_dayjs.Dayjs,
   Float: () => Float,
@@ -58,6 +59,9 @@ class BaseObject {
   updatedAt;
   removedAt;
 }
+class BaseInsight {
+  count;
+}
 class Int {
   __Scalar__;
 }

package/esm/src/base.js

@@ -1,54 +1,53 @@
 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);
-  }
-  indexOf(value) {
-    const idx = this.valueMap.get(value);
-    if (idx === void 0)
-      throw new Error(`Value ${value} is not in enum`);
-    return idx;
-  }
-  find(callback) {
-    const val = this.values.find(callback);
-    if (val === void 0)
-      throw new Error(`Value not found in enum`);
-    return val;
-  }
-  findIndex(callback) {
-    const idx = this.values.findIndex(callback);
-    if (idx === -1)
-      throw new Error(`Value not found in enum`);
-    return idx;
-  }
-  filter(callback) {
-    return this.values.filter(callback);
-  }
-  map(callback) {
-    return this.values.map(callback);
-  }
-  forEach(callback) {
-    this.values.forEach(callback);
-  }
+class EnumPrototype {
 }
-const enumOf = (values) => new Enum(values);
+const isEnum = (enumRef) => Object.getPrototypeOf(Object.getPrototypeOf(enumRef) ?? {}) === EnumPrototype;
+const enumOf = (refName, values) => {
+  const 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");
+  const type = typeof firstValue === "string" ? String : values.every((value) => value % 1 === 0) ? Int : Float;
+  class Enum extends EnumPrototype {
+    static values = values;
+    static valueMap = valueMap;
+    static type = type;
+    static has(value) {
+      return this.valueMap.has(value);
+    }
+    static indexOf(value) {
+      const idx = this.valueMap.get(value);
+      if (idx === void 0)
+        throw new Error(`Value ${value} is not in enum`);
+      return idx;
+    }
+    static find(callback) {
+      const val = this.values.find(callback);
+      if (val === void 0)
+        throw new Error(`Value not found in enum`);
+      return val;
+    }
+    static findIndex(callback) {
+      const idx = this.values.findIndex(callback);
+      if (idx === -1)
+        throw new Error(`Value not found in enum`);
+      return idx;
+    }
+    static filter(callback) {
+      return this.values.filter(callback);
+    }
+    static map(callback) {
+      return this.values.map(callback);
+    }
+    static forEach(callback) {
+      this.values.forEach(callback);
+    }
+    static refName = refName;
+    refName = refName;
+    value;
+  }
+  return Enum;
+};
 class DataList {
   // [immerable] = true;
   #idMap;
@@ -162,7 +161,7 @@ const logo = `
 `;
 export {
   DataList,
-  Enum,
   enumOf,
+  isEnum,
   logo
 };

package/esm/src/scalar.js

@@ -6,6 +6,9 @@ class BaseObject {
   updatedAt;
   removedAt;
 }
+class BaseInsight {
+  count;
+}
 class Int {
   __Scalar__;
 }
@@ -93,6 +96,7 @@ const isGqlClass = (modelRef) => !scalarSet.has(modelRef);
 const isGqlScalar = (modelRef) => scalarSet.has(modelRef);
 const isGqlMap = (modelRef) => modelRef === Map;
 export {
+  BaseInsight,
   BaseObject,
   Dayjs,
   Float,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/base",
-  "version": "0.9.56",
+  "version": "0.9.58-canary.0",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/base.d.ts

@@ -1,21 +1,23 @@
+import { Type } from ".";
 import { Float, Int } from "./scalar";
-export declare class Enum<T = string | number> {
-    readonly values: readonly T[];
-    readonly value: T;
-    readonly valueMap: Map<T, number>;
-    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;
-    findIndex(callback: (value: T, index: number, array: T[]) => boolean): number;
-    filter(callback: (value: T, index: number, array: T[]) => boolean): 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: <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 type EnumInstance<RefName extends string = string, T = string | number> = Type<{
+    refName: RefName;
+    value: T;
+}, {
+    refName: RefName;
+    type: StringConstructor | typeof Int | typeof Float;
+    values: readonly T[];
+    valueMap: Map<T, number>;
+    has: (value: T) => boolean;
+    indexOf: (value: T) => number;
+    find: (callback: (value: T, index: number, array: T[]) => boolean) => T;
+    findIndex: (callback: (value: T, index: number, array: T[]) => boolean) => number;
+    filter: (callback: (value: T, index: number, array: T[]) => boolean) => 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 isEnum: (enumRef: Type) => boolean;
+export declare const enumOf: <RefName extends string, T = string | number>(refName: RefName, values: readonly T[]) => EnumInstance<RefName, T>;
 export declare class DataList<Light extends {
     id: string;
 }> {

package/src/scalar.d.ts

@@ -10,6 +10,9 @@ export declare class BaseObject {
     updatedAt: Dayjs;
     removedAt: Dayjs | null;
 }
+export declare class BaseInsight {
+    count: number;
+}
 export declare class Int {
     __Scalar__: "int";
 }

package/src/types.d.ts

@@ -1,6 +1,6 @@
 import type { Dayjs } from "dayjs";
 export type { SshOptions } from "tunnel-ssh";
-export type Type<T = any> = new (...args: any[]) => T;
+export type Type<T = any, Statics = unknown> = (new (...args: any[]) => T) & Statics;
 export type BufferLike = string | Buffer | DataView | number | ArrayBufferView | Uint8Array | ArrayBuffer | SharedArrayBuffer | readonly any[] | readonly number[];
 export type GetObject<T> = {
     [K in keyof T as K extends "prototype" ? never : K]: T[K];
@@ -52,6 +52,11 @@ export type PromiseOrObject<T> = T | Promise<T>;
 type MergeObjectValues<T> = T extends Record<string, infer V> ? (V extends Record<string, any> ? V : never) : never;
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 export type MergedValues<T> = UnionToIntersection<MergeObjectValues<T>>;
+export type Assign<A, B> = Omit<A, keyof B> & B;
+export type ObjectAssign<Objects extends any[]> = Objects extends [
+    ...infer Rest extends Record<string, any>[],
+    infer Last extends Record<string, any>
+] ? Rest extends [] ? Last : Assign<ObjectAssign<Rest>, Last> : unknown;
 export type MergeAll<T extends Record<string, any>[]> = T extends [
     infer First extends Record<string, any>,
     ...infer Rest extends Record<string, any>[]
@@ -87,3 +92,9 @@ export type NestedKeysWithAllowed<T, Allowed = Primitive> = T extends Primitive
     } ? K | `${K}.${NestedKeysWithAllowed<T[K], Allowed>}` : never;
 }[keyof T & string];
 export type SingleValue<Value> = Value extends (infer V)[] ? SingleValue<V> : Value;
+export type StrArrToObject<Arr, Value> = Arr extends [infer First, ...infer Rest] ? {
+    [K in First & string]: Value;
+} & StrArrToObject<Rest, Value> : unknown;
+export type GetValueOfKey<Model, Key extends string, Fallback = never> = Model extends {
+    [key in Key]: any;
+} ? Model[Key] : Fallback;