akanjs 2.3.4 → 2.3.5-rc.0

package/fetch/fetchType/buildFetch.type.ts

@@ -1,4 +1,5 @@
-import type { DatabaseSignal, EndpointCls, SerializedSignal, ServiceSignal, SliceCls } from "akanjs/signal";
+import type { Assign } from "akanjs/base";
+import type { DatabaseSignal, SerializedSignal, ServiceSignal } from "akanjs/signal";
 import type { FetchProxy } from "../client";
 import type { GetSliceMetaObjFromDatabaseSignals } from "../types";
 import type { SliceMeta } from "./appliedReturn.type";
@@ -19,34 +20,20 @@ export type FetchSignalInput = FetchProxySignalInput | DatabaseSignal | ServiceS
 
 export type FetchTypeOfSignal<Signal extends FetchSignalInput> = Signal extends { _FetchType: infer FetchType }
   ? FetchType
-  : Signal extends { endpoint: infer EndpCls extends EndpointCls; slice: infer SlceCls extends SliceCls }
+  : Signal extends DatabaseSignal<infer _IntlCls, infer EndpCls, infer SlceCls, infer _SrvrCls>
     ? GetFetchTypeFromEndpoint<EndpCls, SlceCls> & GetFetchTypeFromSlice<SlceCls>
-    : Signal extends { endpoint: infer EndpCls extends EndpointCls }
+    : Signal extends ServiceSignal<infer _IntlCls, infer EndpCls, infer _SrvrCls>
       ? GetFetchTypeFromEndpoint<EndpCls>
       : unknown;
 
-type FetchKeysOfProxySignal<Signal> = Signal extends { _FetchType: infer FetchType } ? keyof FetchType : never;
-type FetchKeysOfProxySignals<Signals extends readonly FetchSignalInput[]> = FetchKeysOfProxySignal<Signals[number]>;
-
-type LastProxyFetchValue<
+type MergeProxyFetchTypes<
   Signals extends readonly FetchSignalInput[],
-  Key extends PropertyKey,
-  Current = never,
+  Acc = Record<never, never>,
 > = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]]
   ? First extends { _FetchType: infer FetchType }
-    ? Key extends keyof FetchType
-      ? LastProxyFetchValue<Rest, Key, FetchType[Key]>
-      : LastProxyFetchValue<Rest, Key, Current>
-    : LastProxyFetchValue<Rest, Key, Current>
-  : Current;
-
-type MergeProxyFetchTypes<Signals extends readonly FetchSignalInput[]> = [FetchKeysOfProxySignals<Signals>] extends [
-  never,
-]
-  ? Record<never, never>
-  : {
-      [Key in FetchKeysOfProxySignals<Signals>]: LastProxyFetchValue<Signals, Key>;
-    };
+    ? MergeProxyFetchTypes<Rest, Assign<Acc, FetchType>>
+    : MergeProxyFetchTypes<Rest, Acc>
+  : Acc;
 
 type MergeDirectFetchTypes<
   Signals extends readonly FetchSignalInput[],
@@ -54,13 +41,13 @@ type MergeDirectFetchTypes<
 > = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]]
   ? First extends { _FetchType: unknown }
     ? MergeDirectFetchTypes<Rest, Acc>
-    : MergeDirectFetchTypes<Rest, Acc & FetchTypeOfSignal<First>>
+    : MergeDirectFetchTypes<Rest, Assign<Acc, FetchTypeOfSignal<First>>>
   : Acc;
 
 export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> =
   MergeProxyFetchTypes<Signals> extends infer ProxyFetch
     ? MergeDirectFetchTypes<Signals> extends infer DirectFetch
-      ? Omit<ProxyFetch, keyof DirectFetch> & DirectFetch
+      ? Assign<ProxyFetch, DirectFetch>
       : never
     : never;
 

package/fetch/types.ts

@@ -1,4 +1,4 @@
-import { type Environment, getEnv, type SLICE_META } from "akanjs/base";
+import { type Assign, type Environment, getEnv, type SLICE_META } from "akanjs/base";
 import type { DatabaseSignal } from "akanjs/signal";
 import type { SliceMeta } from "./fetchType/appliedReturn.type";
 
@@ -16,14 +16,14 @@ type GetSliceMetaObjFromSignal<Signal> = Signal extends {
   _SliceMetaObj: infer SliceMetaObj extends Record<string, SliceMeta>;
 }
   ? SliceMetaObj
-  : Signal extends DatabaseSignal
+  : Signal extends DatabaseSignal<infer _IntlCls, infer _EndpCls, infer SlceCls, infer _SrvrCls>
     ? {
-        [K in `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}`]: SliceMeta;
+        [K in `${SlceCls["baseName"]}${Capitalize<keyof SlceCls[typeof SLICE_META] & string>}`]: SliceMeta;
       }
     : Record<never, never>;
 export type GetSliceMetaObjFromDatabaseSignals<
   Signals extends readonly unknown[],
   Acc extends Record<string, SliceMeta> = Record<never, never>,
 > = Signals extends readonly [infer First, ...infer Rest]
-  ? GetSliceMetaObjFromDatabaseSignals<Rest, Acc & GetSliceMetaObjFromSignal<First>>
+  ? GetSliceMetaObjFromDatabaseSignals<Rest, Assign<Acc, GetSliceMetaObjFromSignal<First>>>
   : Acc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.4",
+  "version": "2.3.5-rc.0",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

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

@@ -1,4 +1,5 @@
-import type { DatabaseSignal, EndpointCls, SerializedSignal, ServiceSignal, SliceCls } from "akanjs/signal";
+import type { Assign } from "akanjs/base";
+import type { DatabaseSignal, SerializedSignal, ServiceSignal } from "akanjs/signal";
 import type { FetchProxy } from "../client.d.ts";
 import type { GetSliceMetaObjFromDatabaseSignals } from "../types.d.ts";
 import type { SliceMeta } from "./appliedReturn.type";
@@ -13,27 +14,13 @@ export type FetchProxySignalInput<FetchType = unknown, SliceMetaObj extends Reco
 export type FetchSignalInput = FetchProxySignalInput | DatabaseSignal | ServiceSignal;
 export type FetchTypeOfSignal<Signal extends FetchSignalInput> = Signal extends {
     _FetchType: infer FetchType;
-} ? FetchType : Signal extends {
-    endpoint: infer EndpCls extends EndpointCls;
-    slice: infer SlceCls extends SliceCls;
-} ? GetFetchTypeFromEndpoint<EndpCls, SlceCls> & GetFetchTypeFromSlice<SlceCls> : Signal extends {
-    endpoint: infer EndpCls extends EndpointCls;
-} ? GetFetchTypeFromEndpoint<EndpCls> : unknown;
-type FetchKeysOfProxySignal<Signal> = Signal extends {
+} ? FetchType : Signal extends DatabaseSignal<infer _IntlCls, infer EndpCls, infer SlceCls, infer _SrvrCls> ? GetFetchTypeFromEndpoint<EndpCls, SlceCls> & GetFetchTypeFromSlice<SlceCls> : Signal extends ServiceSignal<infer _IntlCls, infer EndpCls, infer _SrvrCls> ? GetFetchTypeFromEndpoint<EndpCls> : unknown;
+type MergeProxyFetchTypes<Signals extends readonly FetchSignalInput[], Acc = Record<never, never>> = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]] ? First extends {
     _FetchType: infer FetchType;
-} ? keyof FetchType : never;
-type FetchKeysOfProxySignals<Signals extends readonly FetchSignalInput[]> = FetchKeysOfProxySignal<Signals[number]>;
-type LastProxyFetchValue<Signals extends readonly FetchSignalInput[], Key extends PropertyKey, Current = never> = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]] ? First extends {
-    _FetchType: infer FetchType;
-} ? Key extends keyof FetchType ? LastProxyFetchValue<Rest, Key, FetchType[Key]> : LastProxyFetchValue<Rest, Key, Current> : LastProxyFetchValue<Rest, Key, Current> : Current;
-type MergeProxyFetchTypes<Signals extends readonly FetchSignalInput[]> = [FetchKeysOfProxySignals<Signals>] extends [
-    never
-] ? Record<never, never> : {
-    [Key in FetchKeysOfProxySignals<Signals>]: LastProxyFetchValue<Signals, Key>;
-};
+} ? MergeProxyFetchTypes<Rest, Assign<Acc, FetchType>> : MergeProxyFetchTypes<Rest, Acc> : Acc;
 type MergeDirectFetchTypes<Signals extends readonly FetchSignalInput[], Acc = Record<never, never>> = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]] ? First extends {
     _FetchType: unknown;
-} ? MergeDirectFetchTypes<Rest, Acc> : MergeDirectFetchTypes<Rest, Acc & FetchTypeOfSignal<First>> : Acc;
-export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> = MergeProxyFetchTypes<Signals> extends infer ProxyFetch ? MergeDirectFetchTypes<Signals> extends infer DirectFetch ? Omit<ProxyFetch, keyof DirectFetch> & DirectFetch : never : never;
+} ? MergeDirectFetchTypes<Rest, Acc> : MergeDirectFetchTypes<Rest, Assign<Acc, FetchTypeOfSignal<First>>> : Acc;
+export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> = MergeProxyFetchTypes<Signals> extends infer ProxyFetch ? MergeDirectFetchTypes<Signals> extends infer DirectFetch ? Assign<ProxyFetch, DirectFetch> : never : never;
 export type FetchClientType<Signals extends readonly FetchSignalInput[]> = FetchProxy<MergeAllFetchTypes<Signals>, GetSliceMetaObjFromDatabaseSignals<Signals>>;
 export {};

package/types/fetch/types.d.ts

@@ -1,4 +1,4 @@
-import { type Environment, type SLICE_META } from "akanjs/base";
+import { type Assign, type Environment, type SLICE_META } from "akanjs/base";
 import type { DatabaseSignal } from "akanjs/signal";
 import type { SliceMeta } from "./fetchType/appliedReturn.type";
 /** Account data made available to services for the current app/environment. */
@@ -9,8 +9,8 @@ export type Account<AddData = unknown> = {
 export declare const getDefaultAccount: () => Account;
 type GetSliceMetaObjFromSignal<Signal> = Signal extends {
     _SliceMetaObj: infer SliceMetaObj extends Record<string, SliceMeta>;
-} ? SliceMetaObj : Signal extends DatabaseSignal ? {
-    [K in `${Signal["slice"]["baseName"]}${Capitalize<keyof Signal["slice"][typeof SLICE_META] & string>}`]: SliceMeta;
+} ? SliceMetaObj : Signal extends DatabaseSignal<infer _IntlCls, infer _EndpCls, infer SlceCls, infer _SrvrCls> ? {
+    [K in `${SlceCls["baseName"]}${Capitalize<keyof SlceCls[typeof SLICE_META] & string>}`]: SliceMeta;
 } : Record<never, never>;
-export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[], Acc extends Record<string, SliceMeta> = Record<never, never>> = Signals extends readonly [infer First, ...infer Rest] ? GetSliceMetaObjFromDatabaseSignals<Rest, Acc & GetSliceMetaObjFromSignal<First>> : Acc;
+export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[], Acc extends Record<string, SliceMeta> = Record<never, never>> = Signals extends readonly [infer First, ...infer Rest] ? GetSliceMetaObjFromDatabaseSignals<Rest, Assign<Acc, GetSliceMetaObjFromSignal<First>>> : Acc;
 export {};