@akanjs/store 0.9.56 → 0.9.57

package/cjs/src/baseSt.js

@@ -49,7 +49,8 @@ class RootStore extends (0, import_storeDecorators.store)("root", {
   messages: [],
   tryJwt: null,
   trySignalType: "graphql",
-  tryRoles: [...import_signal.roleTypes],
+  tryRoles: [],
+  //[...roleTypes] as RoleType[],
   tryAccount: import_signal.defaultAccount,
   keyboardHeight: 0,
   pageState: import_client.defaultPageState,

package/cjs/src/storeDecorators.js

@@ -783,10 +783,7 @@ const makeActions = (refName, slices) => {
             sortOfModel,
             options
           ),
-          fetch[namesOfSlice.modelInsight](
-            ...queryArgs,
-            options
-          )
+          fetch[namesOfSlice.modelInsight](...queryArgs, options)
         ]);
         const modelList = new import_base.DataList(modelDataList);
         this.set({
@@ -992,8 +989,6 @@ const makePicker = (set, get) => (...fields) => {
       throw new Error(`Field ${field} is not ready`);
     if (typeof val === "string" && val.length === 0)
       throw new Error(`Field is empty string (${field})`);
-    else if (["self", "me"].includes(field) && !state[field].id?.length)
-      throw new Error("Self or Me Id is not defined");
     ret[field] = val;
   }
   return ret;

package/esm/src/baseSt.js

@@ -1,6 +1,6 @@
 import { defaultPageState } from "@akanjs/client";
 import { Responsive, responsiveWidths } from "@akanjs/constant";
-import { defaultAccount, roleTypes } from "@akanjs/signal";
+import { defaultAccount } from "@akanjs/signal";
 import { baseSt, store } from "./storeDecorators";
 import { storeInfo } from "./storeInfo";
 const defaultMessage = {
@@ -25,7 +25,8 @@ class RootStore extends store("root", {
   messages: [],
   tryJwt: null,
   trySignalType: "graphql",
-  tryRoles: [...roleTypes],
+  tryRoles: [],
+  //[...roleTypes] as RoleType[],
   tryAccount: defaultAccount,
   keyboardHeight: 0,
   pageState: defaultPageState,

package/esm/src/storeDecorators.js

@@ -770,10 +770,7 @@ const makeActions = (refName, slices) => {
             sortOfModel,
             options
           ),
-          fetch[namesOfSlice.modelInsight](
-            ...queryArgs,
-            options
-          )
+          fetch[namesOfSlice.modelInsight](...queryArgs, options)
         ]);
         const modelList = new DataList(modelDataList);
         this.set({
@@ -979,8 +976,6 @@ const makePicker = (set, get) => (...fields) => {
       throw new Error(`Field ${field} is not ready`);
     if (typeof val === "string" && val.length === 0)
       throw new Error(`Field is empty string (${field})`);
-    else if (["self", "me"].includes(field) && !state[field].id?.length)
-      throw new Error("Self or Me Id is not defined");
     ret[field] = val;
   }
   return ret;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/store",
-  "version": "0.9.56",
+  "version": "0.9.57",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/baseSt.d.ts

@@ -1,5 +1,5 @@
 import { Responsive } from "@akanjs/constant";
-import { RoleType, SignalType } from "@akanjs/signal";
+import { Account, SignalType } from "@akanjs/signal";
 import { StoreOf } from "./storeDecorators";
 declare const defaultMessage: {
     type: "info" | "success" | "error" | "warning" | "loading";
@@ -7,7 +7,7 @@ declare const defaultMessage: {
     duration: number;
     key: string;
 };
-declare const RootStore_base: import("@akanjs/base").Type<import("./storeDecorators").StoreInstance<{
+declare const RootStore_base: new (...args: any[]) => import("./storeDecorators").StoreInstance<{
     csrLoaded: boolean;
     path: string;
     pathname: string;
@@ -21,19 +21,15 @@ declare const RootStore_base: import("@akanjs/base").Type<import("./storeDecorat
     prefix: string | undefined;
     innerWidth: number;
     innerHeight: number;
-    responsive: Responsive;
+    responsive: Responsive["value"];
     uiOperation: "sleep" | "loading" | "idle";
     messages: (typeof defaultMessage)[];
     tryJwt: string | null;
     trySignalType: SignalType;
-    tryRoles: RoleType[];
-    tryAccount: {
-        __InternalArg__: "Account";
-        self?: import("@akanjs/signal").Self;
-        me?: import("@akanjs/signal").Me;
-        appName: string;
-        environment: import("@akanjs/base").Environment;
-    };
+    tryRoles: string[];
+    tryAccount: Account<{
+        [key: string]: string | undefined;
+    }>;
     keyboardHeight: number;
     pageState: import("@akanjs/client").PageState;
     devMode: boolean;
@@ -42,7 +38,7 @@ declare const RootStore_base: import("@akanjs/base").Type<import("./storeDecorat
     }) => Promise<void>;
     deviceToken: string;
     currentPath: string;
-}, {}, {}>>;
+}, {}, {}>;
 export declare class RootStore extends RootStore_base {
     setDevMode(value: boolean): void;
     setWindowSize(): void;

package/src/storeDecorators.d.ts

@@ -1,7 +1,7 @@
-import { DataList, type GetActionObject, type GetStateObject, type MergeAllKeyOfTypes, type MergeAllTypes, type MergedValues, type Prettify, Type } from "@akanjs/base";
+import { DataList, type GetStateObject, type MergeAllKeyOfTypes, type MergeAllTypes, type MergedValues, type Prettify, Type } from "@akanjs/base";
 import { type FetchPolicy } from "@akanjs/common";
 import { DefaultOf, DocumentModel, FieldState, ProtoFile, QueryOf } from "@akanjs/constant";
-import type { FilterType, SortOf } from "@akanjs/document";
+import type { ExtractQuery, ExtractSort, FilterInstance } from "@akanjs/document";
 import { DbGraphQL, type DynamicSliceArgMap, FetchInitForm, SerializedSignal, SliceMeta } from "@akanjs/signal";
 import { RefObject } from "react";
 import { Mutate, StoreApi } from "zustand";
@@ -34,7 +34,7 @@ type BaseState<T extends string, Full, _Default = DefaultOf<Full>> = {
 };
 type SliceState<T extends string, Full, Light extends {
     id: string;
-}, QueryArgs, Insight, Filter extends FilterType, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _Sort = SortOf<Filter>> = {
+}, QueryArgs, Insight, Filter extends FilterInstance, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _Sort = ExtractSort<Filter>> = {
     [K in `default${_CapitalizedT}`]: _Default;
 } & {
     [K in `${T}List`]: DataList<Light>;
@@ -61,7 +61,7 @@ type SliceState<T extends string, Full, Light extends {
 };
 type DefaultState<T extends string, Input, Full, Light extends {
     id: string;
-}, Insight, Filter extends FilterType, Signal, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Query = GetActionObject<Filter>, _Sort = SortOf<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>, _DefaultSliceState = SliceState<T, Full, Light, [
+}, Insight, Filter extends FilterInstance, Signal, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Query = ExtractQuery<Filter>, _Sort = ExtractSort<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>, _DefaultSliceState = SliceState<T, Full, Light, [
     query: _QueryOfDoc
 ], Insight, Filter, _CapitalizedT, _Default, _Sort>, _DynamicSliceStateMap = {
     [Suffix in keyof _DynamicSliceArgMap as Suffix extends string ? Suffix : never]: Suffix extends string ? SliceState<T, Full, Light, _DynamicSliceArgMap[Suffix], Insight, Filter, _CapitalizedT, _Default, _Sort> : never;
@@ -142,7 +142,7 @@ type BaseAction<T extends string, Input, Full extends {
 };
 type SliceAction<T extends string, Input, Full extends {
     id: string;
-}, Light, QueryArgs extends any[], Filter extends FilterType, _CapitalizedT extends string = Capitalize<T>, _Sort = SortOf<Filter>, _FetchInitFormWithFetchPolicy = FetchInitForm<Input, Full, Filter> & FetchPolicy> = {
+}, Light, QueryArgs extends any[], Filter extends FilterInstance, _CapitalizedT extends string = Capitalize<T>, _Sort = ExtractSort<Filter>, _FetchInitFormWithFetchPolicy = FetchInitForm<Input, Full, Filter> & FetchPolicy> = {
     [K in `init${_CapitalizedT}`]: (...args: [...args: QueryArgs, initForm?: _FetchInitFormWithFetchPolicy]) => Promise<void>;
 } & {
     [K in `refresh${_CapitalizedT}`]: (...args: [...args: QueryArgs, initForm?: _FetchInitFormWithFetchPolicy]) => Promise<void>;
@@ -164,7 +164,7 @@ type SliceAction<T extends string, Input, Full extends {
 };
 type DefaultActions<T extends string, Input, Full extends {
     id: string;
-}, Light, Filter extends FilterType, Fetch, Signal, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<_Default>, _DefaultStateInput = GetStateObject<_DefaultInput>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Sort = SortOf<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>, _CreateOption = CreateOption<Full>, _FetchInitFormWithFetchPolicy = FetchInitForm<Input, Full, Filter> & FetchPolicy, _DefaultSliceAction = SliceAction<T, Input, Full, Light, [
+}, Light, Filter extends FilterInstance, Fetch, Signal, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<_Default>, _DefaultStateInput = GetStateObject<_DefaultInput>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Sort = ExtractSort<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>, _CreateOption = CreateOption<Full>, _FetchInitFormWithFetchPolicy = FetchInitForm<Input, Full, Filter> & FetchPolicy, _DefaultSliceAction = SliceAction<T, Input, Full, Light, [
     query: _QueryOfDoc
 ], Filter, _CapitalizedT, _Sort, _FetchInitFormWithFetchPolicy>, _DynamicSliceActionMap = {
     [Suffix in keyof _DynamicSliceArgMap as Suffix extends string ? Suffix : never]: Suffix extends string ? _DynamicSliceArgMap[Suffix] extends any[] ? SliceAction<T, Input, Full, Light, _DynamicSliceArgMap[Suffix], Filter, _CapitalizedT, _Sort, _FetchInitFormWithFetchPolicy> : never : never;
@@ -218,9 +218,9 @@ export type DatabaseStore<T extends string, Input, Full extends {
     id: string;
 }, Light extends {
     id: string;
-}, Insight, Filter extends FilterType, Fetch, Signal, State extends {
+}, Insight, Filter extends FilterInstance, Fetch, Signal, State extends {
     [key: string]: any;
-}, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Query = GetActionObject<Filter>, _Sort = SortOf<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>, _CreateOption = CreateOption<Full>, _FetchInitFormWithFetchPolicy = FetchInitForm<Input, Full, Filter> & FetchPolicy, _DefaultSliceState = SliceState<T, Full, Light, [
+}, _CapitalizedT extends string = Capitalize<T>, _Default = DefaultOf<Full>, _DefaultInput = DefaultOf<Input>, _DefaultState = GetStateObject<Full>, _DefaultStateInput = GetStateObject<Input>, _Doc = DocumentModel<Full>, _DocInput = DocumentModel<Input>, _QueryOfDoc = QueryOf<DocumentModel<Full>>, _Query = ExtractQuery<Filter>, _Sort = ExtractSort<Filter>, _DynamicSliceArgMap = DynamicSliceArgMap<T, Input, Full, Filter, Signal, _CapitalizedT, _DefaultInput, _Sort>, _CreateOption = CreateOption<Full>, _FetchInitFormWithFetchPolicy = FetchInitForm<Input, Full, Filter> & FetchPolicy, _DefaultSliceState = SliceState<T, Full, Light, [
     query: _QueryOfDoc
 ], Insight, Filter, _CapitalizedT, _Default, _Sort>, _DynamicSliceStateMap = {
     [Suffix in keyof _DynamicSliceArgMap as Suffix extends string ? Suffix : never]: Suffix extends string ? SliceState<T, Full, Light, _DynamicSliceArgMap[Suffix], Insight, Filter, _CapitalizedT, _Default, _Sort> : never;

package/src/storeInfo.d.ts

@@ -1,8 +1,8 @@
 import type { Type } from "@akanjs/base";
 import type { SerializedSignal } from "@akanjs/signal";
 export declare const storeInfo: {
-    store: Map<string, Type>;
-    storeRefNameMap: Map<Type, string>;
+    store: Map<string, new (...args: any[]) => any>;
+    storeRefNameMap: Map<new (...args: any[]) => any, string>;
     setRefNameTemp(refName: string, store: Type): void;
     getRefNameTemp(store: Type): string;
     setState(storeRef: Type, applyState: {