@akanjs/store 0.9.59 → 0.9.60-canary.1

package/cjs/src/storeDecorators.js

@@ -623,11 +623,10 @@ const makeActions = (refName, slices) => {
         const queryArgs = new Array(initArgLength).fill(null).map((_, i) => args[i]);
         const defaultModel = (0, import_signal.immerify)(modelRef, { ...cnst.getDefault(), ...initForm.default ?? {} });
         this.set({ [names.defaultModel]: defaultModel });
-        await this[namesOfSlice.refreshModel](
-          ...initArgLength === argLength ? [...queryArgs, initForm] : queryArgs
-        );
+        await this[namesOfSlice.refreshModel]({ ...initForm, queryArgs });
       },
-      [namesOfSlice.refreshModel]: async function(...args) {
+      [namesOfSlice.refreshModel]: async function(initForm = {}) {
+        const args = initForm.queryArgs ?? [];
         const refreshArgLength = Math.min(args.length, argLength);
         const currentState = this.get();
         const existingQueryArgs = currentState[namesOfSlice.queryArgsOfModel];
@@ -635,7 +634,6 @@ const makeActions = (refName, slices) => {
           ...new Array(refreshArgLength).fill(null).map((_, i) => args[i]),
           ...existingQueryArgs.slice(refreshArgLength, argLength)
         ];
-        const initForm = args[argLength] ?? {};
         const {
           page = currentState[namesOfSlice.pageOfModel],
           limit = currentState[namesOfSlice.limitOfModel],

package/esm/src/storeDecorators.js

@@ -610,11 +610,10 @@ const makeActions = (refName, slices) => {
         const queryArgs = new Array(initArgLength).fill(null).map((_, i) => args[i]);
         const defaultModel = immerify(modelRef, { ...cnst.getDefault(), ...initForm.default ?? {} });
         this.set({ [names.defaultModel]: defaultModel });
-        await this[namesOfSlice.refreshModel](
-          ...initArgLength === argLength ? [...queryArgs, initForm] : queryArgs
-        );
+        await this[namesOfSlice.refreshModel]({ ...initForm, queryArgs });
       },
-      [namesOfSlice.refreshModel]: async function(...args) {
+      [namesOfSlice.refreshModel]: async function(initForm = {}) {
+        const args = initForm.queryArgs ?? [];
         const refreshArgLength = Math.min(args.length, argLength);
         const currentState = this.get();
         const existingQueryArgs = currentState[namesOfSlice.queryArgsOfModel];
@@ -622,7 +621,6 @@ const makeActions = (refName, slices) => {
           ...new Array(refreshArgLength).fill(null).map((_, i) => args[i]),
           ...existingQueryArgs.slice(refreshArgLength, argLength)
         ];
-        const initForm = args[argLength] ?? {};
         const {
           page = currentState[namesOfSlice.pageOfModel],
           limit = currentState[namesOfSlice.limitOfModel],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/store",
-  "version": "0.9.59",
+  "version": "0.9.60-canary.1",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"

package/src/storeDecorators.d.ts

@@ -105,7 +105,6 @@ export interface NewOption {
 type PartialOrNull<O> = {
     [K in keyof O]?: O[K] | null;
 };
-type OptionalArgs<T extends any[]> = T extends [infer Head, ...infer Tail] ? [arg?: Head | null, ...OptionalArgs<Tail>] : [];
 type BaseAction<T extends string, Input, Full extends {
     id: string;
 }, Light, _CapitalizedT extends string = Capitalize<T>, _CreateOption = CreateOption<Full>> = {
@@ -146,7 +145,9 @@ type SliceAction<T extends string, Input, Full extends {
 }, 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: OptionalArgs<QueryArgs>, initForm?: _FetchInitFormWithFetchPolicy]) => Promise<void>;
+    [K in `refresh${_CapitalizedT}`]: (initForm?: _FetchInitFormWithFetchPolicy & {
+        queryArgs?: QueryArgs;
+    }) => Promise<void>;
 } & {
     [K in `select${_CapitalizedT}`]: (model: Light | Light[], options?: {
         refresh?: boolean;