@eslint-react/var 5.10.3 → 5.11.0

package/dist/index.js

@@ -2,6 +2,7 @@ import { Check, Compare, Extract, Traverse, isOneOf } from "@eslint-react/ast";
 import { DefinitionType } from "@typescript-eslint/scope-manager";
 import { AST_NODE_TYPES } from "@typescript-eslint/types";
 import { findVariable, getStaticValue } from "@typescript-eslint/utils/ast-utils";
+import { P, isMatching } from "ts-pattern";
 
 //#region src/resolve.ts
 /**
@@ -127,18 +128,18 @@ function computeObjectType(context, node) {
 		case AST_NODE_TYPES.CallExpression: {
 			const callee = Extract.unwrap(node.callee);
 			switch (true) {
-				case Check.isIdentifier("Boolean")(callee): return null;
-				case Check.isIdentifier("String")(callee): return null;
-				case Check.isIdentifier("Number")(callee): return null;
-				case Check.isIdentifier("Object")(callee): return {
+				case Check.isIdentifier(callee, "Boolean"): return null;
+				case Check.isIdentifier(callee, "String"): return null;
+				case Check.isIdentifier(callee, "Number"): return null;
+				case Check.isIdentifier(callee, "Object"): return {
 					kind: "plain",
 					node
 				};
-				case Check.isIdentifier("Array")(callee): return {
+				case Check.isIdentifier(callee, "Array"): return {
 					kind: "array",
 					node
 				};
-				case Check.isIdentifier("RegExp")(callee): return {
+				case Check.isIdentifier(callee, "RegExp"): return {
 					kind: "regexp",
 					node
 				};
@@ -287,7 +288,10 @@ function resolveImportSource(name, initialScope, visited = /* @__PURE__ */ new S
 		if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) return resolveImportSource(init.object.name, initialScope, visited);
 		if (init.type === AST_NODE_TYPES.Identifier) return resolveImportSource(init.name, initialScope, visited);
 		const arg0 = getRequireExpressionArguments(init)?.[0];
-		if (arg0 == null || !Check.isStringLiteral(arg0)) return null;
+		if (arg0 == null || !isMatching({
+			type: AST_NODE_TYPES.Literal,
+			value: P.string
+		}, arg0)) return null;
 		return arg0.value;
 	}
 	if (parent?.type === AST_NODE_TYPES.ImportDeclaration) return parent.source.value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/var",
-  "version": "5.10.3",
+  "version": "5.11.0",
   "description": "ESLint React's TSESTree AST utility module for static analysis of variables.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -33,8 +33,8 @@
     "@typescript-eslint/types": "^8.62.1",
     "@typescript-eslint/utils": "^8.62.1",
     "ts-pattern": "^5.9.0",
-    "@eslint-react/ast": "5.10.3",
-    "@eslint-react/eslint": "5.10.3"
+    "@eslint-react/ast": "5.11.0",
+    "@eslint-react/eslint": "5.11.0"
   },
   "devDependencies": {
     "@typescript-eslint/parser": "^8.62.1",