akanjs 2.3.5-rc.1 → 2.3.5-rc.3

package/fetch/fetchType/buildFetch.type.ts

@@ -18,10 +18,16 @@ export type FetchProxySignalInput<
 
 export type FetchSignalInput = FetchProxySignalInput | DatabaseSignal | ServiceSignal;
 
+type MergeFetchParts<First, Second> = [First] extends [never]
+  ? Second
+  : [Second] extends [never]
+    ? First
+    : Assign<First, Second>;
+
 export type FetchTypeOfSignal<Signal extends FetchSignalInput> = Signal extends { _FetchType: infer FetchType }
   ? FetchType
   : Signal extends DatabaseSignal<infer _IntlCls, infer EndpCls, infer SlceCls, infer _SrvrCls>
-    ? GetFetchTypeFromEndpoint<EndpCls, SlceCls> & GetFetchTypeFromSlice<SlceCls>
+    ? MergeFetchParts<GetFetchTypeFromEndpoint<EndpCls, SlceCls>, GetFetchTypeFromSlice<SlceCls>>
     : Signal extends ServiceSignal<infer _IntlCls, infer EndpCls, infer _SrvrCls>
       ? GetFetchTypeFromEndpoint<EndpCls>
       : unknown;
@@ -41,7 +47,7 @@ type MergeDirectFetchTypes<
 > = Signals extends readonly [infer First extends FetchSignalInput, ...infer Rest extends readonly FetchSignalInput[]]
   ? First extends { _FetchType: unknown }
     ? MergeDirectFetchTypes<Rest, Acc>
-    : MergeDirectFetchTypes<Rest, Assign<Acc, FetchTypeOfSignal<First>>>
+    : MergeDirectFetchTypes<Rest, MergeFetchParts<Acc, FetchTypeOfSignal<First>>>
   : Acc;
 
 export type MergeAllFetchTypes<Signals extends readonly FetchSignalInput[]> =

package/fetch/fetchType/endpointFetch.type.ts

@@ -65,33 +65,53 @@ type PubsubSubscribeFn<E, Context> = (
   ]
 ) => () => void;
 
-type PrimaryFetchFn<E, Context> =
-  EndpInfoReqType<E> extends "query" | "mutation"
+type PrimaryFetchFn<E, Context, ReqType = EndpInfoReqType<E>> =
+  ReqType extends "query" | "mutation"
     ? QueryOrMutationFetchFn<E, Context>
-    : EndpInfoReqType<E> extends "message"
+    : ReqType extends "message"
       ? MessageEmitFn<E, Context>
       : never;
 
+type UploadLikeArg = FileList | File | File[];
+type HasUploadLikeArg<Args extends readonly unknown[]> = Extract<Args[number], UploadLikeArg> extends never ? false : true;
+type RestApiArg<Arg> = Arg extends FileList ? FileList : Arg extends File | File[] ? FileList : Arg;
+type RestApiArgs<Args extends readonly unknown[]> = {
+  [K in keyof Args]: RestApiArg<Args[K]>;
+};
+type UploadRestApiFetchFn<E, Context> = (
+  ...args: [...RestApiArgs<EndpInfoArgs<E>>, fetchPolicy?: FetchPolicy]
+) => Promise<EndpInfoReturns<E, Context>>;
+
 type PrimaryFetchType<EInfoObj extends { [key: string]: EndpointInfo }, Context> = {
-  [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "query" | "mutation" | "message"
-    ? K
-    : never]: PrimaryFetchFn<EInfoObj[K], Context>;
+  [K in keyof EInfoObj as Extract<EndpInfoReqType<EInfoObj[K]>, "query" | "mutation" | "message"> extends never
+    ? never
+    : K]: PrimaryFetchFn<EInfoObj[K], Context>;
+};
+
+type UploadRestApiFetchType<EInfoObj extends { [key: string]: EndpointInfo }, Context> = {
+  [K in keyof EInfoObj as Extract<EndpInfoReqType<EInfoObj[K]>, "mutation"> extends never
+    ? never
+    : HasUploadLikeArg<EndpInfoArgs<EInfoObj[K]>> extends true
+      ? K extends string
+        ? `${K}RestApi`
+        : never
+      : never]: UploadRestApiFetchFn<EInfoObj[K], Context>;
 };
 
 type PubsubFetchType<EInfoObj extends { [key: string]: EndpointInfo }, Context> = {
-  [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "pubsub"
-    ? K extends string
+  [K in keyof EInfoObj as Extract<EndpInfoReqType<EInfoObj[K]>, "pubsub"> extends never
+    ? never
+    : K extends string
       ? `subscribe${Capitalize<K>}`
-      : never
-    : never]: PubsubSubscribeFn<EInfoObj[K], Context>;
+      : never]: PubsubSubscribeFn<EInfoObj[K], Context>;
 };
 
 type MessageListenFetchType<EInfoObj extends { [key: string]: EndpointInfo }, Context> = {
-  [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "message"
-    ? K extends string
+  [K in keyof EInfoObj as Extract<EndpInfoReqType<EInfoObj[K]>, "message"> extends never
+    ? never
+    : K extends string
       ? `listen${Capitalize<K>}`
-      : never
-    : never]: MessageListenFn<EInfoObj[K], Context>;
+      : never]: MessageListenFn<EInfoObj[K], Context>;
 };
 
 export type GetFetchTypeFromEndpoint<
@@ -100,5 +120,6 @@ export type GetFetchTypeFromEndpoint<
   _EndpointInfoObj extends { [key: string]: EndpointInfo } = EndpCls[typeof ENDPOINT_META],
   _ReturnContext = EndpointReturnContextOf<SlceCls>,
 > = PrimaryFetchType<_EndpointInfoObj, _ReturnContext> &
+  UploadRestApiFetchType<_EndpointInfoObj, _ReturnContext> &
   PubsubFetchType<_EndpointInfoObj, _ReturnContext> &
   MessageListenFetchType<_EndpointInfoObj, _ReturnContext>;

package/fetch/fetchType/sliceFetch.type.ts

@@ -1,7 +1,7 @@
 import type { GetStateObject, SLICE_META } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
-import type { ConstantModel, DefaultOf, ProtoFile, PurifiedModel } from "akanjs/constant";
-import type { DatabaseModel, ExtractSort, FilterInstance } from "akanjs/document";
+import type { DefaultOf, ProtoFile, PurifiedModel } from "akanjs/constant";
+import type { ExtractSort, FilterInstance } from "akanjs/document";
 import type { SliceCls, SliceInfo, SliceInfoArgs } from "akanjs/signal";
 import type { ClientEdit, ClientInit, ClientView, EditReturn, InitReturn, ViewReturn } from "./appliedReturn.type";
 
@@ -16,12 +16,12 @@ export type SliceFetchDescriptor<
   Full = unknown,
   Light = unknown,
   Insight = unknown,
-  PurifiedInput = PurifiedModel<Input>,
-  DefaultInput = DefaultOf<Input>,
-  StateLight = GetStateObject<LightWithId<Light>>,
-  StateInsight = GetStateObject<Insight>,
+  PurifiedInput = unknown,
+  DefaultInput = unknown,
+  StateLight = unknown,
+  StateInsight = unknown,
   Filter extends FilterInstance = FilterInstance,
-  Sort = ExtractSort<Filter>,
+  Sort = unknown,
 > = {
   sliceMap: SliceMap;
   refName: RefName;
@@ -38,25 +38,21 @@ export type SliceFetchDescriptor<
   sort: Sort;
 };
 
-export type SliceFetchDescriptorOf<SlceCls extends SliceCls> = SlceCls["srv"]["cnst"] extends ConstantModel
-  ? SlceCls["srv"]["db"] extends DatabaseModel
-    ? SliceFetchDescriptor<
-        SlceCls[typeof SLICE_META],
-        SlceCls["srv"]["cnst"]["refName"],
-        SlceCls["srv"]["cnst"]["_CapitalizedRefName"],
-        SlceCls["srv"]["cnst"]["_Input"],
-        SlceCls["srv"]["cnst"]["_Full"],
-        SlceCls["srv"]["cnst"]["_Light"],
-        SlceCls["srv"]["cnst"]["_Insight"],
-        SlceCls["srv"]["cnst"]["_PurifiedInput"],
-        SlceCls["srv"]["cnst"]["_DefaultInput"],
-        GetStateObject<LightWithId<SlceCls["srv"]["cnst"]["_Light"]>>,
-        GetStateObject<SlceCls["srv"]["cnst"]["_Insight"]>,
-        SlceCls["srv"]["db"]["_Filter"],
-        SlceCls["srv"]["db"]["_Sort"]
-      >
-    : never
-  : never;
+export type SliceFetchDescriptorOf<SlceCls extends SliceCls> = SliceFetchDescriptor<
+  SlceCls[typeof SLICE_META],
+  SlceCls["baseName"],
+  SlceCls["srv"]["cnst"]["_CapitalizedRefName"],
+  SlceCls["srv"]["cnst"]["_Input"],
+  SlceCls["srv"]["cnst"]["_Full"],
+  SlceCls["srv"]["cnst"]["_Light"],
+  SlceCls["srv"]["cnst"]["_Insight"],
+  SlceCls["srv"]["cnst"]["_PurifiedInput"],
+  SlceCls["srv"]["cnst"]["_DefaultInput"],
+  GetStateObject<LightWithId<SlceCls["srv"]["cnst"]["_Light"]>>,
+  GetStateObject<SlceCls["srv"]["cnst"]["_Insight"]>,
+  SlceCls["srv"]["db"]["_Filter"],
+  SlceCls["srv"]["db"]["_Sort"]
+>;
 
 type _SliceMap<D extends SliceFetchDescriptor> = D["sliceMap"];
 type _RefName<D extends SliceFetchDescriptor> = D["refName"];
@@ -134,27 +130,25 @@ type SliceGetInitFetch<D extends SliceFetchDescriptor> = {
   >;
 };
 
-export type GetFetchTypeFromSliceDescriptor<Descriptor> = [Descriptor] extends [SliceFetchDescriptor]
-  ? SliceListFetch<Descriptor> &
-      SliceInsightFetch<Descriptor> &
-      SliceInitFetch<Descriptor> &
-      SliceGetInitFetch<Descriptor> &
-      RawBaseSliceFetchType<
-        _RefName<Descriptor>,
-        _Input<Descriptor>,
-        _Full<Descriptor>,
-        _Light<Descriptor>,
-        _Cap<Descriptor>,
-        _PurifiedInput<Descriptor>
-      > &
-      AppliedBaseSliceFetchType<
-        _RefName<Descriptor>,
-        _Input<Descriptor>,
-        _Full<Descriptor>,
-        _Cap<Descriptor>,
-        _PurifiedInput<Descriptor>
-      >
-  : never;
+export type GetFetchTypeFromSliceDescriptor<Descriptor extends SliceFetchDescriptor> = SliceListFetch<Descriptor> &
+  SliceInsightFetch<Descriptor> &
+  SliceInitFetch<Descriptor> &
+  SliceGetInitFetch<Descriptor> &
+  RawBaseSliceFetchType<
+    _RefName<Descriptor>,
+    _Input<Descriptor>,
+    _Full<Descriptor>,
+    _Light<Descriptor>,
+    _Cap<Descriptor>,
+    _PurifiedInput<Descriptor>
+  > &
+  AppliedBaseSliceFetchType<
+    _RefName<Descriptor>,
+    _Input<Descriptor>,
+    _Full<Descriptor>,
+    _Cap<Descriptor>,
+    _PurifiedInput<Descriptor>
+  >;
 
 export type GetFetchTypeFromSlice<SlceCls extends SliceCls> = GetFetchTypeFromSliceDescriptor<
   SliceFetchDescriptorOf<SlceCls>
@@ -180,7 +174,7 @@ type RawBaseSliceFetchType<
     fetchPolicy?: FetchPolicy,
   ) => Promise<Full>;
 } & {
-  [K in `remove${_CapitalizedRefName}`]: (id: string, fetchPolicy?: FetchPolicy) => Promise<void>;
+  [K in `remove${_CapitalizedRefName}`]: (id: string, fetchPolicy?: FetchPolicy) => Promise<Full>;
 };
 
 type AppliedBaseSliceFetchType<

package/fetch/types.ts

@@ -1,5 +1,4 @@
-import { type Assign, type Environment, getEnv, type SLICE_META } from "akanjs/base";
-import type { DatabaseSignal } from "akanjs/signal";
+import { type Environment, getEnv } from "akanjs/base";
 import type { SliceMeta } from "./fetchType/appliedReturn.type";
 
 /** Account data made available to services for the current app/environment. */
@@ -12,18 +11,6 @@ export const getDefaultAccount = (): Account => {
   return { appName: env.appName, environment: env.environment };
 };
 
-type GetSliceMetaObjFromSignal<Signal> = Signal extends {
-  _SliceMetaObj: infer SliceMetaObj extends Record<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, Assign<Acc, GetSliceMetaObjFromSignal<First>>>
-  : Acc;
+export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[]> = Signals extends readonly []
+  ? Record<never, never>
+  : Record<string, SliceMeta>;

package/package.json

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

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

@@ -12,15 +12,16 @@ export type FetchProxySignalInput<FetchType = unknown, SliceMetaObj extends Reco
     _SliceMetaObj: SliceMetaObj;
 };
 export type FetchSignalInput = FetchProxySignalInput | DatabaseSignal | ServiceSignal;
+type MergeFetchParts<First, Second> = [First] extends [never] ? Second : [Second] extends [never] ? First : Assign<First, Second>;
 export type FetchTypeOfSignal<Signal extends FetchSignalInput> = Signal extends {
     _FetchType: infer FetchType;
-} ? 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;
+} ? FetchType : Signal extends DatabaseSignal<infer _IntlCls, infer EndpCls, infer SlceCls, infer _SrvrCls> ? MergeFetchParts<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;
 } ? 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, Assign<Acc, FetchTypeOfSignal<First>>> : Acc;
+} ? MergeDirectFetchTypes<Rest, Acc> : MergeDirectFetchTypes<Rest, MergeFetchParts<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/fetchType/endpointFetch.type.d.ts

@@ -18,23 +18,35 @@ type PubsubSubscribeFn<E, Context> = (...args: [
     handleEvent: (data: EndpInfoReturns<E, Context>) => PromiseOrObject<void>,
     options?: FetchPolicy
 ]) => () => void;
-type PrimaryFetchFn<E, Context> = EndpInfoReqType<E> extends "query" | "mutation" ? QueryOrMutationFetchFn<E, Context> : EndpInfoReqType<E> extends "message" ? MessageEmitFn<E, Context> : never;
+type PrimaryFetchFn<E, Context, ReqType = EndpInfoReqType<E>> = ReqType extends "query" | "mutation" ? QueryOrMutationFetchFn<E, Context> : ReqType extends "message" ? MessageEmitFn<E, Context> : never;
+type UploadLikeArg = FileList | File | File[];
+type HasUploadLikeArg<Args extends readonly unknown[]> = Extract<Args[number], UploadLikeArg> extends never ? false : true;
+type RestApiArg<Arg> = Arg extends FileList ? FileList : Arg extends File | File[] ? FileList : Arg;
+type RestApiArgs<Args extends readonly unknown[]> = {
+    [K in keyof Args]: RestApiArg<Args[K]>;
+};
+type UploadRestApiFetchFn<E, Context> = (...args: [...RestApiArgs<EndpInfoArgs<E>>, fetchPolicy?: FetchPolicy]) => Promise<EndpInfoReturns<E, Context>>;
 type PrimaryFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
 }, Context> = {
-    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "query" | "mutation" | "message" ? K : never]: PrimaryFetchFn<EInfoObj[K], Context>;
+    [K in keyof EInfoObj as Extract<EndpInfoReqType<EInfoObj[K]>, "query" | "mutation" | "message"> extends never ? never : K]: PrimaryFetchFn<EInfoObj[K], Context>;
+};
+type UploadRestApiFetchType<EInfoObj extends {
+    [key: string]: EndpointInfo;
+}, Context> = {
+    [K in keyof EInfoObj as Extract<EndpInfoReqType<EInfoObj[K]>, "mutation"> extends never ? never : HasUploadLikeArg<EndpInfoArgs<EInfoObj[K]>> extends true ? K extends string ? `${K}RestApi` : never : never]: UploadRestApiFetchFn<EInfoObj[K], Context>;
 };
 type PubsubFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
 }, Context> = {
-    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "pubsub" ? K extends string ? `subscribe${Capitalize<K>}` : never : never]: PubsubSubscribeFn<EInfoObj[K], Context>;
+    [K in keyof EInfoObj as Extract<EndpInfoReqType<EInfoObj[K]>, "pubsub"> extends never ? never : K extends string ? `subscribe${Capitalize<K>}` : never]: PubsubSubscribeFn<EInfoObj[K], Context>;
 };
 type MessageListenFetchType<EInfoObj extends {
     [key: string]: EndpointInfo;
 }, Context> = {
-    [K in keyof EInfoObj as EndpInfoReqType<EInfoObj[K]> extends "message" ? K extends string ? `listen${Capitalize<K>}` : never : never]: MessageListenFn<EInfoObj[K], Context>;
+    [K in keyof EInfoObj as Extract<EndpInfoReqType<EInfoObj[K]>, "message"> extends never ? never : K extends string ? `listen${Capitalize<K>}` : never]: MessageListenFn<EInfoObj[K], Context>;
 };
 export type GetFetchTypeFromEndpoint<EndpCls extends EndpointCls, SlceCls extends SliceCls | never = never, _EndpointInfoObj extends {
     [key: string]: EndpointInfo;
-} = EndpCls[typeof ENDPOINT_META], _ReturnContext = EndpointReturnContextOf<SlceCls>> = PrimaryFetchType<_EndpointInfoObj, _ReturnContext> & PubsubFetchType<_EndpointInfoObj, _ReturnContext> & MessageListenFetchType<_EndpointInfoObj, _ReturnContext>;
+} = EndpCls[typeof ENDPOINT_META], _ReturnContext = EndpointReturnContextOf<SlceCls>> = PrimaryFetchType<_EndpointInfoObj, _ReturnContext> & UploadRestApiFetchType<_EndpointInfoObj, _ReturnContext> & PubsubFetchType<_EndpointInfoObj, _ReturnContext> & MessageListenFetchType<_EndpointInfoObj, _ReturnContext>;
 export {};

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

@@ -1,7 +1,7 @@
 import type { GetStateObject, SLICE_META } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
-import type { ConstantModel, DefaultOf, ProtoFile, PurifiedModel } from "akanjs/constant";
-import type { DatabaseModel, ExtractSort, FilterInstance } from "akanjs/document";
+import type { DefaultOf, ProtoFile, PurifiedModel } from "akanjs/constant";
+import type { ExtractSort, FilterInstance } from "akanjs/document";
 import type { SliceCls, SliceInfo, SliceInfoArgs } from "akanjs/signal";
 import type { ClientEdit, ClientInit, ClientView, EditReturn, InitReturn, ViewReturn } from "./appliedReturn.type";
 type SliceInfoMap = {
@@ -12,7 +12,7 @@ type LightWithId<Light> = Light extends {
 } ? Light : {
     id: string;
 };
-export type SliceFetchDescriptor<SliceMap extends SliceInfoMap = SliceInfoMap, RefName extends string = string, CapRefName extends string = Capitalize<RefName>, Input = unknown, Full = unknown, Light = unknown, Insight = unknown, PurifiedInput = PurifiedModel<Input>, DefaultInput = DefaultOf<Input>, StateLight = GetStateObject<LightWithId<Light>>, StateInsight = GetStateObject<Insight>, Filter extends FilterInstance = FilterInstance, Sort = ExtractSort<Filter>> = {
+export type SliceFetchDescriptor<SliceMap extends SliceInfoMap = SliceInfoMap, RefName extends string = string, CapRefName extends string = Capitalize<RefName>, Input = unknown, Full = unknown, Light = unknown, Insight = unknown, PurifiedInput = unknown, DefaultInput = unknown, StateLight = unknown, StateInsight = unknown, Filter extends FilterInstance = FilterInstance, Sort = unknown> = {
     sliceMap: SliceMap;
     refName: RefName;
     capRefName: CapRefName;
@@ -27,7 +27,7 @@ export type SliceFetchDescriptor<SliceMap extends SliceInfoMap = SliceInfoMap, R
     filter: Filter;
     sort: Sort;
 };
-export type SliceFetchDescriptorOf<SlceCls extends SliceCls> = SlceCls["srv"]["cnst"] extends ConstantModel ? SlceCls["srv"]["db"] extends DatabaseModel ? SliceFetchDescriptor<SlceCls[typeof SLICE_META], SlceCls["srv"]["cnst"]["refName"], SlceCls["srv"]["cnst"]["_CapitalizedRefName"], SlceCls["srv"]["cnst"]["_Input"], SlceCls["srv"]["cnst"]["_Full"], SlceCls["srv"]["cnst"]["_Light"], SlceCls["srv"]["cnst"]["_Insight"], SlceCls["srv"]["cnst"]["_PurifiedInput"], SlceCls["srv"]["cnst"]["_DefaultInput"], GetStateObject<LightWithId<SlceCls["srv"]["cnst"]["_Light"]>>, GetStateObject<SlceCls["srv"]["cnst"]["_Insight"]>, SlceCls["srv"]["db"]["_Filter"], SlceCls["srv"]["db"]["_Sort"]> : never : never;
+export type SliceFetchDescriptorOf<SlceCls extends SliceCls> = SliceFetchDescriptor<SlceCls[typeof SLICE_META], SlceCls["baseName"], SlceCls["srv"]["cnst"]["_CapitalizedRefName"], SlceCls["srv"]["cnst"]["_Input"], SlceCls["srv"]["cnst"]["_Full"], SlceCls["srv"]["cnst"]["_Light"], SlceCls["srv"]["cnst"]["_Insight"], SlceCls["srv"]["cnst"]["_PurifiedInput"], SlceCls["srv"]["cnst"]["_DefaultInput"], GetStateObject<LightWithId<SlceCls["srv"]["cnst"]["_Light"]>>, GetStateObject<SlceCls["srv"]["cnst"]["_Insight"]>, SlceCls["srv"]["db"]["_Filter"], SlceCls["srv"]["db"]["_Sort"]>;
 type _SliceMap<D extends SliceFetchDescriptor> = D["sliceMap"];
 type _RefName<D extends SliceFetchDescriptor> = D["refName"];
 type _Cap<D extends SliceFetchDescriptor> = D["capRefName"];
@@ -61,7 +61,7 @@ type SliceInitFetch<D extends SliceFetchDescriptor> = {
 type SliceGetInitFetch<D extends SliceFetchDescriptor> = {
     [Suffix in keyof _SliceMap<D> as Suffix extends string ? `get${_Cap<D>}Init${Capitalize<Suffix>}` : never]: (...args: [...SliceInfoArgs<_SliceMap<D>[Suffix]>, option?: _SliceFetchInitOption<D>]) => ClientInit<_RefName<D>, _Light<D>, _Insight<D>, SliceInfoArgs<_SliceMap<D>[Suffix]>, _Filter<D>, _Cap<D>, _StateLight<D>, _StateInsight<D>, _Sort<D>>;
 };
-export type GetFetchTypeFromSliceDescriptor<Descriptor> = [Descriptor] extends [SliceFetchDescriptor] ? SliceListFetch<Descriptor> & SliceInsightFetch<Descriptor> & SliceInitFetch<Descriptor> & SliceGetInitFetch<Descriptor> & RawBaseSliceFetchType<_RefName<Descriptor>, _Input<Descriptor>, _Full<Descriptor>, _Light<Descriptor>, _Cap<Descriptor>, _PurifiedInput<Descriptor>> & AppliedBaseSliceFetchType<_RefName<Descriptor>, _Input<Descriptor>, _Full<Descriptor>, _Cap<Descriptor>, _PurifiedInput<Descriptor>> : never;
+export type GetFetchTypeFromSliceDescriptor<Descriptor extends SliceFetchDescriptor> = SliceListFetch<Descriptor> & SliceInsightFetch<Descriptor> & SliceInitFetch<Descriptor> & SliceGetInitFetch<Descriptor> & RawBaseSliceFetchType<_RefName<Descriptor>, _Input<Descriptor>, _Full<Descriptor>, _Light<Descriptor>, _Cap<Descriptor>, _PurifiedInput<Descriptor>> & AppliedBaseSliceFetchType<_RefName<Descriptor>, _Input<Descriptor>, _Full<Descriptor>, _Cap<Descriptor>, _PurifiedInput<Descriptor>>;
 export type GetFetchTypeFromSlice<SlceCls extends SliceCls> = GetFetchTypeFromSliceDescriptor<SliceFetchDescriptorOf<SlceCls>>;
 type RawBaseSliceFetchType<RefName extends string, Input, Full, Light, _CapitalizedRefName extends string = Capitalize<RefName>, _PurifiedInput = PurifiedModel<Input>> = {
     [K in RefName]: (id: string, fetchPolicy?: FetchPolicy) => Promise<Full>;
@@ -72,7 +72,7 @@ type RawBaseSliceFetchType<RefName extends string, Input, Full, Light, _Capitali
 } & {
     [K in `update${_CapitalizedRefName}`]: (id: string, input: _PurifiedInput, fetchPolicy?: FetchPolicy) => Promise<Full>;
 } & {
-    [K in `remove${_CapitalizedRefName}`]: (id: string, fetchPolicy?: FetchPolicy) => Promise<void>;
+    [K in `remove${_CapitalizedRefName}`]: (id: string, fetchPolicy?: FetchPolicy) => Promise<Full>;
 };
 type AppliedBaseSliceFetchType<RefName extends string, Input, Full, _CapitalizedRefName extends string = Capitalize<RefName>, _PurifiedInput = PurifiedModel<Input>> = {
     [K in `view${_CapitalizedRefName}`]: (id: string, option?: FetchPolicy) => Promise<ViewReturn<RefName, Full>>;

package/types/fetch/types.d.ts

@@ -1,5 +1,4 @@
-import { type Assign, type Environment, type SLICE_META } from "akanjs/base";
-import type { DatabaseSignal } from "akanjs/signal";
+import { type Environment } from "akanjs/base";
 import type { SliceMeta } from "./fetchType/appliedReturn.type";
 /** Account data made available to services for the current app/environment. */
 export type Account<AddData = unknown> = {
@@ -7,10 +6,4 @@ export type Account<AddData = unknown> = {
     environment: Environment;
 } & AddData;
 export declare const getDefaultAccount: () => Account;
-type GetSliceMetaObjFromSignal<Signal> = Signal extends {
-    _SliceMetaObj: infer SliceMetaObj extends Record<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, Assign<Acc, GetSliceMetaObjFromSignal<First>>> : Acc;
-export {};
+export type GetSliceMetaObjFromDatabaseSignals<Signals extends readonly unknown[]> = Signals extends readonly [] ? Record<never, never> : Record<string, SliceMeta>;

package/ui/InfiniteScroll.tsx

@@ -22,6 +22,7 @@ export const InfiniteScroll = ({
   reverse,
 }: InfiniteScrollProps) => {
   const [isFetching, setIsFetching] = useState(false);
+  const isFetchingRef = useRef(false);
   const target = useRef<HTMLDivElement>(null);
   const page = useRef<number>(currentPage);
   const totalPages = Math.ceil(total / (itemsPerPage || 1));
@@ -38,14 +39,39 @@ export const InfiniteScroll = ({
   }, []);
 
   const fetchMoreItems = async () => {
-    if (isFetching) return;
+    if (isFetchingRef.current) return;
     const nextPage = page.current + 1;
     if (nextPage > totalPages) return;
+
+    const scroller = reverse ? document.scrollingElement : null;
+    const prevScrollHeight = scroller?.scrollHeight ?? 0;
+    const prevScrollTop = scroller?.scrollTop ?? 0;
+
+    isFetchingRef.current = true;
     setIsFetching(true);
-    await onAddPage(nextPage);
-    onPageSelect(nextPage);
-    setIsFetching(false);
-    page.current = nextPage;
+    try {
+      await onAddPage(nextPage);
+      onPageSelect(nextPage);
+      page.current = nextPage;
+
+      const restoreScroll = () => {
+        if (scroller) {
+          scroller.scrollTop = prevScrollTop + (scroller.scrollHeight - prevScrollHeight);
+        }
+        isFetchingRef.current = false;
+        setIsFetching(false);
+      };
+
+      if (typeof requestAnimationFrame === "function") {
+        requestAnimationFrame(restoreScroll);
+      } else {
+        restoreScroll();
+      }
+    } catch (error) {
+      isFetchingRef.current = false;
+      setIsFetching(false);
+      throw error;
+    }
   };
 
   return (