akanjs 2.3.5-rc.2 → 2.3.5-rc.4

package/constant/constantRegistry.ts

@@ -273,26 +273,15 @@ export class ConstantRegistry {
   }
 }
 
-export interface ConstantModel<
+export interface ConstantCore<
   T extends string = string,
-  Input = any,
-  Obj = any,
-  Full = any,
-  Light = any,
-  Insight = any,
+  Input = unknown,
+  Obj = unknown,
+  Full = unknown,
+  Light = unknown,
+  Insight = unknown,
   FullFieldObj extends FieldObject = FieldObject,
   _CapitalizedRefName extends string = Capitalize<T>,
-  _Default = DefaultOf<Full>,
-  _DefaultInput = DefaultOf<Input>,
-  _DefaultState = GetStateObject<Full>,
-  _DefaultStateInput = GetStateObject<Input>,
-  _DefaultInsight = DefaultOf<Insight>,
-  _PurifiedInput = PurifiedModel<Input>,
-  _Doc = DocumentModel<Full>,
-  _DocInput = DocumentModel<Input>,
-  _QueryOfDoc = QueryOf<_Doc>,
-  _StateLight = GetStateObject<Light>,
-  _StateInsight = GetStateObject<Insight>,
 > {
   refName: T;
   input: ConstantCls<Input>;
@@ -306,6 +295,25 @@ export interface ConstantModel<
   _Full: Full;
   _Light: Light;
   _Insight: Insight;
+}
+
+export interface ConstantDerived<
+  Input = unknown,
+  Full = unknown,
+  Light = unknown,
+  Insight = unknown,
+  _Default = DefaultOf<Full>,
+  _DefaultInput = DefaultOf<Input>,
+  _DefaultState = GetStateObject<Full>,
+  _DefaultStateInput = GetStateObject<Input>,
+  _DefaultInsight = DefaultOf<Insight>,
+  _PurifiedInput = PurifiedModel<Input>,
+  _Doc = DocumentModel<Full>,
+  _DocInput = DocumentModel<Input>,
+  _QueryOfDoc = QueryOf<_Doc>,
+  _StateLight = GetStateObject<Light>,
+  _StateInsight = GetStateObject<Insight>,
+> {
   _Default: _Default;
   _DefaultInput: _DefaultInput;
   _DefaultState: _DefaultState;
@@ -319,6 +327,98 @@ export interface ConstantModel<
   _StateInsight: _StateInsight;
 }
 
+export interface ConstantModel<
+  T extends string = string,
+  Input = any,
+  Obj = any,
+  Full = any,
+  Light = any,
+  Insight = any,
+  FullFieldObj extends FieldObject = FieldObject,
+  _CapitalizedRefName extends string = Capitalize<T>,
+  _Default = DefaultOf<Full>,
+  _DefaultInput = DefaultOf<Input>,
+  _DefaultState = GetStateObject<Full>,
+  _DefaultStateInput = GetStateObject<Input>,
+  _DefaultInsight = DefaultOf<Insight>,
+  _PurifiedInput = PurifiedModel<Input>,
+  _Doc = DocumentModel<Full>,
+  _DocInput = DocumentModel<Input>,
+  _QueryOfDoc = QueryOf<_Doc>,
+  _StateLight = GetStateObject<Light>,
+  _StateInsight = GetStateObject<Insight>,
+> extends ConstantCore<T, Input, Obj, Full, Light, Insight, FullFieldObj, _CapitalizedRefName>,
+    ConstantDerived<
+      Input,
+      Full,
+      Light,
+      Insight,
+      _Default,
+      _DefaultInput,
+      _DefaultState,
+      _DefaultStateInput,
+      _DefaultInsight,
+      _PurifiedInput,
+      _Doc,
+      _DocInput,
+      _QueryOfDoc,
+      _StateLight,
+      _StateInsight
+    > {}
+
+export type ConstantReturnView<Full = unknown, Light = unknown, Insight = unknown> = {
+  full: Full;
+  light: Light;
+  insight: Insight;
+};
+
+export type ConstantReturnViewOf<Cnst> = Cnst extends {
+  _Full: infer Full;
+  _Light: infer Light;
+  _Insight: infer Insight;
+}
+  ? ConstantReturnView<Full, Light, Insight>
+  : never;
+
+export type ConstantFetchView<
+  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,
+> = {
+  refName: RefName;
+  capRefName: CapRefName;
+  input: Input;
+  full: Full;
+  light: Light;
+  insight: Insight;
+  purifiedInput: PurifiedInput;
+  defaultInput: DefaultInput;
+  stateLight: StateLight;
+  stateInsight: StateInsight;
+};
+
+export type ConstantFetchViewOf<Cnst> = Cnst extends {
+  refName: infer RefName extends string;
+  _CapitalizedRefName: infer CapRefName extends string;
+  _Input: infer Input;
+  _Full: infer Full;
+  _Light: infer Light;
+  _Insight: infer Insight;
+  _PurifiedInput: infer PurifiedInput;
+  _DefaultInput: infer DefaultInput;
+  _StateLight: infer StateLight;
+  _StateInsight: infer StateInsight;
+}
+  ? ConstantFetchView<RefName, CapRefName, Input, Full, Light, Insight, PurifiedInput, DefaultInput, StateLight, StateInsight>
+  : never;
+
 export interface ScalarConstantModel<
   T extends string = string,
   Model = any,

package/fetch/fetchType/endpointFetch.type.ts

@@ -1,5 +1,6 @@
 import type { ENDPOINT_META, PromiseOrObject } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
+import type { ConstantReturnViewOf } from "akanjs/constant";
 import type {
   EndpInfoArgs,
   EndpInfoClientReturns,
@@ -19,11 +20,7 @@ export type EndpointReturnContext<Full = unknown, Light = unknown, Insight = unk
 type EndpointReturnContextOf<SlceCls extends SliceCls | never> = [SlceCls] extends [never]
   ? never
   : SlceCls extends SliceCls
-    ? EndpointReturnContext<
-        SlceCls["srv"]["cnst"]["_Full"],
-        SlceCls["srv"]["cnst"]["_Light"],
-        SlceCls["srv"]["cnst"]["_Insight"]
-      >
+    ? ConstantReturnViewOf<SlceCls["srv"]["cnst"]>
     : never;
 
 type ExtendedEndpointReturn<ClientReturns, Context> = ClientReturns extends (infer R)[]

package/fetch/fetchType/sliceFetch.type.ts

@@ -1,6 +1,6 @@
-import type { GetStateObject, SLICE_META } from "akanjs/base";
+import type { SLICE_META } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
-import type { DefaultOf, ProtoFile, PurifiedModel } from "akanjs/constant";
+import type { ConstantFetchViewOf, 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";
@@ -11,7 +11,7 @@ type LightWithId<Light> = Light extends { id: string } ? Light : { id: string };
 export type SliceFetchDescriptor<
   SliceMap extends SliceInfoMap = SliceInfoMap,
   RefName extends string = string,
-  CapRefName extends string = Capitalize<RefName>,
+  CapRefName extends string = string,
   Input = unknown,
   Full = unknown,
   Light = unknown,
@@ -38,21 +38,37 @@ export type SliceFetchDescriptor<
   sort: Sort;
 };
 
-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 SliceConstantFetchViewOf<SlceCls extends SliceCls> = ConstantFetchViewOf<SlceCls["srv"]["cnst"]>;
+
+export type SliceFetchDescriptorOf<SlceCls extends SliceCls> =
+  SliceConstantFetchViewOf<SlceCls> extends infer View extends {
+    refName: string;
+    capRefName: string;
+    input: unknown;
+    full: unknown;
+    light: unknown;
+    insight: unknown;
+    purifiedInput: unknown;
+    defaultInput: unknown;
+    stateLight: unknown;
+    stateInsight: unknown;
+  }
+    ? SliceFetchDescriptor<
+        SlceCls[typeof SLICE_META],
+        View["refName"],
+        View["capRefName"],
+        View["input"],
+        View["full"],
+        View["light"],
+        View["insight"],
+        View["purifiedInput"],
+        View["defaultInput"],
+        View["stateLight"],
+        View["stateInsight"],
+        SlceCls["srv"]["db"]["_Filter"],
+        SlceCls["srv"]["db"]["_Sort"]
+      >
+    : never;
 
 type _SliceMap<D extends SliceFetchDescriptor> = D["sliceMap"];
 type _RefName<D extends SliceFetchDescriptor> = D["refName"];

package/package.json

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

package/signal/slice.ts

@@ -4,7 +4,7 @@ import type { DocumentModel, QueryOf } from "akanjs/constant";
 import type { FilterInstance } from "akanjs/document";
 import { type Adaptor, type AdaptorCls, dangerouslyAdapt, type ServiceModel } from "akanjs/service";
 import type { Guard, GuardCls } from "./guard";
-import { buildSlice, type SliceBuilder, type SliceInfo } from "./sliceInfo";
+import { buildSlice, type SliceBuilder, type SliceInfo, type SlicePayloadOf } from "./sliceInfo";
 
 export interface Slice extends Adaptor {}
 
@@ -31,11 +31,12 @@ interface RootSliceOption {
 type ExtendSliceInfoObj<
   SrvModule extends ServiceModel,
   LibSlices extends SliceCls[],
-  _Input = NonNullable<SrvModule["cnst"]>["_Input"],
-  _Full = NonNullable<SrvModule["cnst"]>["_Full"],
-  _Light = NonNullable<SrvModule["cnst"]>["_Light"],
-  _Insight = NonNullable<SrvModule["cnst"]>["_Insight"],
-  _Filter extends FilterInstance = any,
+  _Payload extends SlicePayloadOf<SrvModule> = SlicePayloadOf<SrvModule>,
+  _Input = _Payload["input"],
+  _Full = _Payload["full"],
+  _Light = _Payload["light"],
+  _Insight = _Payload["insight"],
+  _Filter extends FilterInstance = _Payload["filter"],
   _Merged = MergeAllKeyOfObjects<LibSlices, typeof SLICE_META>,
 > = {
   [K in keyof _Merged]: _Merged[K] extends SliceInfo<
@@ -72,11 +73,12 @@ export function slice<
   SrvModule extends ServiceModel,
   BuildSlice extends SliceBuilder<SrvModule>,
   LibSlices extends SliceCls[],
-  _Input = NonNullable<SrvModule["cnst"]>["_Input"],
-  _Full = NonNullable<SrvModule["cnst"]>["_Full"],
-  _Light = NonNullable<SrvModule["cnst"]>["_Light"],
-  _Insight = NonNullable<SrvModule["cnst"]>["_Insight"],
-  _Filter extends FilterInstance = NonNullable<SrvModule["db"]>["_Filter"],
+  _Payload extends SlicePayloadOf<SrvModule> = SlicePayloadOf<SrvModule>,
+  _Input = _Payload["input"],
+  _Full = _Payload["full"],
+  _Light = _Payload["light"],
+  _Insight = _Payload["insight"],
+  _Filter extends FilterInstance = _Payload["filter"],
   _Query = QueryOf<DocumentModel<_Full>>,
 >(
   srv: SrvModule,
@@ -90,13 +92,13 @@ export function slice<
     LibSlices extends []
       ? {
           [""]: SliceInfo<
-            SrvModule["srv"]["refName"],
+            _Payload["refName"],
             _Input,
             _Full,
             _Light,
             _Insight,
             _Filter,
-            SrvModule["srvMap"],
+            _Payload["srvs"],
             ["query"],
             [_Query],
             [],

package/signal/sliceInfo.ts

@@ -2,6 +2,7 @@ import type { Cls, PromiseOrObject } from "akanjs/base";
 import type {
   BaseInsight,
   BaseObject,
+  ConstantFetchViewOf,
   ConstantFieldTypeInput,
   DocumentModel,
   FieldToValue,
@@ -225,30 +226,68 @@ export type SliceInfoInternalArgs<S> =
 export type SliceInfoServerArgs<S> =
   S extends SliceInfo<any, any, any, any, any, any, any, any, any, any, infer S2> ? S2 : never;
 
+export type SlicePayload<
+  RefName extends string = string,
+  Input = unknown,
+  Full = unknown,
+  Light = unknown,
+  Insight = unknown,
+  Filter extends FilterInstance = FilterInstance,
+  Srvs extends Record<string, unknown> = Record<string, unknown>,
+> = {
+  refName: RefName;
+  input: Input;
+  full: Full;
+  light: Light;
+  insight: Insight;
+  filter: Filter;
+  srvs: Srvs;
+};
+
+export type SlicePayloadOf<SrvModule extends ServiceModel> =
+  ConstantFetchViewOf<NonNullable<SrvModule["cnst"]>> extends infer CnstView extends {
+    refName: string;
+    input: unknown;
+    full: unknown;
+    light: unknown;
+    insight: unknown;
+  }
+    ? SlicePayload<
+        SrvModule["srv"]["refName"],
+        CnstView["input"],
+        CnstView["full"],
+        CnstView["light"],
+        CnstView["insight"],
+        NonNullable<SrvModule["db"]>["_Filter"],
+        SrvModule["srvMap"]
+      >
+    : never;
+
 export type SliceBuilder<
   SrvModule extends ServiceModel,
-  _Input = NonNullable<SrvModule["cnst"]>["_Input"],
-  _Full = NonNullable<SrvModule["cnst"]>["_Full"],
-  _Light = NonNullable<SrvModule["cnst"]>["_Light"],
-  _Insight = NonNullable<SrvModule["cnst"]>["_Insight"],
-  _Filter extends FilterInstance = NonNullable<SrvModule["db"]>["_Filter"],
+  _Payload extends SlicePayload = SlicePayloadOf<SrvModule>,
+  _Input = _Payload["input"],
+  _Full = _Payload["full"],
+  _Light = _Payload["light"],
+  _Insight = _Payload["insight"],
+  _Filter extends FilterInstance = _Payload["filter"],
   _Sort = ExtractSort<_Filter>,
 > = (
   init: (
     signalOption?: SignalOption,
   ) => SliceInfo<
-    SrvModule["srv"]["refName"],
+    _Payload["refName"],
     _Input,
     _Full,
     _Light,
     _Insight,
     _Filter,
-    SrvModule["srvMap"],
+    _Payload["srvs"],
     [],
     [],
     [],
     []
   >,
 ) => {
-  [key: string]: SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, SrvModule["srvMap"]>;
+  [key: string]: SliceInfo<_Payload["refName"], _Input, _Full, _Light, _Insight, _Filter, _Payload["srvs"]>;
 };

package/types/constant/constantRegistry.d.ts

@@ -54,7 +54,7 @@ export declare class ConstantRegistry {
     static serialize<Value>(modelRef: Cls | Cls[], value: Value, nullable?: boolean): Value;
     static deserialize<Value>(modelRef: Cls | Cls[], value: Value, nullable?: boolean): Value;
 }
-export interface ConstantModel<T extends string = string, Input = any, Obj = any, Full = any, Light = any, Insight = any, FullFieldObj extends FieldObject = FieldObject, _CapitalizedRefName extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _DefaultInsight = DefaultOf<Insight>, _PurifiedInput = PurifiedModel<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<_Doc>, _StateLight = GetStateObject<Light>, _StateInsight = GetStateObject<Insight>> {
+export interface ConstantCore<T extends string = string, Input = unknown, Obj = unknown, Full = unknown, Light = unknown, Insight = unknown, FullFieldObj extends FieldObject = FieldObject, _CapitalizedRefName extends string = Capitalize<T>> {
     refName: T;
     input: ConstantCls<Input>;
     object: ConstantCls<Obj>;
@@ -67,6 +67,8 @@ export interface ConstantModel<T extends string = string, Input = any, Obj = any
     _Full: Full;
     _Light: Light;
     _Insight: Insight;
+}
+export interface ConstantDerived<Input = unknown, Full = unknown, Light = unknown, Insight = unknown, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _DefaultInsight = DefaultOf<Insight>, _PurifiedInput = PurifiedModel<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<_Doc>, _StateLight = GetStateObject<Light>, _StateInsight = GetStateObject<Insight>> {
     _Default: _Default;
     _DefaultInput: _DefaultInput;
     _DefaultState: _DefaultState;
@@ -79,6 +81,42 @@ export interface ConstantModel<T extends string = string, Input = any, Obj = any
     _StateLight: _StateLight;
     _StateInsight: _StateInsight;
 }
+export interface ConstantModel<T extends string = string, Input = any, Obj = any, Full = any, Light = any, Insight = any, FullFieldObj extends FieldObject = FieldObject, _CapitalizedRefName extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _DefaultInsight = DefaultOf<Insight>, _PurifiedInput = PurifiedModel<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<_Doc>, _StateLight = GetStateObject<Light>, _StateInsight = GetStateObject<Insight>> extends ConstantCore<T, Input, Obj, Full, Light, Insight, FullFieldObj, _CapitalizedRefName>, ConstantDerived<Input, Full, Light, Insight, _Default, _DefaultInput, _DefaultState, _DefaultStateInput, _DefaultInsight, _PurifiedInput, _Doc, _DocInput, _QueryOfDoc, _StateLight, _StateInsight> {
+}
+export type ConstantReturnView<Full = unknown, Light = unknown, Insight = unknown> = {
+    full: Full;
+    light: Light;
+    insight: Insight;
+};
+export type ConstantReturnViewOf<Cnst> = Cnst extends {
+    _Full: infer Full;
+    _Light: infer Light;
+    _Insight: infer Insight;
+} ? ConstantReturnView<Full, Light, Insight> : never;
+export type ConstantFetchView<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> = {
+    refName: RefName;
+    capRefName: CapRefName;
+    input: Input;
+    full: Full;
+    light: Light;
+    insight: Insight;
+    purifiedInput: PurifiedInput;
+    defaultInput: DefaultInput;
+    stateLight: StateLight;
+    stateInsight: StateInsight;
+};
+export type ConstantFetchViewOf<Cnst> = Cnst extends {
+    refName: infer RefName extends string;
+    _CapitalizedRefName: infer CapRefName extends string;
+    _Input: infer Input;
+    _Full: infer Full;
+    _Light: infer Light;
+    _Insight: infer Insight;
+    _PurifiedInput: infer PurifiedInput;
+    _DefaultInput: infer DefaultInput;
+    _StateLight: infer StateLight;
+    _StateInsight: infer StateInsight;
+} ? ConstantFetchView<RefName, CapRefName, Input, Full, Light, Insight, PurifiedInput, DefaultInput, StateLight, StateInsight> : never;
 export interface ScalarConstantModel<T extends string = string, Model = any, _Default = DefaultOf<Model>, _Doc = DocumentModel<Model>, _PurifiedInput = PurifiedModel<Model>> {
     refName: T;
     model: ConstantCls<Model>;

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

@@ -1,12 +1,13 @@
 import type { ENDPOINT_META, PromiseOrObject } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
+import type { ConstantReturnViewOf } from "akanjs/constant";
 import type { EndpInfoArgs, EndpInfoClientReturns, EndpInfoNullable, EndpInfoReqType, EndpointCls, EndpointInfo, SliceCls } from "akanjs/signal";
 export type EndpointReturnContext<Full = unknown, Light = unknown, Insight = unknown> = {
     full: Full;
     light: Light;
     insight: Insight;
 };
-type EndpointReturnContextOf<SlceCls extends SliceCls | never> = [SlceCls] extends [never] ? never : SlceCls extends SliceCls ? EndpointReturnContext<SlceCls["srv"]["cnst"]["_Full"], SlceCls["srv"]["cnst"]["_Light"], SlceCls["srv"]["cnst"]["_Insight"]> : never;
+type EndpointReturnContextOf<SlceCls extends SliceCls | never> = [SlceCls] extends [never] ? never : SlceCls extends SliceCls ? ConstantReturnViewOf<SlceCls["srv"]["cnst"]> : never;
 type ExtendedEndpointReturn<ClientReturns, Context> = ClientReturns extends (infer R)[] ? ExtendedEndpointReturn<R, Context>[] : Context extends EndpointReturnContext<infer Full, infer Light, infer Insight> ? Full extends ClientReturns ? Full : Light extends ClientReturns ? Light : Insight extends ClientReturns ? Insight : ClientReturns : ClientReturns;
 type EndpointClientReturns<E, Context> = [Context] extends [never] ? EndpInfoClientReturns<E> : ExtendedEndpointReturn<EndpInfoClientReturns<E>, Context>;
 type EndpInfoReturns<E, Context> = EndpointClientReturns<E, Context> | (EndpInfoNullable<E> extends true ? null : never);

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

@@ -1,6 +1,6 @@
-import type { GetStateObject, SLICE_META } from "akanjs/base";
+import type { SLICE_META } from "akanjs/base";
 import type { FetchPolicy } from "akanjs/common";
-import type { DefaultOf, ProtoFile, PurifiedModel } from "akanjs/constant";
+import type { ConstantFetchViewOf, 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";
@@ -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 = unknown, DefaultInput = unknown, StateLight = unknown, StateInsight = unknown, Filter extends FilterInstance = FilterInstance, Sort = unknown> = {
+export type SliceFetchDescriptor<SliceMap extends SliceInfoMap = SliceInfoMap, RefName extends string = string, CapRefName extends string = string, 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,19 @@ export type SliceFetchDescriptor<SliceMap extends SliceInfoMap = SliceInfoMap, R
     filter: Filter;
     sort: Sort;
 };
-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 SliceConstantFetchViewOf<SlceCls extends SliceCls> = ConstantFetchViewOf<SlceCls["srv"]["cnst"]>;
+export type SliceFetchDescriptorOf<SlceCls extends SliceCls> = SliceConstantFetchViewOf<SlceCls> extends infer View extends {
+    refName: string;
+    capRefName: string;
+    input: unknown;
+    full: unknown;
+    light: unknown;
+    insight: unknown;
+    purifiedInput: unknown;
+    defaultInput: unknown;
+    stateLight: unknown;
+    stateInsight: unknown;
+} ? SliceFetchDescriptor<SlceCls[typeof SLICE_META], View["refName"], View["capRefName"], View["input"], View["full"], View["light"], View["insight"], View["purifiedInput"], View["defaultInput"], View["stateLight"], View["stateInsight"], SlceCls["srv"]["db"]["_Filter"], SlceCls["srv"]["db"]["_Sort"]> : never;
 type _SliceMap<D extends SliceFetchDescriptor> = D["sliceMap"];
 type _RefName<D extends SliceFetchDescriptor> = D["refName"];
 type _Cap<D extends SliceFetchDescriptor> = D["capRefName"];

package/types/signal/slice.d.ts

@@ -3,7 +3,7 @@ import type { DocumentModel, QueryOf } from "akanjs/constant";
 import type { FilterInstance } from "akanjs/document";
 import { type Adaptor, type AdaptorCls, type ServiceModel } from "akanjs/service";
 import type { Guard, GuardCls } from "./guard.d.ts";
-import { type SliceBuilder, type SliceInfo } from "./sliceInfo.d.ts";
+import { type SliceBuilder, type SliceInfo, type SlicePayloadOf } from "./sliceInfo.d.ts";
 export interface Slice extends Adaptor {
 }
 export type SliceCls<SrvModule extends ServiceModel = ServiceModel, SliceInfoObj extends {
@@ -25,12 +25,12 @@ interface RootSliceOption {
     };
     prefix?: string;
 }
-type ExtendSliceInfoObj<SrvModule extends ServiceModel, LibSlices extends SliceCls[], _Input = NonNullable<SrvModule["cnst"]>["_Input"], _Full = NonNullable<SrvModule["cnst"]>["_Full"], _Light = NonNullable<SrvModule["cnst"]>["_Light"], _Insight = NonNullable<SrvModule["cnst"]>["_Insight"], _Filter extends FilterInstance = any, _Merged = MergeAllKeyOfObjects<LibSlices, typeof SLICE_META>> = {
+type ExtendSliceInfoObj<SrvModule extends ServiceModel, LibSlices extends SliceCls[], _Payload extends SlicePayloadOf<SrvModule> = SlicePayloadOf<SrvModule>, _Input = _Payload["input"], _Full = _Payload["full"], _Light = _Payload["light"], _Insight = _Payload["insight"], _Filter extends FilterInstance = _Payload["filter"], _Merged = MergeAllKeyOfObjects<LibSlices, typeof SLICE_META>> = {
     [K in keyof _Merged]: _Merged[K] extends SliceInfo<any, any, any, any, any, any, infer Srvs, infer ArgNames, infer Args, infer InternalArgs, infer ServerArgs> ? SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, Srvs, ArgNames, Args, InternalArgs, ServerArgs> : never;
 };
 /** Builds database-backed slice APIs for list, insight, init, view, edit, create, update, and remove flows. */
-export declare function slice<SrvModule extends ServiceModel, BuildSlice extends SliceBuilder<SrvModule>, LibSlices extends SliceCls[], _Input = NonNullable<SrvModule["cnst"]>["_Input"], _Full = NonNullable<SrvModule["cnst"]>["_Full"], _Light = NonNullable<SrvModule["cnst"]>["_Light"], _Insight = NonNullable<SrvModule["cnst"]>["_Insight"], _Filter extends FilterInstance = NonNullable<SrvModule["db"]>["_Filter"], _Query = QueryOf<DocumentModel<_Full>>>(srv: SrvModule, option: RootSliceOption, sliceBuilder: BuildSlice, ...libSlices: LibSlices): SliceCls<SrvModule, Assign<ReturnType<BuildSlice>, LibSlices extends [] ? {
-    [""]: SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, SrvModule["srvMap"], [
+export declare function slice<SrvModule extends ServiceModel, BuildSlice extends SliceBuilder<SrvModule>, LibSlices extends SliceCls[], _Payload extends SlicePayloadOf<SrvModule> = SlicePayloadOf<SrvModule>, _Input = _Payload["input"], _Full = _Payload["full"], _Light = _Payload["light"], _Insight = _Payload["insight"], _Filter extends FilterInstance = _Payload["filter"], _Query = QueryOf<DocumentModel<_Full>>>(srv: SrvModule, option: RootSliceOption, sliceBuilder: BuildSlice, ...libSlices: LibSlices): SliceCls<SrvModule, Assign<ReturnType<BuildSlice>, LibSlices extends [] ? {
+    [""]: SliceInfo<_Payload["refName"], _Input, _Full, _Light, _Insight, _Filter, _Payload["srvs"], [
         "query"
     ], [
         _Query

package/types/signal/sliceInfo.d.ts

@@ -1,5 +1,5 @@
 import type { Cls, PromiseOrObject } from "akanjs/base";
-import type { BaseInsight, BaseObject, ConstantFieldTypeInput, DocumentModel, FieldToValue, ParamFieldType, PlainTypeToFieldType, PurifiedModel, QueryOf } from "akanjs/constant";
+import type { BaseInsight, BaseObject, ConstantFetchViewOf, ConstantFieldTypeInput, DocumentModel, FieldToValue, ParamFieldType, PlainTypeToFieldType, PurifiedModel, QueryOf } from "akanjs/constant";
 import type { ExtractSort, FilterCls, FilterInstance } from "akanjs/document";
 import type { ServiceModel } from "akanjs/service";
 import { type ArgInfo, type EndpointArgProps, type InternalArgInfo, type InternalArgProps } from "./endpointInfo.d.ts";
@@ -42,10 +42,26 @@ export type SliceInfoArgNames<S> = S extends SliceInfo<any, any, any, any, any,
 export type SliceInfoArgs<S> = S extends SliceInfo<any, any, any, any, any, any, any, any, infer A, any, any> ? A : never;
 export type SliceInfoInternalArgs<S> = S extends SliceInfo<any, any, any, any, any, any, any, any, any, infer I, any> ? I : never;
 export type SliceInfoServerArgs<S> = S extends SliceInfo<any, any, any, any, any, any, any, any, any, any, infer S2> ? S2 : never;
-export type SliceBuilder<SrvModule extends ServiceModel, _Input = NonNullable<SrvModule["cnst"]>["_Input"], _Full = NonNullable<SrvModule["cnst"]>["_Full"], _Light = NonNullable<SrvModule["cnst"]>["_Light"], _Insight = NonNullable<SrvModule["cnst"]>["_Insight"], _Filter extends FilterInstance = NonNullable<SrvModule["db"]>["_Filter"], _Sort = ExtractSort<_Filter>> = (init: (signalOption?: SignalOption) => SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, SrvModule["srvMap"], [
+export type SlicePayload<RefName extends string = string, Input = unknown, Full = unknown, Light = unknown, Insight = unknown, Filter extends FilterInstance = FilterInstance, Srvs extends Record<string, unknown> = Record<string, unknown>> = {
+    refName: RefName;
+    input: Input;
+    full: Full;
+    light: Light;
+    insight: Insight;
+    filter: Filter;
+    srvs: Srvs;
+};
+export type SlicePayloadOf<SrvModule extends ServiceModel> = ConstantFetchViewOf<NonNullable<SrvModule["cnst"]>> extends infer CnstView extends {
+    refName: string;
+    input: unknown;
+    full: unknown;
+    light: unknown;
+    insight: unknown;
+} ? SlicePayload<SrvModule["srv"]["refName"], CnstView["input"], CnstView["full"], CnstView["light"], CnstView["insight"], NonNullable<SrvModule["db"]>["_Filter"], SrvModule["srvMap"]> : never;
+export type SliceBuilder<SrvModule extends ServiceModel, _Payload extends SlicePayload = SlicePayloadOf<SrvModule>, _Input = _Payload["input"], _Full = _Payload["full"], _Light = _Payload["light"], _Insight = _Payload["insight"], _Filter extends FilterInstance = _Payload["filter"], _Sort = ExtractSort<_Filter>> = (init: (signalOption?: SignalOption) => SliceInfo<_Payload["refName"], _Input, _Full, _Light, _Insight, _Filter, _Payload["srvs"], [
 ], [
 ], [
 ], [
 ]>) => {
-    [key: string]: SliceInfo<SrvModule["srv"]["refName"], _Input, _Full, _Light, _Insight, _Filter, SrvModule["srvMap"]>;
+    [key: string]: SliceInfo<_Payload["refName"], _Input, _Full, _Light, _Insight, _Filter, _Payload["srvs"]>;
 };

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 (

package/webkit/lazy.tsx

@@ -8,6 +8,12 @@ const isServer = typeof window === "undefined";
 type LazyOption = { ssr?: boolean; loading?: () => ReactNode };
 type LazyProps = Record<string, unknown>;
 type LoadedOf<Loaded> = Loaded extends { default: infer T } ? T : Loaded;
+type LazyModule = { default: ComponentType<LazyProps> };
+
+const normalizeLazyModule = <Loaded,>(loaded: Loaded): LazyModule => {
+  if (loaded && typeof loaded === "object" && "default" in loaded) return loaded as LazyModule;
+  return { default: loaded as ComponentType<LazyProps> };
+};
 
 /** React lazy wrapper with Akan's `ssr: false` server stub and client mount gate. */
 export const lazy = <Loaded,>(loader: () => Promise<Loaded>, option?: LazyOption): LoadedOf<Loaded> => {
@@ -18,7 +24,7 @@ export const lazy = <Loaded,>(loader: () => Promise<Loaded>, option?: LazyOption
     Stub.displayName = "LazySsrFalseStub";
     return Stub as unknown as LoadedOf<Loaded>;
   }
-  const LazyInner = reactLazy(loader as () => Promise<{ default: ComponentType<LazyProps> }>);
+  const LazyInner = reactLazy(async () => normalizeLazyModule(await loader()));
 
   if (!ssrFalse) {
     const Wrapper = forwardRef<unknown, LazyProps>((props, ref) => <LazyInner {...props} ref={ref as never} />);