akanjs 2.3.2-rc.1 → 2.3.2-rc.3

package/constant/constantRegistry.ts

@@ -200,7 +200,7 @@ export class ConstantRegistry {
       _StateLight: null as unknown as GetStateObject<Light>,
       _StateInsight: null as unknown as GetStateObject<Insight>,
     };
-    ConstantRegistry.setDatabase(refName, cnst);
+    ConstantRegistry.setDatabase(refName, cnst as ConstantModel);
     Object.entries(constExports).forEach(([key, value]) => {
       if ((modelRefSet as Set<unknown>).has(value)) return;
       else if (typeof value === "function" && isEnum(value as Cls))

package/constant/purify.ts

@@ -13,13 +13,7 @@ import {
 } from "akanjs/base";
 import { Logger } from "akanjs/common";
 
-import {
-  type BaseObject,
-  type ConstantCls,
-  ConstantRegistry,
-  type DefaultOf,
-  type FieldProps,
-} from ".";
+import { type BaseObject, type ConstantCls, ConstantRegistry, type DefaultOf, type FieldProps } from ".";
 
 type Purified<O> = O extends BaseObject
   ? string
@@ -30,15 +24,10 @@ type Purified<O> = O extends BaseObject
       : O extends object
         ? PurifiedModel<O>
         : O;
-type PurifiedWithObjectToId<
-  T,
-  StateKeys extends keyof GetStateObject<T> = keyof GetStateObject<T>,
-> = {
+type PurifiedWithObjectToId<T, StateKeys extends keyof GetStateObject<T> = keyof GetStateObject<T>> = {
   [K in StateKeys as null extends T[K] ? never : K]: Purified<T[K]>;
 } & {
-  [K in StateKeys as null extends T[K] ? K : never]?:
-    | Purified<T[K]>
-    | undefined;
+  [K in StateKeys as null extends T[K] ? K : never]?: Purified<T[K]> | undefined;
 };
 export type PurifiedModel<T> = T extends Upload[]
   ? FileList
@@ -50,29 +39,20 @@ export type PurifiedModel<T> = T extends Upload[]
         ? Map<K, PurifiedModel<V>>
         : PurifiedWithObjectToId<T>;
 
-export type PurifyFunc<
-  Input,
-  _DefaultInput = DefaultOf<Input>,
-  _PurifiedInput = PurifiedModel<Input>,
-> = (self: _DefaultInput, isChild?: boolean) => _PurifiedInput | null;
+export type PurifyFunc<Input, _DefaultInput = DefaultOf<Input>, _PurifiedInput = PurifiedModel<Input>> = (
+  self: _DefaultInput,
+  isChild?: boolean,
+) => _PurifiedInput | null;
 
 const getPurifyFn = (modelRef: Cls): ((value: unknown) => unknown) => {
   const [valueRef] = getNonArrayModel(modelRef);
   const purifyFn = PrimitiveRegistry.has(valueRef)
-    ? (value: unknown) =>
-        (valueRef as unknown as typeof PrimitiveScalar)._serialize(
-          value as never,
-        )
+    ? (value: unknown) => (valueRef as unknown as typeof PrimitiveScalar)._serialize(value as never)
     : (value: unknown) => value as object;
   return purifyFn;
 };
 
-const purify = (
-  field: FieldProps,
-  key: string,
-  value: unknown,
-  self: Record<string, unknown>,
-): unknown => {
+const purify = (field: FieldProps, key: string, value: unknown, self: Record<string, unknown>): unknown => {
   
   if (
     field.nullable &&
@@ -83,67 +63,30 @@ const purify = (
   )
     return null;
   if (field.isArray) {
-    if (!Array.isArray(value))
-      throw new Error(`Invalid Array Value in ${key} for value ${value}`);
+    if (!Array.isArray(value)) throw new Error(`Invalid Array Value in ${key} for value ${value}`);
     if (field.minlength && value.length < field.minlength)
-      throw new Error(
-        `Invalid Array Length (Min) in ${key} for value ${value}`,
-      );
+      throw new Error(`Invalid Array Length (Min) in ${key} for value ${value}`);
     else if (field.maxlength && value.length > field.maxlength)
-      throw new Error(
-        `Invalid Array Length (Max) in ${key} for value ${value}`,
-      );
-    else if (
-      field.optArrDepth === 0 &&
-      field.validate &&
-      !field.validate(value, self)
-    )
-      throw new Error(
-        `Invalid Array Value (Failed to pass validation) in ${key} for value ${value}`,
-      );
-    return value.map((v) =>
-      purify(
-        { ...field, isArray: field.arrDepth > 1, arrDepth: field.arrDepth - 1 },
-        key,
-        v,
-        v,
-      ),
-    );
+      throw new Error(`Invalid Array Length (Max) in ${key} for value ${value}`);
+    else if (field.optArrDepth === 0 && field.validate && !field.validate(value, self))
+      throw new Error(`Invalid Array Value (Failed to pass validation) in ${key} for value ${value}`);
+    return value.map((v) => purify({ ...field, isArray: field.arrDepth > 1, arrDepth: field.arrDepth - 1 }, key, v, v));
   }
   if (field.isMap && field.of) {
     const purifyFn = PrimitiveRegistry.has(field.of as Cls)
       ? getPurifyFn(field.of as Cls)
-      : (value: unknown) =>
-          makePurify(field.of as ConstantCls)(value as object);
+      : (value: unknown) => makePurify(field.of as ConstantCls)(value as object);
     return Object.fromEntries(
-      [...(value as Map<string, unknown>).entries()].map(([key, val]) => [
-        key,
-        applyFnToArrayObjects(val, purifyFn),
-      ]),
+      [...(value as Map<string, unknown>).entries()].map(([key, val]) => [key, applyFnToArrayObjects(val, purifyFn)]),
     );
   }
-  if (field.isClass)
-    return makePurify(field.modelRef)(value as object, true) as object;
-  if (
-    field.modelRef === Date &&
-    dayjs(value as Date).isBefore(dayjs(new Date("0000")))
-  )
-    throw new Error(
-      `Invalid Date Value (Default) in ${key} for value ${value}`,
-    );
-  if (
-    [String, ID].includes(
-      field.modelRef as unknown as StringConstructor | typeof ID,
-    ) &&
-    (value === "" || !value)
-  )
-    throw new Error(
-      `Invalid String Value (Default) in ${key} for value ${value}`,
-    );
+  if (field.isClass) return makePurify(field.modelRef)(value as object, true) as object;
+  if (field.modelRef === Date && dayjs(value as Date).isBefore(dayjs(new Date("0000"))))
+    throw new Error(`Invalid Date Value (Default) in ${key} for value ${value}`);
+  if ([String, ID].includes(field.modelRef as unknown as StringConstructor | typeof ID) && (value === "" || !value))
+    throw new Error(`Invalid String Value (Default) in ${key} for value ${value}`);
   if (field.validate && !field.validate(value, self))
-    throw new Error(
-      `Invalid Value (Failed to pass validation) / ${value} in ${key}`,
-    );
+    throw new Error(`Invalid Value (Failed to pass validation) / ${value} in ${key}`);
   if (!field.nullable && !value && value !== 0 && value !== false)
     throw new Error(`Invalid Value (Nullable) in ${key} for value ${value}`);
 

package/constant/via.ts

@@ -172,6 +172,15 @@ export interface ConstantStatics<Schema = any, FieldObj extends FieldObject = Fi
   relations: Set<ConstantCls>;
   enums: Set<EnumInstance>;
   text: { search: Set<string>; filter: Set<string>; children: { search: Set<string>; filter: Set<string> } };
+  _DatabaseSchema: {
+    [K in keyof Schema]: K extends keyof FieldObj
+      ? FieldObj[K] extends ConstantField<infer FieldType, any, any, any, any, any>
+        ? FieldType extends "hidden"
+          ? NonNullable<Schema[K]>
+          : Schema[K]
+        : Schema[K]
+      : Schema[K];
+  };
 }
 export type ConstantCls<Schema = any, FieldObj extends FieldObject = FieldObject> = (new (
   obj?: Partial<Schema>,

package/document/by.ts

@@ -3,7 +3,6 @@ import { applyMixins } from "akanjs/common";
 import {
   type BaseObject,
   type ConstantCls,
-  type ConstantField,
   ConstantRegistry,
   type DocumentModel,
   type FieldObject,
@@ -23,19 +22,12 @@ type HydratedDocumentWithId<TDocument> = TDocument & { id: string } & DefaultDoc
 export type Doc<M = any> = HydratedDocumentWithId<DocumentModel<M>>;
 
 export const by = <
-  Schema,
-  FieldObj extends FieldObject,
+  ModelCls,
   AddDbModels extends DatabaseCls[],
-  _DatabaseSchema = Schema & {
-    [K in keyof FieldObj & keyof Schema as FieldObj[K] extends ConstantField<infer FieldType, any, any, any, any, any>
-      ? FieldType extends "hidden"
-        ? K
-        : never
-      : never]: NonNullable<Schema[K]>;
-  },
-  _DocModel = Schema extends BaseObject ? Doc<_DatabaseSchema> : DocumentModel<_DatabaseSchema>,
+  _DatabaseSchema = ModelCls extends { _DatabaseSchema: infer Schema } ? Schema : never,
+  _DocModel = _DatabaseSchema extends BaseObject ? Doc<_DatabaseSchema> : DocumentModel<_DatabaseSchema>,
 >(
-  modelRef: ConstantCls<Schema, FieldObj>,
+  modelRef: ModelCls,
   ...addRefs: AddDbModels
 ): DatabaseCls<MergeAllActionTypes<AddDbModels, keyof _DocModel & string> & _DocModel> => {
   const refName = ConstantRegistry.getRefName(modelRef as Cls);

package/fetch/client/fetchClient.ts

@@ -10,7 +10,7 @@ import type {
   SerializedSlice,
   ServiceSignal,
 } from "akanjs/signal";
-import type { ClientSignal, MergeAllFetchTypes, SliceMeta } from "../fetchType";
+import type { ClientSignal, FetchClientType, FetchSignalInput, MergeAllFetchTypes, SliceMeta } from "../fetchType";
 import { memoizeRequestQuery, cookies as requestCookies, headers as requestHeaders } from "../requestStorage";
 import type { GetSliceMetaObjFromDatabaseSignals } from "../types";
 import { type ErrorConstructor, HttpClient } from "./httpClient";
@@ -650,9 +650,7 @@ export class FetchClient {
     if (typeof structuredClone === "function") return structuredClone(value);
     return JSON.parse(JSON.stringify(value)) as T;
   }
-  static from<
-    Signals extends (FetchProxy<any, any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>)[],
-  >(...signals: Signals): FetchProxy<MergeAllFetchTypes<Signals>, GetSliceMetaObjFromDatabaseSignals<Signals>> {
+  static from<Signals extends readonly FetchSignalInput[]>(...signals: Signals): FetchClientType<Signals> {
     const serializedSignal: { [key: string]: SerializedSignal } = {};
     const handler: Record<string, FetchHandler> = {};
     signals.forEach((signal) => {

package/fetch/fetchType/buildFetch.type.ts

@@ -1,24 +1,31 @@
-import type { Assign } from "akanjs/base";
-import type { DatabaseSignal, ServiceSignal } from "akanjs/signal";
+import type { DatabaseSignal, EndpointCls, ServiceSignal, SliceCls } from "akanjs/signal";
 import type { FetchProxy } from "../client";
+import type { GetSliceMetaObjFromDatabaseSignals } from "../types";
 import type { GetFetchTypeFromEndpoint } from "./endpointFetch.type";
 import type { GetFetchTypeFromSlice } from "./sliceFetch.type";
 
-type GetFetchType<Signal extends FetchProxy<any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>> =
+export type FetchSignalInput = FetchProxy | DatabaseSignal | ServiceSignal;
+
+type UnionToIntersection<Union> = (Union extends unknown ? (value: Union) => void : never) extends (
+  value: infer Intersection,
+) => void
+  ? Intersection
+  : never;
+
+export type FetchTypeOfSignal<Signal extends FetchSignalInput> =
   Signal extends FetchProxy<infer FetchType>
     ? FetchType
-    : Signal extends DatabaseSignal<any, infer EndpCls, infer SlceCls, any>
+    : Signal extends { endpoint: infer EndpCls extends EndpointCls; slice: infer SlceCls extends SliceCls }
       ? GetFetchTypeFromEndpoint<EndpCls> & GetFetchTypeFromSlice<SlceCls>
-      : Signal extends ServiceSignal<any, infer EndpCls, any>
+      : Signal extends { endpoint: infer EndpCls extends EndpointCls }
         ? GetFetchTypeFromEndpoint<EndpCls>
         : unknown;
 
-export type MergeAllFetchTypes<
-  Signals extends (FetchProxy<any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>)[],
-  Acc = unknown,
-> = Signals extends [
-  infer First extends FetchProxy<any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>,
-  ...infer Rest extends (FetchProxy<any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>)[],
-]
-  ? MergeAllFetchTypes<Rest, Assign<Acc, GetFetchType<First>>>
-  : Acc;
+export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> = [Signals[number]] extends [never]
+  ? unknown
+  : UnionToIntersection<FetchTypeOfSignal<Signals[number]>>;
+
+export type FetchClientType<Signals extends readonly FetchSignalInput[]> = FetchProxy<
+  MergeAllFetchTypes<Signals>,
+  GetSliceMetaObjFromDatabaseSignals<Signals>
+>;

package/fetch/fetchType/endpointFetch.type.ts

@@ -1,13 +1,15 @@
 import type { ENDPOINT_META, PromiseOrObject } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
-import type { EndpointCls, EndpointInfo } from "akanjs/signal";
+import type {
+  EndpInfoArgs,
+  EndpInfoClientReturns,
+  EndpInfoNullable,
+  EndpInfoReqType,
+  EndpointCls,
+  EndpointInfo,
+} from "akanjs/signal";
 
-type EndpInfoType<E> = E extends EndpointInfo<infer T, any, any, any, any, any, any, any, any, any> ? T : never;
-type EndpInfoArgs<E> = E extends EndpointInfo<any, any, any, infer A, any, any, any, any, any, any> ? A : never;
-type EndpInfoReturns<E> =
-  E extends EndpointInfo<any, any, any, any, any, any, any, infer R, any, infer N>
-    ? R | (N extends true ? null : never)
-    : never;
+type EndpInfoReturns<E> = EndpInfoClientReturns<E> | (EndpInfoNullable<E> extends true ? null : never);
 
 type QueryOrMutationFetchFn<E> = (
   ...args: [...EndpInfoArgs<E>, fetchPolicy?: FetchPolicy]
@@ -24,18 +26,21 @@ type PubsubSubscribeFn<E> = (
   ...args: [...EndpInfoArgs<E>, handleEvent: (data: EndpInfoReturns<E>) => PromiseOrObject<void>, options?: FetchPolicy]
 ) => () => void;
 
-type PrimaryFetchType<EInfoObj extends { [key: string]: EndpointInfo }> = {
-  [K in keyof EInfoObj as EndpInfoType<EInfoObj[K]> extends "query" | "mutation" | "message" ? K : never]: EndpInfoType<
-    EInfoObj[K]
-  > extends "query" | "mutation"
-    ? QueryOrMutationFetchFn<EInfoObj[K]>
-    : EndpInfoType<EInfoObj[K]> extends "message"
-      ? MessageEmitFn<EInfoObj[K]>
+type PrimaryFetchFn<E> =
+  EndpInfoReqType<E> extends "query" | "mutation"
+    ? QueryOrMutationFetchFn<E>
+    : EndpInfoReqType<E> extends "message"
+      ? MessageEmitFn<E>
       : never;
+
+type PrimaryFetchType<EInfoObj extends { [key: string]: EndpointInfo }> = {
+  [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "query" | "mutation" | "message"
+    ? K
+    : never]: PrimaryFetchFn<EInfoObj[K]>;
 };
 
 type PubsubFetchType<EInfoObj extends { [key: string]: EndpointInfo }> = {
-  [K in keyof EInfoObj as EndpInfoType<EInfoObj[K]> extends "pubsub"
+  [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "pubsub"
     ? K extends string
       ? `subscribe${Capitalize<K>}`
       : never
@@ -43,7 +48,7 @@ type PubsubFetchType<EInfoObj extends { [key: string]: EndpointInfo }> = {
 };
 
 type MessageListenFetchType<EInfoObj extends { [key: string]: EndpointInfo }> = {
-  [K in keyof EInfoObj as EndpInfoType<EInfoObj[K]> extends "message"
+  [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "message"
     ? K extends string
       ? `listen${Capitalize<K>}`
       : never

package/fetch/types.ts

@@ -12,17 +12,12 @@ export const getDefaultAccount = (): Account => {
   return { appName: env.appName, environment: env.environment };
 };
 
-type GetSliceNameFromSignal<Signal> =
-  Signal extends DatabaseSignal<any, any, any, any>
-    ? `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}`
-    : Signal extends { slice: { [K in infer Key]: SliceMeta } }
-      ? Key
-      : never;
-type GetSliceNamesFromSignals<Signals> = Signals extends [infer First, ...infer Rest]
-  ? Rest extends []
-    ? GetSliceNameFromSignal<First>
-    : GetSliceNamesFromSignals<Rest> | GetSliceNameFromSignal<First>
-  : never;
-export type GetSliceMetaObjFromDatabaseSignals<Signals extends unknown[]> = {
+type GetSliceNameFromSignal<Signal> = Signal extends DatabaseSignal
+  ? `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}`
+  : Signal extends { slice: { [K in infer Key]: SliceMeta } }
+    ? Key
+    : never;
+type GetSliceNamesFromSignals<Signals extends readonly unknown[]> = GetSliceNameFromSignal<Signals[number]>;
+export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[]> = {
   [K in GetSliceNamesFromSignals<Signals>]: SliceMeta;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.2-rc.1",
+  "version": "2.3.2-rc.3",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/types/constant/via.d.ts

@@ -1,5 +1,5 @@
 import { type Cls, type EnumInstance, FIELD_META, type MergeAllKeyOfObjects, type MergeAllTypes } from "akanjs/base";
-import { type ExtractFieldInfoObject, type FieldBuilder, type FieldInfoObject, type FieldInfoObjectToFieldObject, type FieldObject, type FieldResolver } from "./fieldInfo.d.ts";
+import { ConstantField, type ExtractFieldInfoObject, type FieldBuilder, type FieldInfoObject, type FieldInfoObjectToFieldObject, type FieldObject, type FieldResolver } from "./fieldInfo.d.ts";
 import { type PurifyFunc } from "./purify.d.ts";
 import type { BaseInsight, BaseObject, ConstantType, DefaultOf, NonFunctionalKeys } from "./types.d.ts";
 type BaseFields = "id" | "createdAt" | "updatedAt" | "removedAt";
@@ -23,6 +23,9 @@ export interface ConstantStatics<Schema = any, FieldObj extends FieldObject = Fi
             filter: Set<string>;
         };
     };
+    _DatabaseSchema: {
+        [K in keyof Schema]: K extends keyof FieldObj ? FieldObj[K] extends ConstantField<infer FieldType, any, any, any, any, any> ? FieldType extends "hidden" ? NonNullable<Schema[K]> : Schema[K] : Schema[K] : Schema[K];
+    };
 }
 export type ConstantCls<Schema = any, FieldObj extends FieldObject = FieldObject> = (new (obj?: Partial<Schema>) => Schema & ConstantMethods<Schema>) & ConstantStatics<Schema, FieldObj>;
 declare global {

package/types/document/by.d.ts

@@ -1,5 +1,5 @@
 import { type Cls, FIELD_META, type MergeAllActionTypes } from "akanjs/base";
-import { type BaseObject, type ConstantCls, type ConstantField, type DocumentModel, type FieldObject } from "akanjs/constant";
+import { type BaseObject, type DocumentModel, type FieldObject } from "akanjs/constant";
 export type DatabaseCls<Schema = any> = Cls<Schema, {
     refName: string;
     [FIELD_META]: FieldObject;
@@ -16,5 +16,7 @@ type HydratedDocumentWithId<TDocument> = TDocument & {
     id: string;
 } & DefaultDocMtds<TDocument>;
 export type Doc<M = any> = HydratedDocumentWithId<DocumentModel<M>>;
-export declare const by: <Schema, FieldObj extends FieldObject, AddDbModels extends DatabaseCls[], _DatabaseSchema = Schema & { [K in keyof FieldObj & keyof Schema as FieldObj[K] extends ConstantField<infer FieldType, any, any, any, any, any> ? FieldType extends "hidden" ? K : never : never]: NonNullable<Schema[K]>; }, _DocModel = Schema extends BaseObject ? Doc<_DatabaseSchema> : DocumentModel<_DatabaseSchema>>(modelRef: ConstantCls<Schema, FieldObj>, ...addRefs: AddDbModels) => DatabaseCls<MergeAllActionTypes<AddDbModels, keyof _DocModel & string> & _DocModel>;
+export declare const by: <ModelCls, AddDbModels extends DatabaseCls[], _DatabaseSchema = ModelCls extends {
+    _DatabaseSchema: infer Schema;
+} ? Schema : never, _DocModel = _DatabaseSchema extends BaseObject ? Doc<_DatabaseSchema> : DocumentModel<_DatabaseSchema>>(modelRef: ModelCls, ...addRefs: AddDbModels) => DatabaseCls<MergeAllActionTypes<AddDbModels, keyof _DocModel & string> & _DocModel>;
 export {};

package/types/fetch/client/fetchClient.d.ts

@@ -1,8 +1,7 @@
 import { type PromiseOrObject } from "akanjs/base";
 import { Logger } from "akanjs/common";
-import type { DatabaseSignal, SerializedArg, SerializedEndpoint, SerializedSignal, SerializedSlice, ServiceSignal } from "akanjs/signal";
-import type { ClientSignal, MergeAllFetchTypes, SliceMeta } from "../fetchType.d.ts";
-import type { GetSliceMetaObjFromDatabaseSignals } from "../types.d.ts";
+import type { DatabaseSignal, SerializedArg, SerializedEndpoint, SerializedSignal, SerializedSlice } from "akanjs/signal";
+import type { ClientSignal, FetchClientType, FetchSignalInput, SliceMeta } from "../fetchType.d.ts";
 import { type ErrorConstructor, HttpClient } from "./httpClient.d.ts";
 import { WsClient } from "./wsClient.d.ts";
 type FetchHandler = (...args: unknown[]) => PromiseOrObject<unknown>;
@@ -63,7 +62,7 @@ export declare class FetchClient {
         bodyArgs: SerializedArg[];
         uploadArgs: SerializedArg[];
     };
-    static from<Signals extends (FetchProxy<any, any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>)[]>(...signals: Signals): FetchProxy<MergeAllFetchTypes<Signals>, GetSliceMetaObjFromDatabaseSignals<Signals>>;
+    static from<Signals extends readonly FetchSignalInput[]>(...signals: Signals): FetchClientType<Signals>;
     static build<SigType extends {
         fetch: any;
     }>(constant: object, serializedSignal: {

package/types/fetch/fetchType/buildFetch.type.d.ts

@@ -1,11 +1,16 @@
-import type { Assign } from "akanjs/base";
-import type { DatabaseSignal, ServiceSignal } from "akanjs/signal";
+import type { DatabaseSignal, EndpointCls, ServiceSignal, SliceCls } from "akanjs/signal";
 import type { FetchProxy } from "../client.d.ts";
+import type { GetSliceMetaObjFromDatabaseSignals } from "../types.d.ts";
 import type { GetFetchTypeFromEndpoint } from "./endpointFetch.type";
 import type { GetFetchTypeFromSlice } from "./sliceFetch.type";
-type GetFetchType<Signal extends FetchProxy<any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>> = Signal extends FetchProxy<infer FetchType> ? FetchType : Signal extends DatabaseSignal<any, infer EndpCls, infer SlceCls, any> ? GetFetchTypeFromEndpoint<EndpCls> & GetFetchTypeFromSlice<SlceCls> : Signal extends ServiceSignal<any, infer EndpCls, any> ? GetFetchTypeFromEndpoint<EndpCls> : unknown;
-export type MergeAllFetchTypes<Signals extends (FetchProxy<any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>)[], Acc = unknown> = Signals extends [
-    infer First extends FetchProxy<any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>,
-    ...infer Rest extends (FetchProxy<any> | DatabaseSignal<any, any, any, any> | ServiceSignal<any, any, any>)[]
-] ? MergeAllFetchTypes<Rest, Assign<Acc, GetFetchType<First>>> : Acc;
+export type FetchSignalInput = FetchProxy | DatabaseSignal | ServiceSignal;
+type UnionToIntersection<Union> = (Union extends unknown ? (value: Union) => void : never) extends (value: infer Intersection) => void ? Intersection : never;
+export type FetchTypeOfSignal<Signal extends FetchSignalInput> = Signal extends FetchProxy<infer FetchType> ? FetchType : Signal extends {
+    endpoint: infer EndpCls extends EndpointCls;
+    slice: infer SlceCls extends SliceCls;
+} ? GetFetchTypeFromEndpoint<EndpCls> & GetFetchTypeFromSlice<SlceCls> : Signal extends {
+    endpoint: infer EndpCls extends EndpointCls;
+} ? GetFetchTypeFromEndpoint<EndpCls> : unknown;
+export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> = [Signals[number]] extends [never] ? unknown : UnionToIntersection<FetchTypeOfSignal<Signals[number]>>;
+export type FetchClientType<Signals extends readonly FetchSignalInput[]> = FetchProxy<MergeAllFetchTypes<Signals>, GetSliceMetaObjFromDatabaseSignals<Signals>>;
 export {};

package/types/fetch/fetchType/endpointFetch.type.d.ts

@@ -1,27 +1,26 @@
 import type { ENDPOINT_META, PromiseOrObject } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
-import type { EndpointCls, EndpointInfo } from "akanjs/signal";
-type EndpInfoType<E> = E extends EndpointInfo<infer T, any, any, any, any, any, any, any, any, any> ? T : never;
-type EndpInfoArgs<E> = E extends EndpointInfo<any, any, any, infer A, any, any, any, any, any, any> ? A : never;
-type EndpInfoReturns<E> = E extends EndpointInfo<any, any, any, any, any, any, any, infer R, any, infer N> ? R | (N extends true ? null : never) : never;
+import type { EndpInfoArgs, EndpInfoClientReturns, EndpInfoNullable, EndpInfoReqType, EndpointCls, EndpointInfo } from "akanjs/signal";
+type EndpInfoReturns<E> = EndpInfoClientReturns<E> | (EndpInfoNullable<E> extends true ? null : never);
 type QueryOrMutationFetchFn<E> = (...args: [...EndpInfoArgs<E>, fetchPolicy?: FetchPolicy]) => Promise<EndpInfoReturns<E>>;
 type MessageEmitFn<E> = (...args: EndpInfoArgs<E>) => EndpInfoReturns<E>;
 type MessageListenFn<E> = (handleEvent: (data: EndpInfoReturns<E>) => PromiseOrObject<void>, options?: FetchPolicy) => () => void;
 type PubsubSubscribeFn<E> = (...args: [...EndpInfoArgs<E>, handleEvent: (data: EndpInfoReturns<E>) => PromiseOrObject<void>, options?: FetchPolicy]) => () => void;
+type PrimaryFetchFn<E> = EndpInfoReqType<E> extends "query" | "mutation" ? QueryOrMutationFetchFn<E> : EndpInfoReqType<E> extends "message" ? MessageEmitFn<E> : never;
 type PrimaryFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
 }> = {
-    [K in keyof EInfoObj as EndpInfoType<EInfoObj[K]> extends "query" | "mutation" | "message" ? K : never]: EndpInfoType<EInfoObj[K]> extends "query" | "mutation" ? QueryOrMutationFetchFn<EInfoObj[K]> : EndpInfoType<EInfoObj[K]> extends "message" ? MessageEmitFn<EInfoObj[K]> : never;
+    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "query" | "mutation" | "message" ? K : never]: PrimaryFetchFn<EInfoObj[K]>;
 };
 type PubsubFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
 }> = {
-    [K in keyof EInfoObj as EndpInfoType<EInfoObj[K]> extends "pubsub" ? K extends string ? `subscribe${Capitalize<K>}` : never : never]: PubsubSubscribeFn<EInfoObj[K]>;
+    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "pubsub" ? K extends string ? `subscribe${Capitalize<K>}` : never : never]: PubsubSubscribeFn<EInfoObj[K]>;
 };
 type MessageListenFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
 }> = {
-    [K in keyof EInfoObj as EndpInfoType<EInfoObj[K]> extends "message" ? K extends string ? `listen${Capitalize<K>}` : never : never]: MessageListenFn<EInfoObj[K]>;
+    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "message" ? K extends string ? `listen${Capitalize<K>}` : never : never]: MessageListenFn<EInfoObj[K]>;
 };
 export type GetFetchTypeFromEndpoint<EndpCls extends EndpointCls, _EndpointInfoObj extends {
     [key: string]: EndpointInfo;

package/types/fetch/types.d.ts

@@ -7,13 +7,13 @@ export type Account<AddData = unknown> = {
     environment: Environment;
 } & AddData;
 export declare const getDefaultAccount: () => Account;
-type GetSliceNameFromSignal<Signal> = Signal extends DatabaseSignal<any, any, any, any> ? `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}` : Signal extends {
+type GetSliceNameFromSignal<Signal> = Signal extends DatabaseSignal ? `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}` : Signal extends {
     slice: {
         [K in infer Key]: SliceMeta;
     };
 } ? Key : never;
-type GetSliceNamesFromSignals<Signals> = Signals extends [infer First, ...infer Rest] ? Rest extends [] ? GetSliceNameFromSignal<First> : GetSliceNamesFromSignals<Rest> | GetSliceNameFromSignal<First> : never;
-export type GetSliceMetaObjFromDatabaseSignals<Signals extends unknown[]> = {
+type GetSliceNamesFromSignals<Signals extends readonly unknown[]> = GetSliceNameFromSignal<Signals[number]>;
+export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[]> = {
     [K in GetSliceNamesFromSignals<Signals>]: SliceMeta;
 };
 export {};

package/types/signal/base.signal.d.ts

@@ -31,7 +31,7 @@ declare const Base_base: import("./serverSignal.d.ts").ServerSignalCls<typeof Ba
 export declare class Base extends Base_base {
 }
 export declare const base: import("./signalRegistry.d.ts").ServiceSignal<typeof BaseInternal, typeof BaseEndpoint, typeof Base>;
-export declare const fetch: import("akanjs/fetch").FetchProxy<import("../base.d.ts").Assign<unknown, import("akanjs/fetch").GetFetchTypeFromEndpoint<typeof BaseEndpoint>>, import("akanjs/fetch").GetSliceMetaObjFromDatabaseSignals<[import("./signalRegistry.d.ts").ServiceSignal<typeof BaseInternal, typeof BaseEndpoint, typeof Base>]>>;
+export declare const fetch: import("akanjs/fetch").FetchClientType<[import("./signalRegistry.d.ts").ServiceSignal<typeof BaseInternal, typeof BaseEndpoint, typeof Base>]>;
 export declare const getSerializedSignal: () => {
     [key: string]: import("./types.d.ts").SerializedSignal;
 };