@akanjs/store 0.9.60-canary.0 → 0.9.60-canary.11

package/README.md

@@ -1,11 +1 @@
-# akan
-
-This library was generated with [Nx](https://nx.dev).
-
-## Building
-
-Run `nx build akan` to build the library.
-
-## Running unit tests
-
-Run `nx test akan` to execute the unit tests via [Jest](https://jestjs.io).
+이 패키지는 akanjs의 서브 라이브러리입니다. 더 자세한 내용은 [@akanjs/cli](https://www.npmjs.com/package/@akanjs/cli)와 [Akan.js Github](https://github.com/akan-team/akanjs)를 참고하세요.

package/cjs/src/storeDecorators.js

@@ -556,18 +556,23 @@ const makeActions = (refName, slices) => {
       const model = await fetch[names.model](id, { onError });
       this.set({ [names.model]: model, [names.modelViewAt]: /* @__PURE__ */ new Date(), [names.modelLoading]: false });
     },
-    [names.setModel]: function(fullOrLightModel) {
+    [names.setModel]: function(...fullOrLightModels) {
       const currentState = this.get();
+      if (fullOrLightModels.length === 0)
+        return;
+      const firstModel = fullOrLightModels[0];
       const model = currentState[names.model];
-      const isFull = fullOrLightModel instanceof modelRef;
+      const isFull = firstModel instanceof modelRef;
       if (isFull) {
-        const crystalizedModel = cnst.crystalize(fullOrLightModel);
+        const crystalizedModel = cnst.crystalize(firstModel);
         this.set({ [names.model]: crystalizedModel });
-      } else if (model?.id === fullOrLightModel.id) {
-        const crystalizedModel = cnst.crystalize({ ...model, ...fullOrLightModel });
+      } else if (model?.id === firstModel.id) {
+        const crystalizedModel = cnst.crystalize({ ...model, ...firstModel });
         this.set({ [names.model]: crystalizedModel });
       }
-      const lightModel = cnst.lightCrystalize(fullOrLightModel);
+      const lightModels = fullOrLightModels.map(
+        (fullOrLightModel) => cnst.lightCrystalize(fullOrLightModel)
+      );
       slices.forEach(({ sliceName }) => {
         const namesOfSlice = {
           modelList: sliceName.replace(names.model, names.modelList),
@@ -575,9 +580,14 @@ const makeActions = (refName, slices) => {
         };
         const modelList = currentState[namesOfSlice.modelList];
         const modelListLoading = currentState[namesOfSlice.modelListLoading];
-        if (modelListLoading || !modelList.has(lightModel.id))
+        if (modelListLoading)
           return;
-        this.set({ [namesOfSlice.modelList]: modelList.set(lightModel).save() });
+        lightModels.forEach((lightModel) => {
+          if (!modelList.has(lightModel.id))
+            return;
+          modelList.set(lightModel);
+        });
+        this.set({ [namesOfSlice.modelList]: modelList.save() });
       });
     },
     [names.resetModel]: function(model) {
@@ -623,11 +633,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 +644,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

@@ -543,18 +543,23 @@ const makeActions = (refName, slices) => {
       const model = await fetch[names.model](id, { onError });
       this.set({ [names.model]: model, [names.modelViewAt]: /* @__PURE__ */ new Date(), [names.modelLoading]: false });
     },
-    [names.setModel]: function(fullOrLightModel) {
+    [names.setModel]: function(...fullOrLightModels) {
       const currentState = this.get();
+      if (fullOrLightModels.length === 0)
+        return;
+      const firstModel = fullOrLightModels[0];
       const model = currentState[names.model];
-      const isFull = fullOrLightModel instanceof modelRef;
+      const isFull = firstModel instanceof modelRef;
       if (isFull) {
-        const crystalizedModel = cnst.crystalize(fullOrLightModel);
+        const crystalizedModel = cnst.crystalize(firstModel);
         this.set({ [names.model]: crystalizedModel });
-      } else if (model?.id === fullOrLightModel.id) {
-        const crystalizedModel = cnst.crystalize({ ...model, ...fullOrLightModel });
+      } else if (model?.id === firstModel.id) {
+        const crystalizedModel = cnst.crystalize({ ...model, ...firstModel });
         this.set({ [names.model]: crystalizedModel });
       }
-      const lightModel = cnst.lightCrystalize(fullOrLightModel);
+      const lightModels = fullOrLightModels.map(
+        (fullOrLightModel) => cnst.lightCrystalize(fullOrLightModel)
+      );
       slices.forEach(({ sliceName }) => {
         const namesOfSlice = {
           modelList: sliceName.replace(names.model, names.modelList),
@@ -562,9 +567,14 @@ const makeActions = (refName, slices) => {
         };
         const modelList = currentState[namesOfSlice.modelList];
         const modelListLoading = currentState[namesOfSlice.modelListLoading];
-        if (modelListLoading || !modelList.has(lightModel.id))
+        if (modelListLoading)
           return;
-        this.set({ [namesOfSlice.modelList]: modelList.set(lightModel).save() });
+        lightModels.forEach((lightModel) => {
+          if (!modelList.has(lightModel.id))
+            return;
+          modelList.set(lightModel);
+        });
+        this.set({ [namesOfSlice.modelList]: modelList.save() });
       });
     },
     [names.resetModel]: function(model) {
@@ -610,11 +620,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 +631,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.60-canary.0",
+  "version": "0.9.60-canary.11",
   "sourceType": "module",
   "publishConfig": {
     "access": "public"
@@ -15,7 +15,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "react": "19.2.0",
+    "react": "19.2.1",
     "zustand": "^5.0.2"
   },
   "exports": {

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>> = {
@@ -137,7 +136,7 @@ type BaseAction<T extends string, Input, Full extends {
         modal?: string | null;
     } & FetchPolicy) => Promise<void>;
 } & {
-    [K in `set${_CapitalizedT}`]: (model: Full | Light) => void;
+    [K in `set${_CapitalizedT}`]: (...models: (Full | Light)[]) => void;
 } & {
     [K in `reset${_CapitalizedT}`]: (model?: Full) => void;
 };
@@ -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;