diff --git a/package.json b/package.json index 75fc010..147c770 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "@types/react": "^18.0.38", "@types/react-dom": "^18.0.11", "@vitejs/plugin-react": "^4.0.0", - "effector": "22.8.2", - "effector-react": "^22.5.1", + "effector": "23.0.0", + "effector-react": "^23.0.1", "fs-extra": "^11.1.1", "mvp.css": "^1.12.0", "react": "^18.2.0", @@ -48,6 +48,6 @@ "zx": "^7.2.1" }, "peerDependencies": { - "effector": "^22.8.1" + "effector": "^22.8.1 || ^23.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ce7b3f5..dd3a084 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,11 +14,11 @@ devDependencies: specifier: ^4.0.0 version: 4.0.0(vite@4.3.1) effector: - specifier: 22.8.2 - version: 22.8.2 + specifier: 23.0.0 + version: 23.0.0 effector-react: - specifier: ^22.5.1 - version: 22.5.1(effector@22.8.2)(react@18.2.0) + specifier: ^23.0.1 + version: 23.0.1(effector@23.0.0)(react@18.2.0) fs-extra: specifier: ^11.1.1 version: 11.1.1 @@ -810,20 +810,20 @@ packages: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} dev: true - /effector-react@22.5.1(effector@22.8.2)(react@18.2.0): - resolution: {integrity: sha512-Sy5b/sUEZoCuyoCr+SiHcgd0L+PQqnIGx+SuPCZ7MhECYxezkkeecsk0EVj9sykLL2qlEeg+rdiWvIATJgOTeA==} + /effector-react@23.0.1(effector@23.0.0)(react@18.2.0): + resolution: {integrity: sha512-rWIv7La4RaCuIfzqTljQewEd7KBzhau6xpTr7w5ZB2FEEnCh5+YtelT73ifeUC+kE5iPr38MwpANyjDGQ1bl0w==} engines: {node: '>=11.0.0'} peerDependencies: - effector: ^22.0.2 + effector: ^23.0.0 react: '>=16.8.0 <19.0.0' dependencies: - effector: 22.8.2 + effector: 23.0.0 react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) dev: true - /effector@22.8.2: - resolution: {integrity: sha512-Utl/gT/wDtcnVKDOToS4xuGDt1INzhsGF5TGnDGdbSS6BbV0C2JPAjo8tBi+0ZK1M5Gj8sEW/WFuv+RoH2V+oQ==} + /effector@23.0.0: + resolution: {integrity: sha512-8lT1iX8ivWRUnJL4XG2OhCZPRZku1XVc7AwbJCChxZhhB6ii/hZgs0GOTeE3BJfvc1BKf97q2hU3Yzp323sCiA==} engines: {node: '>=11.0.0'} dev: true diff --git a/src/index.test.ts b/src/index.test.ts index 9ef7b01..4a18a88 100644 --- a/src/index.test.ts +++ b/src/index.test.ts @@ -89,7 +89,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "83", + "id": "82", "loc": { "column": 19, "file": "/demo-app/counter/model.tsx", @@ -112,7 +112,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 1, - "$counter (83)": "pekkek", + "$counter (82)": "pekkek", }, ], [ @@ -154,7 +154,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 1, - "$counter (83)": "pekkek", + "$counter (82)": "pekkek", "$ref": { "count": 1, }, @@ -200,7 +200,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 1, - "$counter (83)": "pekkek", + "$counter (82)": "pekkek", "$ref": { "count": 1, }, @@ -242,7 +242,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 1, - "$counter (83)": "pekkek", + "$counter (82)": "pekkek", "$ref": { "count": 1, }, @@ -289,7 +289,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 1, - "$counter (83)": "pekkek", + "$counter (82)": "pekkek", "$ref": { "count": 1, }, @@ -315,7 +315,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 1, - "$counter (83)": "pekkek", + "$counter (82)": "pekkek", "$ref": { "count": 1, }, @@ -352,7 +352,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "pekkek", + "$counter (82)": "pekkek", "$ref": { "count": 1, }, @@ -366,7 +366,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "83", + "id": "82", "loc": { "column": 19, "file": "/demo-app/counter/model.tsx", @@ -389,7 +389,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 1, }, @@ -440,7 +440,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -454,16 +454,35 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "63", + "id": "60", + "loc": { + "column": 0, + "file": "/demo-app/counter/model.tsx", + "line": 33, + }, "trace": [ + { + "name": "$ref → *", + "type": "store", + "value": 2, + }, + { + "name": undefined, + "type": "map", + "value": 2, + }, + { + "name": "$ref", + "type": "store", + "value": { + "count": 2, + }, + }, { "name": undefined, "type": "combine", "value": { "count": 2, - "ref": { - "count": 2, - }, }, }, { @@ -482,37 +501,38 @@ describe("Redux DevTools Effector adapter", () => { "value": undefined, }, ], - "type": "🥗 [combine] combine($counter, $ref)", - "value": { - "count": 2, - "ref": { - "count": 2, - }, - }, + "type": "⏰ [sample] /demo-app/counter/model.tsx:33:0", + "value": 2, }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, "combine($counter, $ref)": { - "count": 2, + "count": 1, "ref": { - "count": 2, + "count": 1, }, }, }, ], [ { - "id": "60", + "id": "8", "loc": { - "column": 0, + "column": 25, "file": "/demo-app/counter/model.tsx", - "line": 33, + "line": 15, }, + "params": 2, "trace": [ + { + "name": undefined, + "type": "sample", + "value": 2, + }, { "name": "$ref → *", "type": "store", @@ -553,32 +573,61 @@ describe("Redux DevTools Effector adapter", () => { "value": undefined, }, ], - "type": "⏰ [sample] /demo-app/counter/model.tsx:33:0", - "value": 2, + "type": "☄️ [effect] someSideEffectFx", }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, "combine($counter, $ref)": { - "count": 2, + "count": 1, "ref": { - "count": 2, + "count": 1, }, }, }, ], [ { - "id": "74", + "id": "31", "loc": { - "column": 0, + "column": 26, "file": "/demo-app/counter/model.tsx", - "line": 71, + "line": 27, }, + "params": 2, "trace": [ + { + "name": undefined, + "type": "sample", + "value": 2, + }, + { + "name": "$ref → *", + "type": "store", + "value": 2, + }, + { + "name": undefined, + "type": "map", + "value": 2, + }, + { + "name": "$ref", + "type": "store", + "value": { + "count": 2, + }, + }, + { + "name": undefined, + "type": "combine", + "value": { + "count": 2, + }, + }, { "name": "$counter", "type": "store", @@ -595,37 +644,35 @@ describe("Redux DevTools Effector adapter", () => { "value": undefined, }, ], - "type": "⏰ [sample] /demo-app/counter/model.tsx:71:0", - "value": 2, + "type": "☄️ [effect] someOtherEffectFx", }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, "combine($counter, $ref)": { - "count": 2, + "count": 1, "ref": { - "count": 2, + "count": 1, }, }, }, ], [ { - "id": "73", - "loc": { - "column": 26, - "file": "/demo-app/counter/model.tsx", - "line": 70, - }, - "params": 2, + "id": "63", "trace": [ { "name": undefined, - "type": "sample", - "value": 2, + "type": "combine", + "value": { + "count": 2, + "ref": { + "count": 2, + }, + }, }, { "name": "$counter", @@ -643,11 +690,17 @@ describe("Redux DevTools Effector adapter", () => { "value": undefined, }, ], - "type": "⭐️ [event] somethingHappened", + "type": "🥗 [combine] combine($counter, $ref)", + "value": { + "count": 2, + "ref": { + "count": 2, + }, + }, }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -657,47 +710,19 @@ describe("Redux DevTools Effector adapter", () => { "count": 2, }, }, + "someOtherEffectFx.inFlight": 1, + "someSideEffectFx.inFlight": 1, }, ], [ { - "id": "8", + "id": "74", "loc": { - "column": 25, + "column": 0, "file": "/demo-app/counter/model.tsx", - "line": 15, + "line": 71, }, - "params": 2, "trace": [ - { - "name": undefined, - "type": "sample", - "value": 2, - }, - { - "name": "$ref → *", - "type": "store", - "value": 2, - }, - { - "name": undefined, - "type": "map", - "value": 2, - }, - { - "name": "$ref", - "type": "store", - "value": { - "count": 2, - }, - }, - { - "name": undefined, - "type": "combine", - "value": { - "count": 2, - }, - }, { "name": "$counter", "type": "store", @@ -714,11 +739,12 @@ describe("Redux DevTools Effector adapter", () => { "value": undefined, }, ], - "type": "☄️ [effect] someSideEffectFx", + "type": "⏰ [sample] /demo-app/counter/model.tsx:71:0", + "value": 2, }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -728,15 +754,17 @@ describe("Redux DevTools Effector adapter", () => { "count": 2, }, }, + "someOtherEffectFx.inFlight": 1, + "someSideEffectFx.inFlight": 1, }, ], [ { - "id": "31", + "id": "73", "loc": { "column": 26, "file": "/demo-app/counter/model.tsx", - "line": 27, + "line": 70, }, "params": 2, "trace": [ @@ -745,30 +773,6 @@ describe("Redux DevTools Effector adapter", () => { "type": "sample", "value": 2, }, - { - "name": "$ref → *", - "type": "store", - "value": 2, - }, - { - "name": undefined, - "type": "map", - "value": 2, - }, - { - "name": "$ref", - "type": "store", - "value": { - "count": 2, - }, - }, - { - "name": undefined, - "type": "combine", - "value": { - "count": 2, - }, - }, { "name": "$counter", "type": "store", @@ -785,11 +789,11 @@ describe("Redux DevTools Effector adapter", () => { "value": undefined, }, ], - "type": "☄️ [effect] someOtherEffectFx", + "type": "⭐️ [event] somethingHappened", }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -799,6 +803,7 @@ describe("Redux DevTools Effector adapter", () => { "count": 2, }, }, + "someOtherEffectFx.inFlight": 1, "someSideEffectFx.inFlight": 1, }, ], @@ -812,7 +817,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -882,7 +887,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -967,7 +972,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1057,92 +1062,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", - "$ref": { - "count": 2, - }, - "combine($counter, $ref)": { - "count": 2, - "ref": { - "count": 2, - }, - }, - "someOtherEffectFx.inFlight": 0, - "someSideEffectFx.inFlight": 1, - }, - ], - [ - { - "id": "80", - "trace": [ - { - "name": "a", - "type": "event", - "value": "2_kek", - }, - { - "name": undefined, - "type": "split", - "value": "2_kek", - }, - { - "name": "sampledEvent", - "type": "event", - "value": "2_kek", - }, - { - "name": "sampledEvent", - "type": "sample", - "value": "2_kek", - }, - { - "name": "merge(done, done)", - "type": "event", - "value": { - "params": 2, - "result": 2, - }, - }, - { - "name": undefined, - "type": "merge", - "value": { - "params": 2, - "result": 2, - }, - }, - { - "name": "done", - "type": "event", - "value": { - "params": 2, - "result": 2, - }, - }, - { - "name": undefined, - "type": "filterMap", - "value": { - "params": 2, - "result": 2, - }, - }, - { - "name": "finally", - "type": "event", - "value": { - "params": 2, - "result": 2, - "status": "done", - }, - }, - ], - "type": "⏰ [guard] unknown_80", - "value": "2_kek", - }, - { - "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1237,7 +1157,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1322,7 +1242,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1338,7 +1258,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "81", + "id": "80", "loc": { "column": 0, "file": "/demo-app/counter/model.tsx", @@ -1412,7 +1332,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1436,7 +1356,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1506,7 +1426,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1591,7 +1511,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1681,92 +1601,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", - "$ref": { - "count": 2, - }, - "combine($counter, $ref)": { - "count": 2, - "ref": { - "count": 2, - }, - }, - "someOtherEffectFx.inFlight": 0, - "someSideEffectFx.inFlight": 0, - }, - ], - [ - { - "id": "80", - "trace": [ - { - "name": "a", - "type": "event", - "value": "2_kek", - }, - { - "name": undefined, - "type": "split", - "value": "2_kek", - }, - { - "name": "sampledEvent", - "type": "event", - "value": "2_kek", - }, - { - "name": "sampledEvent", - "type": "sample", - "value": "2_kek", - }, - { - "name": "merge(done, done)", - "type": "event", - "value": { - "params": 2, - "result": 2, - }, - }, - { - "name": undefined, - "type": "merge", - "value": { - "params": 2, - "result": 2, - }, - }, - { - "name": "done", - "type": "event", - "value": { - "params": 2, - "result": 2, - }, - }, - { - "name": undefined, - "type": "filterMap", - "value": { - "params": 2, - "result": 2, - }, - }, - { - "name": "finally", - "type": "event", - "value": { - "params": 2, - "result": 2, - "status": "done", - }, - }, - ], - "type": "⏰ [guard] unknown_80", - "value": "2_kek", - }, - { - "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1861,7 +1696,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1946,7 +1781,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -1962,7 +1797,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "81", + "id": "80", "loc": { "column": 0, "file": "/demo-app/counter/model.tsx", @@ -2036,7 +1871,7 @@ describe("Redux DevTools Effector adapter", () => { }, { "$counter": 2, - "$counter (83)": "kekpek", + "$counter (82)": "kekpek", "$ref": { "count": 2, }, @@ -2081,7 +1916,7 @@ describe("Redux DevTools Effector adapter", () => { [ [ { - "id": "137", + "id": "136", "loc": { "column": 33, "file": "/src/index.test.ts", @@ -2094,7 +1929,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "114", + "id": "113", "loc": { "column": 23, "file": "/src/index.test.ts", @@ -2107,7 +1942,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "91", + "id": "90", "loc": { "column": 19, "file": "/src/index.test.ts", @@ -2120,7 +1955,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "92", + "id": "91", "params": undefined, "result": undefined, "type": "✅ [effect] rootFx.done", @@ -2129,7 +1964,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "115", + "id": "114", "params": undefined, "result": undefined, "type": "✅ [effect] attachedFx.done", @@ -2138,7 +1973,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "138", + "id": "137", "params": undefined, "result": undefined, "type": "✅ [effect] anotherLevelAttachFx.done", @@ -2171,11 +2006,11 @@ describe("Redux DevTools Effector adapter", () => { [ [ { - "id": "168", + "id": "167", "loc": { "column": 23, "file": "/src/index.test.ts", - "line": 2084, + "line": 2153, }, "params": undefined, "type": "☄️ [effect] attachFnFx", @@ -2184,7 +2019,7 @@ describe("Redux DevTools Effector adapter", () => { ], [ { - "id": "169", + "id": "168", "params": undefined, "result": undefined, "type": "✅ [effect] attachFnFx.done",