akanjs 2.3.5-rc.4 → 2.3.5-rc.6

package/constant/constantRegistry.ts

@@ -416,7 +416,18 @@ export type ConstantFetchViewOf<Cnst> = Cnst extends {
   _StateLight: infer StateLight;
   _StateInsight: infer StateInsight;
 }
-  ? ConstantFetchView<RefName, CapRefName, Input, Full, Light, Insight, PurifiedInput, DefaultInput, StateLight, StateInsight>
+  ? ConstantFetchView<
+      RefName,
+      CapRefName,
+      Input,
+      Full,
+      Light,
+      Insight,
+      PurifiedInput,
+      DefaultInput,
+      StateLight,
+      StateInsight
+    >
   : never;
 
 export interface ScalarConstantModel<

package/fetch/fetchType/buildFetch.type.ts

@@ -18,6 +18,9 @@ export type FetchProxySignalInput<
 
 export type FetchSignalInput = FetchProxySignalInput | DatabaseSignal | ServiceSignal;
 
+export type IsAny<Type> = 0 extends 1 & Type ? true : false;
+export type SafeFetchPart<Type, Fallback = unknown> = IsAny<Type> extends true ? Fallback : Type;
+
 type MergeFetchParts<First, Second> = [First] extends [never]
   ? Second
   : [Second] extends [never]

package/fetch/fetchType/endpointFetch.type.ts

@@ -62,15 +62,15 @@ type PubsubSubscribeFn<E, Context> = (
   ]
 ) => () => void;
 
-type PrimaryFetchFn<E, Context, ReqType = EndpInfoReqType<E>> =
-  ReqType extends "query" | "mutation"
-    ? QueryOrMutationFetchFn<E, Context>
-    : ReqType 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 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]>;

package/package.json

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

package/signal/sliceInfo.ts

@@ -275,19 +275,7 @@ export type SliceBuilder<
 > = (
   init: (
     signalOption?: SignalOption,
-  ) => SliceInfo<
-    _Payload["refName"],
-    _Input,
-    _Full,
-    _Light,
-    _Insight,
-    _Filter,
-    _Payload["srvs"],
-    [],
-    [],
-    [],
-    []
-  >,
+  ) => SliceInfo<_Payload["refName"], _Input, _Full, _Light, _Insight, _Filter, _Payload["srvs"], [], [], [], []>,
 ) => {
   [key: string]: SliceInfo<_Payload["refName"], _Input, _Full, _Light, _Insight, _Filter, _Payload["srvs"]>;
 };

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

@@ -12,6 +12,8 @@ export type FetchProxySignalInput<FetchType = unknown, SliceMetaObj extends Reco
     _SliceMetaObj: SliceMetaObj;
 };
 export type FetchSignalInput = FetchProxySignalInput | DatabaseSignal | ServiceSignal;
+export type IsAny<Type> = 0 extends 1 & Type ? true : false;
+export type SafeFetchPart<Type, Fallback = unknown> = IsAny<Type> extends true ? Fallback : Type;
 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;

package/types/signal/sliceInfo.d.ts

@@ -58,10 +58,6 @@ export type SlicePayloadOf<SrvModule extends ServiceModel> = ConstantFetchViewOf
     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"], [
-], [
-], [
-], [
-]>) => {
+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<_Payload["refName"], _Input, _Full, _Light, _Insight, _Filter, _Payload["srvs"]>;
 };

package/types/ui/InfiniteScroll.d.ts

@@ -3,7 +3,9 @@ export interface InfiniteScrollProps {
     currentPage: number;
     itemsPerPage: number;
     onAddPage: (page: number) => Promise<void>;
-    onPageSelect: (page: number) => void;
+    onPageSelect: (page: number, option?: {
+        scrollToTop?: boolean;
+    }) => void;
     children: React.ReactNode;
     reverse?: boolean;
 }

package/types/ui/More.d.ts

@@ -3,7 +3,9 @@ interface MoreProps {
     itemsPerPage: number;
     currentPage: number;
     onAddPage: (page: number) => Promise<void>;
-    onPageSelect: (page: number) => void;
+    onPageSelect: (page: number, option?: {
+        scrollToTop?: boolean;
+    }) => void;
     children?: React.ReactNode;
     className?: string;
     reverse?: boolean;

package/ui/InfiniteScroll.tsx

@@ -7,7 +7,7 @@ export interface InfiniteScrollProps {
   currentPage: number;
   itemsPerPage: number;
   onAddPage: (page: number) => Promise<void>;
-  onPageSelect: (page: number) => void;
+  onPageSelect: (page: number, option?: { scrollToTop?: boolean }) => void;
   children: React.ReactNode;
   reverse?: boolean;
 }
@@ -51,7 +51,7 @@ export const InfiniteScroll = ({
     setIsFetching(true);
     try {
       await onAddPage(nextPage);
-      onPageSelect(nextPage);
+      onPageSelect(nextPage, { scrollToTop: false });
       page.current = nextPage;
 
       const restoreScroll = () => {

package/ui/Load/Units.tsx

@@ -156,11 +156,13 @@ function Render<RefName extends string, Light extends { id: string }>({
     onAddPage: async (page: number) => {
       await storeDo[namesOfSlice.addPageOfModel](page);
     },
-    onPageSelect: (page: number) => {
+    onPageSelect: (page: number, option?: { scrollToTop?: boolean }) => {
       void storeDo[namesOfSlice.setPageOfModel](page);
       
-      window.parent.postMessage({ type: "pathChange", page }, "*");
-      window.scrollTo({ top: 0, behavior: "instant" });
+      if (option?.scrollToTop !== false) {
+        window.parent.postMessage({ type: "pathChange", page }, "*");
+        window.scrollTo({ top: 0, behavior: "instant" });
+      }
     },
     reverse,
   };
@@ -279,7 +281,7 @@ interface MoreProps {
   itemsPerPage: number;
   currentPage: number;
   onAddPage: (page: number) => Promise<void>;
-  onPageSelect: (page: number) => void;
+  onPageSelect: (page: number, option?: { scrollToTop?: boolean }) => void;
   children?: React.ReactNode;
   className?: string;
   reverse?: boolean;

package/ui/More.tsx

@@ -1,5 +1,6 @@
 "use client";
 import { clsx, isMobileDevice } from "akanjs/client";
+import { useEffect, useState } from "react";
 import { InfiniteScroll } from "./InfiniteScroll";
 import { Pagination } from "./Pagination";
 
@@ -8,7 +9,7 @@ interface MoreProps {
   itemsPerPage: number;
   currentPage: number;
   onAddPage: (page: number) => Promise<void>;
-  onPageSelect: (page: number) => void;
+  onPageSelect: (page: number, option?: { scrollToTop?: boolean }) => void;
   children?: React.ReactNode;
   className?: string;
   reverse?: boolean;
@@ -24,11 +25,17 @@ export const More = ({
   className,
   reverse,
 }: MoreProps) => {
+  const [isMobile, setIsMobile] = useState(false);
+
+  useEffect(() => {
+    setIsMobile(isMobileDevice());
+  }, []);
+
   if (total <= itemsPerPage) {
     return <>{children}</>;
   }
 
-  if (isMobileDevice()) {
+  if (isMobile) {
     return (
       <InfiniteScroll
         total={total}