Merge pull request #16 from effector/fix-packaging-and-types

Fix packaging and types

Author: zerobias

.changeset/fluffy-hornets-poke.md

@@ -0,0 +1,6 @@
+---
+'@effector/model-react': patch
+'@effector/model': patch
+---
+
+gigi

apps/food-order/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "dependencies": {
-    "effector-action": "^1.1.1"
+    "effector-action": "^1.1.3"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^3.1.0",

apps/tree-todo-list/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "dependencies": {
-    "effector-action": "^1.1.1"
+    "effector-action": "^1.1.3"
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^3.1.0",

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@effector/model",
   "version": "0.0.7",
-  "type": "commonjs",
+  "type": "module",
   "peerDependencies": {
     "effector": "^23.3.0"
   }

packages/core/src/instanceApi.ts

@@ -30,7 +30,12 @@ export function createInstanceApi<Input, Enriched, Output, Api, Shape>(
       api[prop] = evt;
       $entities.on(evt, (state, payload) => {
         const [key, data] = Array.isArray(payload.key)
-          ? [payload.key, payload.data]
+          ? [
+              payload.key,
+              Array.isArray(payload.data)
+                ? payload.data
+                : Array.from({ length: payload.key.length }),
+            ]
           : [[payload.key], [payload.data]];
         const targets = [] as any[];
         const params = [] as any[];

packages/core/src/types.ts

@@ -190,18 +190,28 @@ export type ConvertToLensShape<Shape> = {
 
 type OneOrMany<T> = T | Array<T>;
 
+type ApiEvent<T> = void extends T
+  ?
+      | { key: string | number; data?: void }
+      | {
+          key: Array<string | number>;
+          data?: void[];
+        }
+  :
+      | { key: string | number; data: T }
+      | {
+          key: Array<string | number>;
+          data: T[];
+        };
+
 export type Keyval<Input, Enriched, Api, Shape> = {
   type: 'keyval';
   api: {
     [K in keyof Api]: Api[K] extends EventCallable<infer V>
-      ? EventCallable<
-          | { key: string | number; data: V }
-          | {
-              key: Array<string | number>;
-              data: V[];
-            }
-        >
-      : never;
+      ? EventCallable<ApiEvent<V>>
+      : Api[K] extends Effect<infer V, any, any>
+        ? EventCallable<ApiEvent<V>>
+        : never;
   };
   $items: Store<Enriched[]>;
   $keys: Store<Array<string | number>>;

packages/react/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@effector/model-react",
   "version": "0.0.7",
-  "type": "commonjs",
+  "type": "module",
   "peerDependencies": {
     "effector": "^23.3.0"
   },