From 65cd4d557c08da7ba8f051dd1f9c73bd30c6fef9 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 8 Oct 2024 11:42:19 +0200
Subject: [PATCH 1/2] tools: add `polyfilled` option to `prefer-primordials`
 rule

---
 .../test-eslint-prefer-primordials.js         | 16 ++++++++++++++
 tools/eslint-rules/prefer-primordials.js      | 22 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/test/parallel/test-eslint-prefer-primordials.js b/test/parallel/test-eslint-prefer-primordials.js
index 61c84cbaddf520..b6633c08e56a92 100644
--- a/test/parallel/test-eslint-prefer-primordials.js
+++ b/test/parallel/test-eslint-prefer-primordials.js
@@ -177,6 +177,22 @@ new RuleTester({
         options: [{ name: 'Symbol' }],
         errors: [{ message: /const { SymbolIterator } = primordials/ }]
       },
+      {
+        code: `
+          const { SymbolAsyncDispose } = primordials;
+          const a = { [SymbolAsyncDispose] () {} }
+        `,
+        options: [{ name: 'Symbol', polyfilled: ['asyncDispose', 'dispose'] }],
+        errors: [{ message: /const { SymbolAsyncDispose } = require\("internal\/util"\)/ }]
+      },
+      {
+        code: `
+          const { SymbolDispose } = primordials;
+          const a = { [SymbolDispose] () {} }
+        `,
+        options: [{ name: 'Symbol', polyfilled: ['asyncDispose', 'dispose'] }],
+        errors: [{ message: /const { SymbolDispose } = require\("internal\/util"\)/ }]
+      },
       {
         code: `
           const { ObjectDefineProperty, Symbol } = primordials;
diff --git a/tools/eslint-rules/prefer-primordials.js b/tools/eslint-rules/prefer-primordials.js
index 48b351b46ae270..ead35f4c286568 100644
--- a/tools/eslint-rules/prefer-primordials.js
+++ b/tools/eslint-rules/prefer-primordials.js
@@ -74,6 +74,7 @@ module.exports = {
   meta: {
     messages: {
       error: 'Use `const { {{name}} } = primordials;` instead of the global.',
+      errorPolyfill: 'Use `const { {{name}} } = require("internal/util");` instead of the primordial.',
     },
     schema: {
       type: 'array',
@@ -88,6 +89,10 @@ module.exports = {
               items: { type: 'string' },
             },
             into: { type: 'string' },
+            polyfilled: {
+              type: 'array',
+              items: { type: 'string' },
+            },
           },
           additionalProperties: false,
         },
@@ -99,6 +104,7 @@ module.exports = {
 
     const nameMap = new Map();
     const renameMap = new Map();
+    const polyfilledSet = new Set();
 
     for (const option of context.options) {
       const names = option.ignore || [];
@@ -109,6 +115,11 @@ module.exports = {
       if (option.into) {
         renameMap.set(option.name, option.into);
       }
+      if (option.polyfilled) {
+        for (const propertyName of option.polyfilled) {
+          polyfilledSet.add(`${option.name}${propertyName[0].toUpperCase()}${propertyName.slice(1)}`)
+        }
+      }
     }
 
     let reported;
@@ -186,6 +197,17 @@ module.exports = {
       },
       VariableDeclarator(node) {
         const name = node.init?.name;
+        if (name === 'primordials' && node.id.type === 'ObjectPattern'){
+          const name = node.id.properties.find(({key}) => polyfilledSet.has(key.name))?.key.name;
+          if (name) {
+            context.report({
+              node,
+              messageId: 'errorPolyfill',
+              data: { name },
+            });
+            return;
+          }
+        }
         if (name !== undefined && isTarget(nameMap, name) &&
             node.id.type === 'Identifier' &&
             !globalScope.set.get(name)?.defs.length) {

From 932837990d93277da6f66c4ef14d2b9cd2164efc Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 8 Oct 2024 11:52:06 +0200
Subject: [PATCH 2/2] fixup! tools: add `polyfilled` option to
 `prefer-primordials` rule

---
 tools/eslint-rules/prefer-primordials.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/eslint-rules/prefer-primordials.js b/tools/eslint-rules/prefer-primordials.js
index ead35f4c286568..4f109748716cd6 100644
--- a/tools/eslint-rules/prefer-primordials.js
+++ b/tools/eslint-rules/prefer-primordials.js
@@ -117,7 +117,7 @@ module.exports = {
       }
       if (option.polyfilled) {
         for (const propertyName of option.polyfilled) {
-          polyfilledSet.add(`${option.name}${propertyName[0].toUpperCase()}${propertyName.slice(1)}`)
+          polyfilledSet.add(`${option.name}${propertyName[0].toUpperCase()}${propertyName.slice(1)}`);
         }
       }
     }
@@ -197,8 +197,8 @@ module.exports = {
       },
       VariableDeclarator(node) {
         const name = node.init?.name;
-        if (name === 'primordials' && node.id.type === 'ObjectPattern'){
-          const name = node.id.properties.find(({key}) => polyfilledSet.has(key.name))?.key.name;
+        if (name === 'primordials' && node.id.type === 'ObjectPattern') {
+          const name = node.id.properties.find(({ key }) => polyfilledSet.has(key.name))?.key.name;
           if (name) {
             context.report({
               node,