diff --git a/perf-testing/immutability-benchmarks.mjs b/perf-testing/immutability-benchmarks.mjs index 425352021..294a4eab6 100644 --- a/perf-testing/immutability-benchmarks.mjs +++ b/perf-testing/immutability-benchmarks.mjs @@ -12,6 +12,11 @@ import { setAutoFreeze as setAutoFreeze10Perf, enableArrayMethods as enableArrayMethods10Perf } from "immer10Perf" +import { + produce as produce11, + setAutoFreeze as setAutoFreeze11, + enableArrayMethods as enableArrayMethods11 +} from "immer11" import {create as produceMutative} from "mutative" import { produce as produceMutativeCompat, @@ -198,6 +203,7 @@ const immerProducers = { // immer8: produce8, // immer9: produce9, immer10: produce10, + immer11: produce11, immer10Perf: produce10Perf // mutative: produceMutative, // mutativeCompat: produceMutativeCompat, @@ -215,6 +221,7 @@ const setAutoFreezes = { immer8: setAutoFreeze8, immer9: setAutoFreeze9, immer10: setAutoFreeze10, + immer11: setAutoFreeze11, immer10Perf: setAutoFreeze10Perf, mutative: noop, mutativeCompat: setAutoFreezeMutativeCompat, @@ -230,6 +237,7 @@ const setStrictIteration = { immer8: noop, immer9: noop, immer10: noop, + immer11: noop, immer10Perf: noop, // setUseStrictIteration10Perf, mutative: noop, mutativeCompat: noop, @@ -245,6 +253,7 @@ const setEnableArrayMethods = { immer8: noop, immer9: noop, immer10: noop, + immer11: enableArrayMethods11, immer10Perf: enableArrayMethods10Perf, mutative: noop, mutativeCompat: noop, @@ -869,6 +878,7 @@ function shortenVersionName(versionName) { const shortNames = { immer10Perf: "i10Perf", immer10: "i10", + immer11: "i11", immer5: "i5", immer6: "i6", immer7: "i7", diff --git a/perf-testing/package.json b/perf-testing/package.json index 1f0f2994b..3dc25c99b 100644 --- a/perf-testing/package.json +++ b/perf-testing/package.json @@ -16,6 +16,7 @@ "dependencies": { "cross-env": "^7.0.3", "immer10": "npm:immer@10", + "immer11": "npm:immer@11.2.10", "immer5": "npm:immer@5", "immer6": "npm:immer@6", "immer7": "npm:immer@7", diff --git a/perf-testing/yarn.lock b/perf-testing/yarn.lock index a930680c1..fe211746f 100644 --- a/perf-testing/yarn.lock +++ b/perf-testing/yarn.lock @@ -148,6 +148,11 @@ cross-spawn@^7.0.1: resolved "https://registry.yarnpkg.com/immer/-/immer-10.1.3.tgz#e38a0b97db59949d31d9b381b04c2e441b1c3747" integrity sha512-tmjF/k8QDKydUlm3mZU+tjM6zeq9/fFpPqH9SzWmBnVVKsPBg/V66qsMwb3/Bo90cgUN+ghdVBess+hPsxUyRw== +"immer11@npm:immer@11.2.10": + version "11.2.10" + resolved "https://registry.yarnpkg.com/immer/-/immer-11.2.10.tgz#fe5f3fa0c14882ed2dbca049866e43562247e252" + integrity sha512-pzANBj+0A9u+prdhBJ14DVi44vCvVUQzBa8DKt6I0AMCokPHtt722BK9IX5bFC70xUSU9TnzLRIJLTGqIzjEFw== + "immer5@npm:immer@5": version "5.3.6" resolved "https://registry.yarnpkg.com/immer/-/immer-5.3.6.tgz#51eab8cbbeb13075fe2244250f221598818cac04" diff --git a/src/core/finalize.ts b/src/core/finalize.ts index 9a76e2b81..e8f911b7b 100644 --- a/src/core/finalize.ts +++ b/src/core/finalize.ts @@ -26,7 +26,7 @@ import { export function processResult(result: any, scope: ImmerScope) { scope.unfinalizedDrafts_ = scope.drafts_.length - const baseDraft = scope.drafts_![0] + const baseDraft = scope.drafts_![0].draft_ const isReplaced = result !== undefined && result !== baseDraft if (isReplaced) { diff --git a/src/core/immerClass.ts b/src/core/immerClass.ts index 1083dcfbc..9e0914b80 100644 --- a/src/core/immerClass.ts +++ b/src/core/immerClass.ts @@ -248,7 +248,7 @@ export function createProxy( : createProxyProxy(value, parent) const scope = parent?.scope_ ?? getCurrentScope() - scope.drafts_.push(draft) + scope.drafts_.push(state) // Ensure the parent callbacks are passed down so we actually // track all callbacks added throughout the tree diff --git a/src/core/scope.ts b/src/core/scope.ts index 72987a3bf..9e018ec21 100644 --- a/src/core/scope.ts +++ b/src/core/scope.ts @@ -1,9 +1,7 @@ import { Patch, PatchListener, - Drafted, Immer, - DRAFT_STATE, ImmerState, ArchType, getPlugin, @@ -25,7 +23,7 @@ export interface ImmerScope { mapSetPlugin_?: MapSetPlugin arrayMethodsPlugin_?: ArrayMethodsPlugin canAutoFreeze_: boolean - drafts_: any[] + drafts_: ImmerState[] parent_?: ImmerScope patchListener_?: PatchListener immer_: Immer @@ -87,8 +85,7 @@ export function leaveScope(scope: ImmerScope) { export let enterScope = (immer: Immer) => (currentScope = createScope(currentScope, immer)) -function revokeDraft(draft: Drafted) { - const state: ImmerState = draft[DRAFT_STATE] +function revokeDraft(state: ImmerState) { if (state.type_ === ArchType.Object || state.type_ === ArchType.Array) state.revoke_() else state.revoked_ = true