move Async explicit resource management proposal to stage 3

zloirock · zloirock · commit e0836a90143e · 2023-07-16T15:25:23.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,19 @@
   - Added `/actual/` namespaces entries, unconditional forced replacement changed to feature detection
 - [Iterator Helpers stage 3 proposal](https://github.com/tc39/proposal-iterator-helpers):
   - Avoid creating observable `String` wrapper objects, [proposal-iterator-helpers/281](https://github.com/tc39/proposal-iterator-helpers/pull/281)
+- Async explicit resource management:
+  - Built-ins:
+    - `Symbol.asyncDispose`
+    - `AsyncDisposableStack`
+      - `AsyncDisposableStack.prototype.disposeAsync`
+      - `AsyncDisposableStack.prototype.use`
+      - `AsyncDisposableStack.prototype.adopt`
+      - `AsyncDisposableStack.prototype.defer`
+      - `AsyncDisposableStack.prototype.move`
+      - `AsyncDisposableStack.prototype[@@asyncDispose]`
+    - `AsyncIterator.prototype[@@asyncDispose]`
+  - Moved back into [the initial proposal](https://github.com/tc39/proposal-explicit-resource-management) -> moved to stage 3, [proposal-explicit-resource-management/154](https://github.com/tc39/proposal-explicit-resource-management/pull/154)
+  - Added `/actual/` namespace entries, disabled forced replacement
 - Used strict mode in some missed cases, [#1269](https://github.com/zloirock/core-js/issues/1269)
 - Compat data improvements:
   - [NodeJS 20.4.0 add `Symbol.{ dispose, asyncDispose }`](https://github.com/nodejs/node/pull/48518), but [with incorrect property descriptors](https://github.com/nodejs/node/issues/48699)
diff --git a/README.md b/README.md
@@ -167,7 +167,6 @@ structuredClone(new Set([1, 2, 3])); // => new Set([1, 2, 3])
       - [`Map.prototype.emplace`](#mapprototypeemplace)
       - [`Array.isTemplateObject`](#arrayistemplateobject)
       - [`String.dedent`](#stringdedent)
-      - [Async explicit resource management](#async-explicit-resource-management)
       - [`Symbol` predicates](#symbol-predicates)
     - [Stage 1 proposals](#stage-1-proposals)
       - [`Observable`](#observable)
@@ -2392,9 +2391,10 @@ console.log([...new Int8Array(newBuffer)]); // => [1, 2, 3, 4]
 ##### [Explicit Resource Management](https://github.com/tc39/proposal-explicit-resource-management)[⬆](#index)
 Note: **This is only built-ins for this proposal, `using` syntax support requires transpiler support.**
 
-Modules [`esnext.symbol.dispose`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.symbol.dispose.js), [`esnext.disposable-stack.constructor`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.disposable-stack.constructor.js), [`esnext.suppressed-error.constructor`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.suppressed-error.constructor.js), [`esnext.iterator.dispose`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.iterator.dispose.js).
+Modules [`esnext.symbol.dispose`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.symbol.dispose.js), [`esnext.disposable-stack.constructor`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.disposable-stack.constructor.js), [`esnext.suppressed-error.constructor`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.suppressed-error.constructor.js), [`esnext.iterator.dispose`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.iterator.dispose.js), [`esnext.symbol.async-dispose`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.symbol.async-dispose.js), [`esnext.async-disposable-stack.constructor`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.async-disposable-stack.constructor.js), [`esnext.async-iterator.async-dispose`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.async-iterator.async-dispose.js).
 ```js
 class Symbol {
+  static asyncDispose: @@asyncDispose;
   static dispose: @@dispose;
 }
 
@@ -2408,6 +2408,16 @@ class DisposableStack {
   @@toStringTag: 'DisposableStack';
 }
 
+class AsyncDisposableStack {
+  constructor(): AsyncDisposableStack;
+  disposeAsync(): Promise<undefined>;
+  use(value: AsyncDisposable | Disposable): value;
+  adopt(value: object, onDispose: Function): value;
+  defer(onDispose: Function): undefined;
+  @@asyncDispose(): Promise<undefined>;
+  @@toStringTag: 'AsyncDisposableStack';
+}
+
 class SuppressedError extends Error {
   constructor(error: any, suppressed: any, message?: string): SuppressedError;
   error: any;
@@ -2419,14 +2429,21 @@ class SuppressedError extends Error {
 class Iterator {
   @@dispose(): undefined;
 }
+
+class AsyncIterator {
+  @@asyncDispose(): Promise<undefined>;
+}
 ```
 [*CommonJS entry points:*](#commonjs-api)
 ```js
 core-js/proposals/explicit-resource-management
+core-js(-pure)/actual|full/symbol/async-dispose
 core-js(-pure)/actual|full/symbol/dispose
 core-js(-pure)/actual|full/disposable-stack
+core-js(-pure)/actual|full/async-disposable-stack
 core-js(-pure)/actual|full/suppressed-error
 core-js(-pure)/actual|full/iterator/dispose
+core-js(-pure)/actual|full/async-iterator/async-dispose
 ```
 ##### [`Symbol.metadata` for decorators metadata proposal](https://github.com/tc39/proposal-decorator-metadata)[⬆](#index)
 Modules [`esnext.symbol.metadata`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.symbol.metadata.js) and [`esnext.function.metadata`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.function.metadata.js).
@@ -2617,36 +2634,6 @@ String.dedent(console.log)`
   print('${ message }')
 `; // => ["print('", "')", raw: Array(2)], 42
 ```
-##### [Async Explicit Resource Management](https://github.com/tc39/proposal-async-explicit-resource-management)[⬆](#index)
-Note: **This is only built-ins for this proposal, `using` syntax support requires transpiler support.**
-
-Modules [`esnext.symbol.async-dispose`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.symbol.async-dispose.js), [`esnext.async-disposable-stack.constructor`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.async-disposable-stack.constructor.js), [`esnext.async-iterator.async-dispose`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.async-iterator.async-dispose.js).
-```js
-class Symbol {
-  static asyncDispose: @@asyncDispose;
-}
-
-class AsyncDisposableStack {
-  constructor(): AsyncDisposableStack;
-  disposeAsync(): Promise<undefined>;
-  use(value: AsyncDisposable | Disposable): value;
-  adopt(value: object, onDispose: Function): value;
-  defer(onDispose: Function): undefined;
-  @@asyncDispose(): Promise<undefined>;
-  @@toStringTag: 'AsyncDisposableStack';
-}
-
-class AsyncIterator {
-  @@asyncDispose(): Promise<undefined>;
-}
-```
-[*CommonJS entry points:*](#commonjs-api)
-```js
-core-js/proposals/async-explicit-resource-management
-core-js(-pure)/full/symbol/async-dispose
-core-js(-pure)/full/async-disposable-stack
-core-js(-pure)/full/async-iterator/async-dispose
-```
 ##### [`Symbol` predicates](https://github.com/tc39/proposal-symbol-predicates)[⬆](#index)
 Modules [`esnext.symbol.is-registered-symbol`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.symbol.is-registered-symbol.js), [`esnext.symbol.is-well-known-symbol`](https://github.com/zloirock/core-js/blob/master/packages/core-js/modules/esnext.symbol.is-well-known-symbol.js).
 ```js
diff --git a/packages/core-js/actual/async-disposable-stack/constructor.js b/packages/core-js/actual/async-disposable-stack/constructor.js
@@ -0,0 +1,12 @@
+'use strict';
+require('../../modules/es.error.cause');
+require('../../modules/es.error.to-string');
+require('../../modules/es.object.to-string');
+require('../../modules/es.promise');
+require('../../modules/esnext.suppressed-error.constructor');
+require('../../modules/esnext.async-disposable-stack.constructor');
+require('../../modules/esnext.async-iterator.async-dispose');
+require('../../modules/esnext.iterator.dispose');
+var path = require('../../internals/path');
+
+module.exports = path.AsyncDisposableStack;
diff --git a/packages/core-js/actual/async-disposable-stack/index.js b/packages/core-js/actual/async-disposable-stack/index.js
@@ -0,0 +1,12 @@
+'use strict';
+require('../../modules/es.error.cause');
+require('../../modules/es.error.to-string');
+require('../../modules/es.object.to-string');
+require('../../modules/es.promise');
+require('../../modules/esnext.suppressed-error.constructor');
+require('../../modules/esnext.async-disposable-stack.constructor');
+require('../../modules/esnext.async-iterator.async-dispose');
+require('../../modules/esnext.iterator.dispose');
+var path = require('../../internals/path');
+
+module.exports = path.AsyncDisposableStack;
diff --git a/packages/core-js/actual/async-iterator/async-dispose.js b/packages/core-js/actual/async-iterator/async-dispose.js
@@ -0,0 +1,4 @@
+'use strict';
+require('../../modules/es.object.to-string');
+require('../../modules/es.promise');
+require('../../modules/esnext.async-iterator.async-dispose');
diff --git a/packages/core-js/actual/async-iterator/index.js b/packages/core-js/actual/async-iterator/index.js
@@ -4,6 +4,7 @@ require('../../modules/es.object.to-string');
 require('../../modules/es.promise');
 require('../../modules/es.string.iterator');
 require('../../modules/esnext.async-iterator.constructor');
+require('../../modules/esnext.async-iterator.async-dispose');
 require('../../modules/esnext.async-iterator.drop');
 require('../../modules/esnext.async-iterator.every');
 require('../../modules/esnext.async-iterator.filter');
diff --git a/packages/core-js/actual/symbol/async-dispose.js b/packages/core-js/actual/symbol/async-dispose.js
@@ -0,0 +1,5 @@
+'use strict';
+require('../../modules/esnext.symbol.async-dispose');
+var WrappedWellKnownSymbolModule = require('../../internals/well-known-symbol-wrapped');
+
+module.exports = WrappedWellKnownSymbolModule.f('asyncDispose');
diff --git a/packages/core-js/actual/symbol/index.js b/packages/core-js/actual/symbol/index.js
@@ -2,6 +2,7 @@
 var parent = require('../../stable/symbol');
 
 require('../../modules/esnext.function.metadata');
+require('../../modules/esnext.symbol.async-dispose');
 require('../../modules/esnext.symbol.dispose');
 require('../../modules/esnext.symbol.metadata');
 
diff --git a/packages/core-js/full/async-disposable-stack/constructor.js b/packages/core-js/full/async-disposable-stack/constructor.js
@@ -1,12 +1,4 @@
 'use strict';
-require('../../modules/es.error.cause');
-require('../../modules/es.error.to-string');
-require('../../modules/es.object.to-string');
-require('../../modules/es.promise');
-require('../../modules/esnext.suppressed-error.constructor');
-require('../../modules/esnext.async-disposable-stack.constructor');
-require('../../modules/esnext.async-iterator.async-dispose');
-require('../../modules/esnext.iterator.dispose');
-var path = require('../../internals/path');
+var parent = require('../../actual/async-disposable-stack/constructor');
 
-module.exports = path.AsyncDisposableStack;
+module.exports = parent;
diff --git a/packages/core-js/full/async-disposable-stack/index.js b/packages/core-js/full/async-disposable-stack/index.js
@@ -1,12 +1,4 @@
 'use strict';
-require('../../modules/es.error.cause');
-require('../../modules/es.error.to-string');
-require('../../modules/es.object.to-string');
-require('../../modules/es.promise');
-require('../../modules/esnext.suppressed-error.constructor');
-require('../../modules/esnext.async-disposable-stack.constructor');
-require('../../modules/esnext.async-iterator.async-dispose');
-require('../../modules/esnext.iterator.dispose');
-var path = require('../../internals/path');
+var parent = require('../../actual/async-disposable-stack');
 
-module.exports = path.AsyncDisposableStack;
+module.exports = parent;
diff --git a/packages/core-js/full/async-iterator/async-dispose.js b/packages/core-js/full/async-iterator/async-dispose.js
@@ -1,4 +1,4 @@
 'use strict';
-require('../../modules/es.object.to-string');
-require('../../modules/es.promise');
-require('../../modules/esnext.async-iterator.async-dispose');
+var parent = require('../../actual/async-iterator/async-dispose');
+
+module.exports = parent;
diff --git a/packages/core-js/full/async-iterator/index.js b/packages/core-js/full/async-iterator/index.js
@@ -1,6 +1,5 @@
 'use strict';
 var parent = require('../../actual/async-iterator');
-require('../../modules/esnext.async-iterator.async-dispose');
 // TODO: Remove from `core-js@4`
 require('../../modules/esnext.async-iterator.as-indexed-pairs');
 require('../../modules/esnext.async-iterator.indexed');
diff --git a/packages/core-js/full/symbol/async-dispose.js b/packages/core-js/full/symbol/async-dispose.js
@@ -1,5 +1,4 @@
 'use strict';
-require('../../modules/esnext.symbol.async-dispose');
-var WrappedWellKnownSymbolModule = require('../../internals/well-known-symbol-wrapped');
+var parent = require('../../actual/symbol/async-dispose');
 
-module.exports = WrappedWellKnownSymbolModule.f('asyncDispose');
+module.exports = parent;
diff --git a/packages/core-js/full/symbol/index.js b/packages/core-js/full/symbol/index.js
@@ -1,6 +1,5 @@
 'use strict';
 var parent = require('../../actual/symbol');
-require('../../modules/esnext.symbol.async-dispose');
 require('../../modules/esnext.symbol.is-registered-symbol');
 require('../../modules/esnext.symbol.is-well-known-symbol');
 require('../../modules/esnext.symbol.matcher');
diff --git a/packages/core-js/modules/esnext.async-disposable-stack.constructor.js b/packages/core-js/modules/esnext.async-disposable-stack.constructor.js
@@ -125,6 +125,6 @@ if (DESCRIPTORS) defineBuiltInAccessor(AsyncDisposableStackPrototype, 'disposed'
 defineBuiltIn(AsyncDisposableStackPrototype, ASYNC_DISPOSE, AsyncDisposableStackPrototype.disposeAsync, { name: 'disposeAsync' });
 defineBuiltIn(AsyncDisposableStackPrototype, TO_STRING_TAG, ASYNC_DISPOSABLE_STACK, { nonWritable: true });
 
-$({ global: true, constructor: true, forced: true }, {
+$({ global: true, constructor: true }, {
   AsyncDisposableStack: $AsyncDisposableStack
 });
diff --git a/packages/core-js/proposals/async-explicit-resource-management.js b/packages/core-js/proposals/async-explicit-resource-management.js
@@ -1,4 +1,5 @@
 'use strict';
+// TODO: Remove from `core-js@4`
 // https://github.com/tc39/proposal-async-explicit-resource-management
 require('../modules/esnext.suppressed-error.constructor');
 require('../modules/esnext.async-disposable-stack.constructor');
diff --git a/packages/core-js/proposals/explicit-resource-management.js b/packages/core-js/proposals/explicit-resource-management.js
@@ -1,6 +1,9 @@
 'use strict';
 // https://github.com/tc39/proposal-explicit-resource-management
 require('../modules/esnext.suppressed-error.constructor');
+require('../modules/esnext.async-disposable-stack.constructor');
+require('../modules/esnext.async-iterator.async-dispose');
 require('../modules/esnext.disposable-stack.constructor');
 require('../modules/esnext.iterator.dispose');
+require('../modules/esnext.symbol.async-dispose');
 require('../modules/esnext.symbol.dispose');
diff --git a/packages/core-js/stage/2.js b/packages/core-js/stage/2.js
@@ -2,14 +2,14 @@
 var parent = require('./3');
 
 require('../proposals/array-is-template-object');
-require('../proposals/async-explicit-resource-management');
 require('../proposals/async-iterator-helpers');
 require('../proposals/iterator-range');
 require('../proposals/map-upsert-stage-2');
 require('../proposals/string-dedent');
 require('../proposals/symbol-predicates-v2');
 // TODO: Obsolete versions, remove from `core-js@4`
 require('../proposals/array-grouping');
+require('../proposals/async-explicit-resource-management');
 require('../proposals/decorators');
 require('../proposals/decorator-metadata');
 require('../proposals/iterator-helpers');
diff --git a/tests/entries/unit.mjs b/tests/entries/unit.mjs
@@ -707,6 +707,10 @@ for (PATH of ['core-js-pure', 'core-js']) {
     ok(typeof load(NS, 'disposable-stack') == 'function');
     ok(typeof load(NS, 'disposable-stack/constructor') == 'function');
     load(NS, 'iterator/dispose');
+    ok(load(NS, 'symbol/async-dispose'));
+    load(NS, 'async-iterator/async-dispose');
+    ok(typeof load(NS, 'async-disposable-stack') == 'function');
+    ok(typeof load(NS, 'async-disposable-stack/constructor') == 'function');
 
     const instanceGroup = load(NS, 'instance/group');
     ok(typeof instanceGroup == 'function');
@@ -845,10 +849,6 @@ for (PATH of ['core-js-pure', 'core-js']) {
     ok(load(NS, 'weak-set/delete-all')(new WeakSet(), [], {}) === false);
     ok(load(NS, 'weak-set/from')([{}, []]) instanceof WeakSet);
     ok(load(NS, 'weak-set/of')({}, []) instanceof WeakSet);
-    ok(load(NS, 'symbol/async-dispose'));
-    load(NS, 'async-iterator/async-dispose');
-    ok(typeof load(NS, 'async-disposable-stack') == 'function');
-    ok(typeof load(NS, 'async-disposable-stack/constructor') == 'function');
 
     const instanceCodePoints = load(NS, 'instance/code-points');
     ok(typeof instanceCodePoints == 'function');
