refactor(enableoptimizedarray): remove enableOptimizedArray option

Author: unadlib

package.json

@@ -118,6 +118,7 @@
     "json2csv": "^5.0.7",
     "lodash": "^4.17.21",
     "lodash.clonedeep": "^4.5.0",
+    "mitata": "^1.0.34",
     "prettier": "^3.6.2",
     "quickchart-js": "^3.1.3",
     "redux": "^5.0.1",

src/draft.ts

@@ -69,7 +69,6 @@ const proxyHandler: ProxyHandler<ProxyDraft> = {
     const skipFinalization = target.options.skipFinalization;
 
     if (
-      skipFinalization &&
       source[key] &&
       target.finalities.draftsCache.has(source[key])
     ) {
@@ -101,7 +100,6 @@ const proxyHandler: ProxyHandler<ProxyDraft> = {
       const value = desc?.value;
       if (
         target.type === DraftType.Array &&
-        skipFinalization &&
         proxyArrayMethods.includes(key as string)
       ) {
         return function (this: any, ...args: any[]) {
@@ -141,11 +139,11 @@ const proxyHandler: ProxyHandler<ProxyDraft> = {
     // Ensure that the assigned values are not drafted
     if (
       !target.finalities.arrayHandling &&
-      (value === peek(target.original, key) || skipFinalization?.has(value))
+      (value === peek(target.original, key) || skipFinalization.has(value))
     ) {
-      const shouldSkip = skipFinalization?.has(value);
+      const shouldSkip = skipFinalization.has(value);
       if (shouldSkip) {
-        skipFinalization!.delete(value);
+        skipFinalization.delete(value);
       }
       ensureShallowCopy(target);
       target.copy![key] = createDraft({
@@ -167,7 +165,6 @@ const proxyHandler: ProxyHandler<ProxyDraft> = {
     }
     if (
       target.finalities.arrayHandling &&
-      skipFinalization &&
       !isDraft(value) &&
       isDraftable(value)
     ) {

src/interface.ts

@@ -139,7 +139,7 @@ export type DraftOptions = Options<any, any> & {
   /**
    * a collection for array item skip deep check
    */
-  skipFinalization?: WeakSet<any>;
+  skipFinalization: WeakSet<any>;
 };
 
 export interface ExternalOptions<O extends PatchesOptions, F extends boolean> {
@@ -160,10 +160,6 @@ export interface ExternalOptions<O extends PatchesOptions, F extends boolean> {
    * And it can also return a shallow copy function(AutoFreeze and Patches should both be disabled).
    */
   mark?: Mark<O, F>[] | Mark<O, F>;
-  /**
-   * Enable optimized array for improving performance.
-   */
-  enableOptimizedArray?: boolean;
 }
 
 // Exclude `symbol`

src/makeCreator.ts

@@ -143,13 +143,12 @@ export const makeCreator: MakeCreator = (arg) => {
     const enablePatches = options.enablePatches ?? false;
     const strict = options.strict ?? false;
     const enableAutoFreeze = options.enableAutoFreeze ?? false;
-    const enableOptimizedArray = options.enableOptimizedArray ?? false;
     const _options: DraftOptions = {
       enableAutoFreeze,
       mark,
       strict,
       enablePatches,
-      skipFinalization: enableOptimizedArray ? new WeakSet() : undefined,
+      skipFinalization: new WeakSet(),
     };
     if (
       !isDraftable(state, _options) &&

src/utils/copy.ts

@@ -93,10 +93,9 @@ export function ensureShallowCopy(target: ProxyDraft) {
   target.copy = shallowCopy(target.original, target.options)!;
 }
 
-function deepClone<T>(target: T): T;
-function deepClone(target: any) {
-  if (!isDraftable(target)) return getValue(target);
-  if (Array.isArray(target)) return target.map(deepClone);
+function deepClone<T>(target: T): T {
+  if (!isDraftable(target)) return getValue(target as object) as T;
+  if (Array.isArray(target)) return target.map(deepClone) as T;
   if (target instanceof Map) {
     const iterable = Array.from(target.entries()).map(([k, v]) => [
       k,
@@ -106,15 +105,15 @@ function deepClone(target: any) {
       const SubClass = Object.getPrototypeOf(target).constructor;
       return new SubClass(iterable);
     }
-    return new Map(iterable);
+    return new Map(iterable) as T;
   }
   if (target instanceof Set) {
     const iterable = Array.from(target).map(deepClone);
     if (!isBaseSetInstance(target)) {
       const SubClass = Object.getPrototypeOf(target).constructor;
       return new SubClass(iterable);
     }
-    return new Set(iterable);
+    return new Set(iterable) as T;
   }
   const copy = Object.create(Object.getPrototypeOf(target));
   for (const key in target) copy[key] = deepClone(target[key]);

src/utils/finalize.ts

@@ -22,7 +22,7 @@ export function handleValue(
     !isDraftable(target, options) ||
     handledSet.has(target) ||
     Object.isFrozen(target) ||
-    options.skipFinalization?.has(target)
+    options.skipFinalization.has(target)
     // It should skip the finalization process
     // This can avoid unnecessary deep traversal, as these objects are non-draft and do not contain draft in their deep object.
   )

test/performance/benchmark-reducer1.mjs

@@ -1,5 +1,5 @@
 import { produce as produce10, setAutoFreeze as setAutoFreeze10 } from 'immer';
-import { create as produceMutative } from '../../dist/mutative.esm.mjs';
+import { create as produceMutative } from '../..';
 import { bench, run, summary } from 'mitata';
 
 // repo: https://github.com/markerikson/immer-perf-tests
@@ -42,10 +42,10 @@ const concat = (index) => ({
 });
 
 const actions = {
-  // add,
+  add,
   remove,
-  // update,
-  // concat,
+  update,
+  concat,
 };
 
 const immerProducers = {

yarn.lock

@@ -6234,6 +6234,11 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
+mitata@^1.0.34:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/mitata/-/mitata-1.0.34.tgz#131f500d58c0bdc958095ab64f637d6fe1cf101a"
+  integrity sha512-Mc3zrtNBKIMeHSCQ0XqRLo1vbdIx1wvFV9c8NJAiyho6AjNfMY8bVhbS12bwciUdd1t4rj8099CH3N3NFahaUA==
+
 [email protected]:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"