eslint-plugin-react-web-api 1.28.1-next.5 → 1.28.1-next.6

package/dist/index.js

@@ -4,7 +4,7 @@ var shared = require('@eslint-react/shared');
 var AST = require('@eslint-react/ast');
 var core = require('@eslint-react/core');
 var eff = require('@eslint-react/eff');
-var VAR2 = require('@eslint-react/var');
+var VAR = require('@eslint-react/var');
 var utils = require('@typescript-eslint/utils');
 var tsPattern = require('ts-pattern');
 
@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 }
 
 var AST__namespace = /*#__PURE__*/_interopNamespace(AST);
-var VAR2__namespace = /*#__PURE__*/_interopNamespace(VAR2);
+var VAR__namespace = /*#__PURE__*/_interopNamespace(VAR);
 
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
@@ -55,17 +55,11 @@ var settings = {
 
 // package.json
 var name2 = "eslint-plugin-react-web-api";
-var version = "1.28.1-next.5";
+var version = "1.28.1-next.6";
 var createRule = shared.createRuleForPlugin("web-api");
 function getPhaseKindOfFunction(node) {
   return tsPattern.match(node).when(core.isFunctionOfUseEffectSetup, () => "setup").when(core.isFunctionOfUseEffectCleanup, () => "cleanup").when(core.isFunctionOfComponentDidMount, () => "mount").when(core.isFunctionOfComponentWillUnmount, () => "unmount").otherwise(() => eff._);
 }
-function isInstanceIdEqual(context, a, b) {
-  return VAR2__namespace.isVariableIdEqual(a, b, [
-    context.sourceCode.getScope(a),
-    context.sourceCode.getScope(b)
-  ]);
-}
 
 // src/rules/no-leaked-event-listener.ts
 var RULE_NAME = "no-leaked-event-listener";
@@ -94,7 +88,7 @@ function getSignalValueExpression(node, initialScope) {
   if (node == null) return eff._;
   switch (node.type) {
     case utils.AST_NODE_TYPES.Identifier: {
-      return getSignalValueExpression(VAR2__namespace.getVariableNode(VAR2__namespace.findVariable(node, initialScope), 0), initialScope);
+      return getSignalValueExpression(VAR__namespace.getVariableNode(VAR__namespace.findVariable(node, initialScope), 0), initialScope);
     }
     case utils.AST_NODE_TYPES.MemberExpression:
       return node;
@@ -104,7 +98,7 @@ function getSignalValueExpression(node, initialScope) {
 }
 function getOptions(node, initialScope) {
   function findProp(properties, propName) {
-    return VAR2__namespace.findPropertyInProperties(propName, properties, initialScope);
+    return VAR__namespace.findPropertyInProperties(propName, properties, initialScope);
   }
   function getPropValue(prop, filter = (a) => true) {
     if (prop?.type !== utils.AST_NODE_TYPES.Property) return eff._;
@@ -116,7 +110,7 @@ function getOptions(node, initialScope) {
         break;
       }
       default: {
-        v = VAR2__namespace.toStaticValue({ kind: "lazy", node: value, initialScope }).value;
+        v = VAR__namespace.toStaticValue({ kind: "lazy", node: value, initialScope }).value;
         break;
       }
     }
@@ -125,8 +119,8 @@ function getOptions(node, initialScope) {
   function getOpts(node2) {
     switch (node2.type) {
       case utils.AST_NODE_TYPES.Identifier: {
-        const variable = VAR2__namespace.findVariable(node2, initialScope);
-        const variableNode = VAR2__namespace.getVariableNode(variable, 0);
+        const variable = VAR__namespace.findVariable(node2, initialScope);
+        const variableNode = VAR__namespace.getVariableNode(variable, 0);
         if (variableNode?.type === utils.AST_NODE_TYPES.ObjectExpression) {
           return getOpts(variableNode);
         }
@@ -190,7 +184,7 @@ var no_leaked_event_listener_default = createRule({
       if (!core.isInversePhase(aPhase, rPhase)) {
         return false;
       }
-      return isSameObject(aCallee, rCallee) && AST__namespace.isNodeEqual(aListener, rListener) && VAR2__namespace.isNodeValueEqual(aType, rType, [
+      return isSameObject(aCallee, rCallee) && AST__namespace.isNodeEqual(aListener, rListener) && VAR__namespace.isNodeValueEqual(aType, rType, [
         context.sourceCode.getScope(aType),
         context.sourceCode.getScope(rType)
       ]) && aCapture === rCapture;
@@ -334,7 +328,7 @@ var no_leaked_interval_default = createRule({
     const sEntries = [];
     const cEntries = [];
     function isInverseEntry(a, b) {
-      return isInstanceIdEqual(context, a.timerId, b.timerId);
+      return core.isInstanceIdEqual(context, a.timerId, b.timerId);
     }
     return {
       [":function"](node) {
@@ -354,7 +348,7 @@ var no_leaked_interval_default = createRule({
             if (!core.ERPhaseRelevance.has(fEntry.kind)) {
               break;
             }
-            const intervalIdNode = VAR2__namespace.getVariableDeclaratorId(node);
+            const intervalIdNode = VAR__namespace.getVariableDeclaratorId(node);
             if (intervalIdNode == null) {
               context.report({
                 messageId: "expectedIntervalId",
@@ -438,7 +432,7 @@ function isFromObserver(context, node) {
   switch (true) {
     case node.type === utils.AST_NODE_TYPES.Identifier: {
       const initialScope = context.sourceCode.getScope(node);
-      const object = VAR2__namespace.getVariableNode(VAR2__namespace.findVariable(node, initialScope), 0);
+      const object = VAR__namespace.getVariableNode(VAR__namespace.findVariable(node, initialScope), 0);
       return isNewResizeObserver(object);
     }
     case node.type === utils.AST_NODE_TYPES.MemberExpression:
@@ -549,7 +543,7 @@ var no_leaked_resize_observer_default = createRule({
         if (!isNewResizeObserver(node)) {
           return;
         }
-        const id = VAR2__namespace.getVariableId(node);
+        const id = core.getInstanceId(node);
         if (id == null) {
           context.report({
             messageId: "unexpectedFloatingInstance",
@@ -566,11 +560,11 @@ var no_leaked_resize_observer_default = createRule({
       },
       ["Program:exit"]() {
         for (const { id, node, phaseNode } of observers) {
-          if (dEntries.some((e) => isInstanceIdEqual(context, e.observer, id))) {
+          if (dEntries.some((e) => core.isInstanceIdEqual(context, e.observer, id))) {
             continue;
           }
-          const oentries = oEntries.filter((e) => isInstanceIdEqual(context, e.observer, id));
-          const uentries = uEntries.filter((e) => isInstanceIdEqual(context, e.observer, id));
+          const oentries = oEntries.filter((e) => core.isInstanceIdEqual(context, e.observer, id));
+          const uentries = uEntries.filter((e) => core.isInstanceIdEqual(context, e.observer, id));
           const isDynamic = (node2) => node2?.type === utils.AST_NODE_TYPES.CallExpression || AST__namespace.isConditional(node2);
           const isPhaseNode = (node2) => node2 === phaseNode;
           const hasDynamicallyAdded = oentries.some((e) => !isPhaseNode(AST__namespace.findParentNode(e.node, eff.or(isDynamic, isPhaseNode))));
@@ -579,7 +573,7 @@ var no_leaked_resize_observer_default = createRule({
             continue;
           }
           for (const oEntry of oentries) {
-            if (uentries.some((uEntry) => isInstanceIdEqual(context, uEntry.element, oEntry.element))) {
+            if (uentries.some((uEntry) => core.isInstanceIdEqual(context, uEntry.element, oEntry.element))) {
               continue;
             }
             context.report({ messageId: "expectedDisconnectOrUnobserveInCleanup", node: oEntry.node });
@@ -627,7 +621,7 @@ var no_leaked_timeout_default = createRule({
     const sEntries = [];
     const rEntries = [];
     function isInverseEntry(a, b) {
-      return isInstanceIdEqual(context, a.timerId, b.timerId);
+      return core.isInstanceIdEqual(context, a.timerId, b.timerId);
     }
     return {
       [":function"](node) {
@@ -644,7 +638,7 @@ var no_leaked_timeout_default = createRule({
         }
         switch (getCallKind4(node)) {
           case "setTimeout": {
-            const timeoutIdNode = VAR2__namespace.getVariableDeclaratorId(node);
+            const timeoutIdNode = VAR__namespace.getVariableDeclaratorId(node);
             if (timeoutIdNode == null) {
               context.report({
                 messageId: "expectedTimeoutId",

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { createRuleForPlugin, DEFAULT_ESLINT_REACT_SETTINGS } from '@eslint-react/shared';
 import * as AST from '@eslint-react/ast';
-import { ERPhaseRelevance, isInversePhase, isFunctionOfUseEffectSetup, isFunctionOfUseEffectCleanup, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount } from '@eslint-react/core';
+import { ERPhaseRelevance, isInstanceIdEqual, getInstanceId, isInversePhase, isFunctionOfUseEffectSetup, isFunctionOfUseEffectCleanup, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount } from '@eslint-react/core';
 import { _, or } from '@eslint-react/eff';
-import * as VAR2 from '@eslint-react/var';
+import * as VAR from '@eslint-react/var';
 import { AST_NODE_TYPES } from '@typescript-eslint/utils';
 import { match, isMatching, P } from 'ts-pattern';
 
@@ -32,17 +32,11 @@ var settings = {
 
 // package.json
 var name2 = "eslint-plugin-react-web-api";
-var version = "1.28.1-next.5";
+var version = "1.28.1-next.6";
 var createRule = createRuleForPlugin("web-api");
 function getPhaseKindOfFunction(node) {
   return match(node).when(isFunctionOfUseEffectSetup, () => "setup").when(isFunctionOfUseEffectCleanup, () => "cleanup").when(isFunctionOfComponentDidMount, () => "mount").when(isFunctionOfComponentWillUnmount, () => "unmount").otherwise(() => _);
 }
-function isInstanceIdEqual(context, a, b) {
-  return VAR2.isVariableIdEqual(a, b, [
-    context.sourceCode.getScope(a),
-    context.sourceCode.getScope(b)
-  ]);
-}
 
 // src/rules/no-leaked-event-listener.ts
 var RULE_NAME = "no-leaked-event-listener";
@@ -71,7 +65,7 @@ function getSignalValueExpression(node, initialScope) {
   if (node == null) return _;
   switch (node.type) {
     case AST_NODE_TYPES.Identifier: {
-      return getSignalValueExpression(VAR2.getVariableNode(VAR2.findVariable(node, initialScope), 0), initialScope);
+      return getSignalValueExpression(VAR.getVariableNode(VAR.findVariable(node, initialScope), 0), initialScope);
     }
     case AST_NODE_TYPES.MemberExpression:
       return node;
@@ -81,7 +75,7 @@ function getSignalValueExpression(node, initialScope) {
 }
 function getOptions(node, initialScope) {
   function findProp(properties, propName) {
-    return VAR2.findPropertyInProperties(propName, properties, initialScope);
+    return VAR.findPropertyInProperties(propName, properties, initialScope);
   }
   function getPropValue(prop, filter = (a) => true) {
     if (prop?.type !== AST_NODE_TYPES.Property) return _;
@@ -93,7 +87,7 @@ function getOptions(node, initialScope) {
         break;
       }
       default: {
-        v = VAR2.toStaticValue({ kind: "lazy", node: value, initialScope }).value;
+        v = VAR.toStaticValue({ kind: "lazy", node: value, initialScope }).value;
         break;
       }
     }
@@ -102,8 +96,8 @@ function getOptions(node, initialScope) {
   function getOpts(node2) {
     switch (node2.type) {
       case AST_NODE_TYPES.Identifier: {
-        const variable = VAR2.findVariable(node2, initialScope);
-        const variableNode = VAR2.getVariableNode(variable, 0);
+        const variable = VAR.findVariable(node2, initialScope);
+        const variableNode = VAR.getVariableNode(variable, 0);
         if (variableNode?.type === AST_NODE_TYPES.ObjectExpression) {
           return getOpts(variableNode);
         }
@@ -167,7 +161,7 @@ var no_leaked_event_listener_default = createRule({
       if (!isInversePhase(aPhase, rPhase)) {
         return false;
       }
-      return isSameObject(aCallee, rCallee) && AST.isNodeEqual(aListener, rListener) && VAR2.isNodeValueEqual(aType, rType, [
+      return isSameObject(aCallee, rCallee) && AST.isNodeEqual(aListener, rListener) && VAR.isNodeValueEqual(aType, rType, [
         context.sourceCode.getScope(aType),
         context.sourceCode.getScope(rType)
       ]) && aCapture === rCapture;
@@ -331,7 +325,7 @@ var no_leaked_interval_default = createRule({
             if (!ERPhaseRelevance.has(fEntry.kind)) {
               break;
             }
-            const intervalIdNode = VAR2.getVariableDeclaratorId(node);
+            const intervalIdNode = VAR.getVariableDeclaratorId(node);
             if (intervalIdNode == null) {
               context.report({
                 messageId: "expectedIntervalId",
@@ -415,7 +409,7 @@ function isFromObserver(context, node) {
   switch (true) {
     case node.type === AST_NODE_TYPES.Identifier: {
       const initialScope = context.sourceCode.getScope(node);
-      const object = VAR2.getVariableNode(VAR2.findVariable(node, initialScope), 0);
+      const object = VAR.getVariableNode(VAR.findVariable(node, initialScope), 0);
       return isNewResizeObserver(object);
     }
     case node.type === AST_NODE_TYPES.MemberExpression:
@@ -526,7 +520,7 @@ var no_leaked_resize_observer_default = createRule({
         if (!isNewResizeObserver(node)) {
           return;
         }
-        const id = VAR2.getVariableId(node);
+        const id = getInstanceId(node);
         if (id == null) {
           context.report({
             messageId: "unexpectedFloatingInstance",
@@ -621,7 +615,7 @@ var no_leaked_timeout_default = createRule({
         }
         switch (getCallKind4(node)) {
           case "setTimeout": {
-            const timeoutIdNode = VAR2.getVariableDeclaratorId(node);
+            const timeoutIdNode = VAR.getVariableDeclaratorId(node);
             if (timeoutIdNode == null) {
               context.report({
                 messageId: "expectedTimeoutId",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-web-api",
-  "version": "1.28.1-next.5",
+  "version": "1.28.1-next.6",
   "description": "ESLint React's ESLint plugin for interacting with Web APIs",
   "keywords": [
     "react",
@@ -48,12 +48,12 @@
     "@typescript-eslint/utils": "^8.25.0",
     "string-ts": "^2.2.1",
     "ts-pattern": "^5.6.2",
-    "@eslint-react/ast": "1.28.1-next.5",
-    "@eslint-react/core": "1.28.1-next.5",
-    "@eslint-react/jsx": "1.28.1-next.5",
-    "@eslint-react/eff": "1.28.1-next.5",
-    "@eslint-react/shared": "1.28.1-next.5",
-    "@eslint-react/var": "1.28.1-next.5"
+    "@eslint-react/ast": "1.28.1-next.6",
+    "@eslint-react/core": "1.28.1-next.6",
+    "@eslint-react/eff": "1.28.1-next.6",
+    "@eslint-react/jsx": "1.28.1-next.6",
+    "@eslint-react/shared": "1.28.1-next.6",
+    "@eslint-react/var": "1.28.1-next.6"
   },
   "devDependencies": {
     "@types/react": "^19.0.10",