Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions perf-testing/immutability-benchmarks.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -198,6 +203,7 @@ const immerProducers = {
// immer8: produce8,
// immer9: produce9,
immer10: produce10,
immer11: produce11,
immer10Perf: produce10Perf
// mutative: produceMutative,
// mutativeCompat: produceMutativeCompat,
Expand All @@ -215,6 +221,7 @@ const setAutoFreezes = {
immer8: setAutoFreeze8,
immer9: setAutoFreeze9,
immer10: setAutoFreeze10,
immer11: setAutoFreeze11,
immer10Perf: setAutoFreeze10Perf,
mutative: noop,
mutativeCompat: setAutoFreezeMutativeCompat,
Expand All @@ -230,6 +237,7 @@ const setStrictIteration = {
immer8: noop,
immer9: noop,
immer10: noop,
immer11: noop,
immer10Perf: noop, // setUseStrictIteration10Perf,
mutative: noop,
mutativeCompat: noop,
Expand All @@ -245,6 +253,7 @@ const setEnableArrayMethods = {
immer8: noop,
immer9: noop,
immer10: noop,
immer11: enableArrayMethods11,
immer10Perf: enableArrayMethods10Perf,
mutative: noop,
mutativeCompat: noop,
Expand Down Expand Up @@ -869,6 +878,7 @@ function shortenVersionName(versionName) {
const shortNames = {
immer10Perf: "i10Perf",
immer10: "i10",
immer11: "i11",
immer5: "i5",
immer6: "i6",
immer7: "i7",
Expand Down
1 change: 1 addition & 0 deletions perf-testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions perf-testing/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/core/finalize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/core/immerClass.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export function createProxy<T extends Objectish>(
: 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
Expand Down
7 changes: 2 additions & 5 deletions src/core/scope.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import {
Patch,
PatchListener,
Drafted,
Immer,
DRAFT_STATE,
ImmerState,
ArchType,
getPlugin,
Expand All @@ -25,7 +23,7 @@ export interface ImmerScope {
mapSetPlugin_?: MapSetPlugin
arrayMethodsPlugin_?: ArrayMethodsPlugin
canAutoFreeze_: boolean
drafts_: any[]
drafts_: ImmerState[]
parent_?: ImmerScope
patchListener_?: PatchListener
immer_: Immer
Expand Down Expand Up @@ -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
Expand Down