(Async)DisposableStack.prototype.move marks the original stack as d…

…isposed, close #1226
zloirock · Mar 23, 2023 · 3493e88 · 3493e88
1 parent 2e9df1e
commit 3493e88
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Changelog
 ##### Unreleased
+- `(Async)DisposableStack.prototype.move` marks the original stack as disposed, [#1226](https://github.com/zloirock/core-js/issues/1226)
 - Compat data improvements:
   - [`URLSearchParams.prototype.size`](https://github.com/whatwg/url/pull/734) marked as supported from FF112, NodeJS 19.8 and Deno 1.32
   - Added Deno 1.32 compat data mapping

diff --git a/packages/core-js/modules/esnext.async-disposable-stack.constructor.js b/packages/core-js/modules/esnext.async-disposable-stack.constructor.js
@@ -110,6 +110,8 @@ defineBuiltIns(AsyncDisposableStackPrototype, {
     var newAsyncDisposableStack = new $AsyncDisposableStack();
     getAsyncDisposableStackInternalState(newAsyncDisposableStack).stack = internalState.stack;
     internalState.stack = [];
+    internalState.state = DISPOSED;
+    if (!DESCRIPTORS) this.disposed = true;
     return newAsyncDisposableStack;
   }
 });

diff --git a/packages/core-js/modules/esnext.disposable-stack.constructor.js b/packages/core-js/modules/esnext.disposable-stack.constructor.js
@@ -94,6 +94,8 @@ defineBuiltIns(DisposableStackPrototype, {
     var newDisposableStack = new $DisposableStack();
     getDisposableStackInternalState(newDisposableStack).stack = internalState.stack;
     internalState.stack = [];
+    internalState.state = DISPOSED;
+    if (!DESCRIPTORS) this.disposed = true;
     return newDisposableStack;
   }
 });

diff --git a/tests/unit-global/esnext.async-disposable-stack.constructor.js b/tests/unit-global/esnext.async-disposable-stack.constructor.js
@@ -106,15 +106,9 @@ QUnit.test('AsyncDisposableStack#move', assert => {
 
   const stack2 = stack1.move();
 
-  assert.false(stack1.disposed);
+  assert.true(stack1.disposed);
 
-  return stack1.disposeAsync().then(() => {
-    assert.same(result, '');
-
-    assert.true(stack1.disposed);
-
-    return stack2.disposeAsync();
-  }).then(() => {
+  return stack2.disposeAsync().then(() => {
     assert.same(result, '12');
   });
 });

diff --git a/tests/unit-global/esnext.disposable-stack.constructor.js b/tests/unit-global/esnext.disposable-stack.constructor.js
@@ -99,12 +99,6 @@ QUnit.test('DisposableStack#move', assert => {
 
   const stack2 = stack.move();
 
-  assert.false(stack.disposed);
-
-  stack.dispose();
-
-  assert.same(result, '');
-
   assert.true(stack.disposed);
 
   stack2.dispose();

diff --git a/tests/unit-pure/esnext.async-disposable-stack.constructor.js b/tests/unit-pure/esnext.async-disposable-stack.constructor.js
@@ -105,15 +105,9 @@ QUnit.test('AsyncDisposableStack#move', assert => {
 
   const stack2 = stack1.move();
 
-  assert.false(stack1.disposed);
+  assert.true(stack1.disposed);
 
-  return stack1.disposeAsync().then(() => {
-    assert.same(result, '');
-
-    assert.true(stack1.disposed);
-
-    return stack2.disposeAsync();
-  }).then(() => {
+  return stack2.disposeAsync().then(() => {
     assert.same(result, '12');
   });
 });

diff --git a/tests/unit-pure/esnext.disposable-stack.constructor.js b/tests/unit-pure/esnext.disposable-stack.constructor.js
@@ -97,12 +97,6 @@ QUnit.test('DisposableStack#move', assert => {
 
   const stack2 = stack1.move();
 
-  assert.false(stack1.disposed);
-
-  stack1.dispose();
-
-  assert.same(result, '');
-
   assert.true(stack1.disposed);
 
   stack2.dispose();