Revert "lib: add WeakRef and FinalizationRegistry to primordials"

This reverts commit 78343bb.

Author: BethGriggs

lib/.eslintrc.yaml

@@ -48,8 +48,6 @@ rules:
         - prepareStackTrace
         - stackTraceLimit
     - name: EvalError
-    - name: FinalizationRegistry
-      into: Safe
     - name: Float32Array
     - name: Float64Array
     - name: Function
@@ -88,8 +86,6 @@ rules:
     - name: URIError
     - name: WeakMap
       into: Safe
-    - name: WeakRef
-      into: Safe
     - name: WeakSet
       into: Safe
 globals:

lib/internal/event_target.js

@@ -14,10 +14,8 @@ const {
   ObjectGetOwnPropertyDescriptors,
   ReflectApply,
   SafeArrayIterator,
-  SafeFinalizationRegistry,
   SafeMap,
   SafeWeakMap,
-  SafeWeakRef,
   SafeWeakSet,
   String,
   Symbol,
@@ -203,7 +201,7 @@ let weakListenersState = null;
 // get garbage collected now that it's weak.
 let objectToWeakListenerMap = null;
 function weakListeners() {
-  weakListenersState ??= new SafeFinalizationRegistry(
+  weakListenersState ??= new globalThis.FinalizationRegistry(
     (listener) => listener.remove()
   );
   objectToWeakListenerMap ??= new SafeWeakMap();
@@ -234,7 +232,7 @@ class Listener {
     this.weak = Boolean(weak); // Don't retain the object
 
     if (this.weak) {
-      this.callback = new SafeWeakRef(listener);
+      this.callback = new globalThis.WeakRef(listener);
       weakListeners().registry.register(listener, this, this);
       // Make the retainer retain the listener in a WeakMap
       weakListeners().map.set(weak, listener);

lib/internal/per_context/primordials.js

@@ -163,7 +163,6 @@ function copyPrototype(src, dest, prefix) {
   'Date',
   'Error',
   'EvalError',
-  'FinalizationRegistry',
   'Float32Array',
   'Float64Array',
   'Function',
@@ -187,7 +186,6 @@ function copyPrototype(src, dest, prefix) {
   'Uint8Array',
   'Uint8ClampedArray',
   'WeakMap',
-  'WeakRef',
   'WeakSet',
 ].forEach((name) => {
   const original = global[name];
@@ -231,15 +229,13 @@ function copyPrototype(src, dest, prefix) {
 
 const {
   ArrayPrototypeForEach,
-  FinalizationRegistry,
   FunctionPrototypeCall,
   Map,
   ObjectFreeze,
   ObjectSetPrototypeOf,
   Set,
   SymbolIterator,
   WeakMap,
-  WeakRef,
   WeakSet,
 } = primordials;
 
@@ -338,7 +334,6 @@ primordials.SafeWeakMap = makeSafe(
     constructor(i) { super(i); } // eslint-disable-line no-useless-constructor
   }
 );
-
 primordials.SafeSet = makeSafe(
   Set,
   class SafeSet extends Set {
@@ -352,20 +347,5 @@ primordials.SafeWeakSet = makeSafe(
   }
 );
 
-primordials.SafeFinalizationRegistry = makeSafe(
-  FinalizationRegistry,
-  class SafeFinalizationRegistry extends FinalizationRegistry {
-    // eslint-disable-next-line no-useless-constructor
-    constructor(cleanupCallback) { super(cleanupCallback); }
-  }
-);
-primordials.SafeWeakRef = makeSafe(
-  WeakRef,
-  class SafeWeakRef extends WeakRef {
-    // eslint-disable-next-line no-useless-constructor
-    constructor(target) { super(target); }
-  }
-);
-
 ObjectSetPrototypeOf(primordials, null);
 ObjectFreeze(primordials);

lib/internal/util/iterable_weak_map.js

@@ -1,14 +1,25 @@
 'use strict';
 
 const {
+  makeSafe,
   ObjectFreeze,
-  SafeFinalizationRegistry,
   SafeSet,
   SafeWeakMap,
-  SafeWeakRef,
   SymbolIterator,
 } = primordials;
 
+// TODO(aduh95): Add FinalizationRegistry to primordials
+const SafeFinalizationRegistry = makeSafe(
+  globalThis.FinalizationRegistry,
+  class SafeFinalizationRegistry extends globalThis.FinalizationRegistry {}
+);
+
+// TODO(aduh95): Add WeakRef to primordials
+const SafeWeakRef = makeSafe(
+  globalThis.WeakRef,
+  class SafeWeakRef extends globalThis.WeakRef {}
+);
+
 // This class is modified from the example code in the WeakRefs specification:
 // https://github.com/tc39/proposal-weakrefs
 // Licensed under ECMA's MIT-style license, see: