andrejcesen · andrejcesen · Oct 27, 2024 · Nov 3, 2024 · Nov 4, 2024 · Nov 4, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,21 @@ Dates are formatted as YYYY-MM-DD.
 
 ## Unreleased
 
+- Fix #1915 "Converting a Seq to a list causes RangeError (max call size exceeded)" by @alexvictoor in [#2038](https://github.com/immutable-js/immutable-js/pull/2038)
+- fix: proper Typescript typings for Seq.concat() [#2040](https://github.com/immutable-js/immutable-js/pull/2040) by [@alexvictoor](https://github.com/alexvictoor)
+
+## [5.0.3]
+
+- Fix List.VNode.removeAfter() / removeBefore() issue on some particular case [#2030](https://github.com/immutable-js/immutable-js/pull/2030) by [@alexvictoor](https://github.com/alexvictoor)
+
+## [5.0.2]
+
+- Fix wrong path for esm module after fix in 5.0.1
+
+## [5.0.1]
+
+- Fix circular dependency issue with ESM build by @iambumblehead in [#2035](https://github.com/immutable-js/immutable-js/pull/2035) by [@iambumblehead](https://github.com/iambumblehead)
+
 ## [5.0.0]
 
 ### Breaking changes

diff --git a/__tests__/List.ts b/__tests__/List.ts
@@ -722,6 +722,33 @@ describe('List', () => {
     expect(o.get(0)).toBe('f');
   });
 
+  it('works with push, set and insert without phantom values', () => {
+    const v = List.of().set(287, 287).push(42).insert(33, 33);
+    expect(v.toJS().filter(item => item === 287)).toHaveLength(1);
+    const v2 = List.of().push(0).unshift(-1).unshift(-2).pop().pop().set(2, 2);
+    expect(v2.toJS()).toEqual([-2, undefined, 2]);
+    const v3 = List.of().set(447, 447).push(0).insert(65, 65);
+    expect(v3.toJS().filter(item => item === 447)).toHaveLength(1);
+    const v4 = List.of().set(-28, -28).push(0).shift().set(-30, -30);
+    expect(v4.toJS().filter(item => item === -28)).toHaveLength(0);
+    const v5 = List.of().unshift(0).set(33, 33).shift().set(-35, -35);
+    expect(v5.toJS().filter(item => item === 0)).toHaveLength(0);
+
+    // execute the same test as `v` but for the 2000 first integers
+    const isOkV1 = v =>
+      List.of()
+        .set(v, v)
+        .push('pushed-value')
+        .insert(33, 'inserted-value')
+        .filter(item => item === v).size === 1;
+
+    const arr = new Array(2000).fill(null).map((_, v) => v);
+
+    const notOkArray = arr.filter(v => !isOkV1(v));
+
+    expect(notOkArray).toHaveLength(0);
+  });
+
   // TODO: assert that findIndex only calls the function as much as it needs to.
 
   it('forEach iterates in the correct order', () => {

diff --git a/__tests__/concat.ts b/__tests__/concat.ts
@@ -1,10 +1,9 @@
-import { is, List, Seq, Set } from 'immutable';
+import { List, Seq, Set } from 'immutable';
 
 describe('concat', () => {
   it('concats two sequences', () => {
     const a = Seq([1, 2, 3]);
     const b = Seq([4, 5, 6]);
-    expect(is(a.concat(b), Seq([1, 2, 3, 4, 5, 6]))).toBe(true);
     expect(a.concat(b).size).toBe(6);
     expect(a.concat(b).toArray()).toEqual([1, 2, 3, 4, 5, 6]);
   });
@@ -181,4 +180,42 @@ describe('concat', () => {
     expect(i.get(-4)).toBe(-9);
     expect(i.get(-5, 888)).toBe(888);
   });
+
+  it('should iterate on many concatenated sequences', () => {
+    let meta = Seq();
+
+    for (let i = 0; i < 10000; ++i) {
+      meta = meta.concat(i) as Seq<unknown, unknown>; // TODO fix typing
+    }
+
+    expect(meta.toList().size).toBe(10000);
+  });
+
+  it('should handle iterator on many concatenated sequences', () => {
+    const nbLoops = 10000;
+    let meta = Seq();
+    for (let i = 1; i < nbLoops; i++) {
+      meta = meta.concat(i) as Seq<unknown, unknown>; // TODO fix typing
+    }
+    const it = meta[Symbol.iterator]();
+    let done = false;
+    let i = 0;
+    while (!done) {
+      const result = it.next();
+      i++;
+      done = !!result.done;
+    }
+    expect(i).toBe(nbLoops);
+  });
+
+  it('should iterate on reverse order on concatenated sequences', () => {
+    let meta = Seq([1]);
+    meta = meta.concat(42);
+    const it = meta.reverse()[Symbol.iterator]();
+    const result = it.next();
+    expect(result).toEqual({
+      done: false,
+      value: 42,
+    });
+  });
 });
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immutable",
-  "version": "5.0.0",
+  "version": "5.0.3",
   "description": "Immutable Data Collections",
   "license": "MIT",
   "homepage": "https://immutable-js.com",
@@ -16,7 +16,7 @@
     "url": "https://github.com/immutable-js/immutable-js/issues"
   },
   "main": "dist/immutable.js",
-  "module": "dist/es/Immutable.js",
+  "module": "dist/immutable.es.js",
   "types": "dist/immutable.d.ts",
   "files": [
     "dist",
@@ -60,8 +60,8 @@
     "test:types": "tstyche",
     "format": "npm run lint:format -- --write",
     "lint": "run-s lint:*",
-    "lint:format": "prettier --check \"{__tests__,src,type-definitions,website/src,perf,resources}/**/*{.js,.ts,.tsx,.flow,.css}\"",
-    "lint:js": "eslint \"{__tests__,src,type-definitions,website/src}/**/*.{js,ts,tsx}\"",
+    "lint:format": "prettier --check \"{__tests__,src,type-definitions,website/src,perf,resources}/**/*{.js,.mjs,.ts,.tsx,.flow,.css}\"",
+    "lint:js": "eslint \"{__tests__,src,type-definitions,website/src}/**/*.{js,mjs,ts,tsx}\"",
     "type-check": "run-s type-check:*",
     "type-check:ts": "tsc --project type-definitions/tsconfig.json && tsc --project __tests__/tsconfig.json",
     "type-check:flow": "flow check type-definitions/flow-tests --include-warnings",
@@ -127,25 +127,25 @@
     "rollup": "3.28.1",
     "size-limit": "^8.2.6",
     "transducers-js": "0.4.174",
-    "tstyche": "^2.1.1",
+    "tstyche": "^3.0.0-rc.2",
     "typescript": "5.1"
   },
   "size-limit": [
     {
       "name": "all",
-      "path": "dist/es/Immutable.js",
+      "path": "dist/immutable.es.js",
       "import": "*",
       "limit": "20 kB"
     },
     {
       "name": "List",
-      "path": "dist/es/Immutable.js",
+      "path": "dist/immutable.es.js",
       "import": "{ List }",
       "limit": "20 kB"
     },
     {
       "name": "Seq",
-      "path": "dist/es/Immutable.js",
+      "path": "dist/immutable.es.js",
       "import": "{ Seq }",
       "limit": "20 kB"
     }

diff --git a/resources/dist-stats.mjs b/resources/dist-stats.mjs
@@ -31,8 +31,6 @@ async function bundlephobaInfo(key) {
         `https://bundlephobia.com/api/size?package=immutable@${VERIFY_AGAINST_VERSION}`
       );
 
-      console.log(res.status);
-
       if (res.status !== 200) {
         throw new Error(
           `Unable to fetch bundlephobia in dist-stats.mjs. Status code is "${res.status}"`
@@ -50,7 +48,7 @@ async function bundlephobaInfo(key) {
   return bundlephobaInfoCache[key];
 }
 
-Promise.all([
+Promise.allSettled([
   fs.readFile('dist/immutable.js'),
   fs.readFile('dist/immutable.min.js'),
   bundlephobaInfo('size'),
@@ -59,23 +57,28 @@ Promise.all([
 ])
   .then(results =>
     results.map(result =>
-      typeof result === 'number'
+      typeof (result === null || result === 'number')
         ? result
         : Number(Buffer.byteLength(result, 'utf8'))
     )
   )
   .then(([rawNew, minNew, minOld, zipNew, zipOld]) => {
-    console.log(`  Raw: ${space(14, bytes(rawNew).cyan)}`);
-    console.log(
-      `  Min: ${space(14, bytes(minNew).cyan)}${percentage(
-        minNew,
-        rawNew
-      )}${space(15, diff(minNew, minOld))}`
-    );
-    console.log(
-      `  Zip: ${space(14, bytes(zipNew).cyan)}${percentage(
-        zipNew,
-        rawNew
-      )}${space(15, diff(zipNew, zipOld))}`
-    );
+    console.log(`  Raw: ${space(14, bytes(rawNew.value).cyan)}`);
+    if (minOld.status === 'fulfilled') {
+      console.log(
+        `  Min: ${space(14, bytes(minNew.value).cyan)}${percentage(
+          minNew.value,
+          rawNew.value
+        )}${space(15, diff(minNew.value, minOld.value))}`
+      );
+    }
+
+    if (zipOld.status === 'fulfilled') {
+      console.log(
+        `  Zip: ${space(14, bytes(zipNew.value).cyan)}${percentage(
+          zipNew.value,
+          rawNew.value
+        )}${space(15, diff(zipNew.value, zipOld.value))}`
+      );
+    }
   });
diff --git a/resources/rollup-config.mjs b/resources/rollup-config.mjs
@@ -36,10 +36,8 @@ export default [
       {
         banner: copyright,
         name: 'Immutable',
-        dir: path.join(DIST_DIR, 'es'),
+        file: path.join(DIST_DIR, 'immutable.es.js'),
         format: 'es',
-        preserveModules: true,
-        preserveModulesRoot: SRC_DIR,
         sourcemap: false,
       },
     ],

diff --git a/src/Iterator.js b/src/Iterator.js
@@ -29,7 +29,8 @@ Iterator.prototype[ITERATOR_SYMBOL] = function () {
 };
 
 export function iteratorValue(type, k, v, iteratorResult) {
-  const value = type === 0 ? k : type === 1 ? v : [k, v];
+  const value =
+    type === ITERATE_KEYS ? k : type === ITERATE_VALUES ? v : [k, v];
   iteratorResult
     ? (iteratorResult.value = value)
     : (iteratorResult = {

diff --git a/src/List.js b/src/List.js
@@ -271,7 +271,10 @@ class VNode {
   // TODO: seems like these methods are very similar
 
   removeBefore(ownerID, level, index) {
-    if (index === level ? 1 << level : 0 || this.array.length === 0) {
+    if (
+      (index & ((1 << (level + SHIFT)) - 1)) === 0 ||
+      this.array.length === 0
+    ) {
       return this;
     }
     const originIndex = (index >>> level) & MASK;
@@ -304,7 +307,10 @@ class VNode {
   }
 
   removeAfter(ownerID, level, index) {
-    if (index === (level ? 1 << level : 0) || this.array.length === 0) {
+    if (
+      index === (level ? 1 << (level + SHIFT) : SIZE) ||
+      this.array.length === 0
+    ) {
       return this;
     }
     const sizeIndex = ((index - 1) >>> level) & MASK;