eslint-plugin-zod 4.11.0 → 4.12.1

package/dist/rules/array-style.cjs

@@ -1,5 +1,7 @@
 const require_create_plugin_rule = require("../utils/create-plugin-rule.cjs");
+const require_has_zod_runtime_import_root = require("../utils/has-zod-runtime-import-root.cjs");
 let _eslint_zod_utils = require("@eslint-zod/utils");
+let _typescript_eslint_utils = require("@typescript-eslint/utils");
 const arrayStyle = require_create_plugin_rule.createZodPluginRule({
 	name: "array-style",
 	meta: {
@@ -25,6 +27,7 @@ const arrayStyle = require_create_plugin_rule.createZodPluginRule({
 		const { sourceCode } = context;
 		const { createSchemaVisitor, collectZodChainMethods } = _eslint_zod_utils.zodImportScope.createTracker();
 		return createSchemaVisitor({ onSchema(node, zodSchemaMeta) {
+			if (!require_has_zod_runtime_import_root.hasZodRuntimeImportRoot(node, sourceCode)) return;
 			const { schemaDecl, schemaType } = zodSchemaMeta;
 			if (style === "method") {
 				if (schemaType === "array") {
@@ -34,9 +37,10 @@ const arrayStyle = require_create_plugin_rule.createZodPluginRule({
 							messageId: "useMethod",
 							fix(fixer) {
 								const arrayCall = collectZodChainMethods(node).find((c) => c.name === "array");
-								if (!arrayCall) return null;
-								const arg = arrayCall.node.arguments.at(0);
-								if (!arg) return null;
+								if (arrayCall?.node.arguments.length !== 1 || arrayCall.node.typeArguments || arrayCall.node.optional || arrayCall.node.callee.type === _typescript_eslint_utils.AST_NODE_TYPES.MemberExpression && arrayCall.node.callee.optional) return null;
+								const [arg] = arrayCall.node.arguments;
+								if (arg.type !== _typescript_eslint_utils.AST_NODE_TYPES.Identifier && arg.type !== _typescript_eslint_utils.AST_NODE_TYPES.MemberExpression && arg.type !== _typescript_eslint_utils.AST_NODE_TYPES.CallExpression) return null;
+								if (sourceCode.getCommentsInside(arrayCall.node).some((comment) => comment.range[0] < arg.range[0] || comment.range[1] > arg.range[1])) return null;
 								const argText = sourceCode.getText(arg);
 								return fixer.replaceText(arrayCall.node, `${argText}.array()`);
 							}

package/dist/rules/array-style.mjs

@@ -1,5 +1,7 @@
 import { createZodPluginRule } from "../utils/create-plugin-rule.mjs";
+import { hasZodRuntimeImportRoot } from "../utils/has-zod-runtime-import-root.mjs";
 import { zodImportScope } from "@eslint-zod/utils";
+import { AST_NODE_TYPES } from "@typescript-eslint/utils";
 const arrayStyle = createZodPluginRule({
 	name: "array-style",
 	meta: {
@@ -25,6 +27,7 @@ const arrayStyle = createZodPluginRule({
 		const { sourceCode } = context;
 		const { createSchemaVisitor, collectZodChainMethods } = zodImportScope.createTracker();
 		return createSchemaVisitor({ onSchema(node, zodSchemaMeta) {
+			if (!hasZodRuntimeImportRoot(node, sourceCode)) return;
 			const { schemaDecl, schemaType } = zodSchemaMeta;
 			if (style === "method") {
 				if (schemaType === "array") {
@@ -34,9 +37,10 @@ const arrayStyle = createZodPluginRule({
 							messageId: "useMethod",
 							fix(fixer) {
 								const arrayCall = collectZodChainMethods(node).find((c) => c.name === "array");
-								if (!arrayCall) return null;
-								const arg = arrayCall.node.arguments.at(0);
-								if (!arg) return null;
+								if (arrayCall?.node.arguments.length !== 1 || arrayCall.node.typeArguments || arrayCall.node.optional || arrayCall.node.callee.type === AST_NODE_TYPES.MemberExpression && arrayCall.node.callee.optional) return null;
+								const [arg] = arrayCall.node.arguments;
+								if (arg.type !== AST_NODE_TYPES.Identifier && arg.type !== AST_NODE_TYPES.MemberExpression && arg.type !== AST_NODE_TYPES.CallExpression) return null;
+								if (sourceCode.getCommentsInside(arrayCall.node).some((comment) => comment.range[0] < arg.range[0] || comment.range[1] > arg.range[1])) return null;
 								const argText = sourceCode.getText(arg);
 								return fixer.replaceText(arrayCall.node, `${argText}.array()`);
 							}

package/dist/rules/no-transform-in-record-key.cjs

@@ -1,6 +1,5 @@
 const require_create_plugin_rule = require("../utils/create-plugin-rule.cjs");
 let _eslint_zod_utils = require("@eslint-zod/utils");
-let _typescript_eslint_utils = require("@typescript-eslint/utils");
 let _eslint_zod_utils_rule_builders_no_transform_in_record_key = require("@eslint-zod/utils/rule-builders/no-transform-in-record-key");
 //#region src/rules/no-transform-in-record-key.ts
 const TRANSFORM_METHODS = [
@@ -17,10 +16,7 @@ const noTransformInRecordKey = require_create_plugin_rule.createZodPluginRule({
 		schema: []
 	},
 	defaultOptions: [],
-	create: (0, _eslint_zod_utils_rule_builders_no_transform_in_record_key.buildNoTransformInRecordKeyCreate)(_eslint_zod_utils.zodImportScope, { findTransformNode(keySchema, { collectZodChainMethods }) {
-		if (keySchema.type !== _typescript_eslint_utils.AST_NODE_TYPES.CallExpression) return null;
-		return collectZodChainMethods(keySchema).some((method) => TRANSFORM_METHODS.includes(method.name)) ? keySchema : null;
-	} })
+	create: (0, _eslint_zod_utils_rule_builders_no_transform_in_record_key.buildNoTransformInRecordKeyCreate)(_eslint_zod_utils.zodImportScope, TRANSFORM_METHODS)
 });
 //#endregion
 exports.noTransformInRecordKey = noTransformInRecordKey;

package/dist/rules/no-transform-in-record-key.mjs

@@ -1,6 +1,5 @@
 import { createZodPluginRule } from "../utils/create-plugin-rule.mjs";
 import { ZOD_MUTATING_CHECK_NAMES, zodImportScope } from "@eslint-zod/utils";
-import { AST_NODE_TYPES } from "@typescript-eslint/utils";
 import { buildNoTransformInRecordKeyCreate } from "@eslint-zod/utils/rule-builders/no-transform-in-record-key";
 //#region src/rules/no-transform-in-record-key.ts
 const TRANSFORM_METHODS = [
@@ -17,10 +16,7 @@ const noTransformInRecordKey = createZodPluginRule({
 		schema: []
 	},
 	defaultOptions: [],
-	create: buildNoTransformInRecordKeyCreate(zodImportScope, { findTransformNode(keySchema, { collectZodChainMethods }) {
-		if (keySchema.type !== AST_NODE_TYPES.CallExpression) return null;
-		return collectZodChainMethods(keySchema).some((method) => TRANSFORM_METHODS.includes(method.name)) ? keySchema : null;
-	} })
+	create: buildNoTransformInRecordKeyCreate(zodImportScope, TRANSFORM_METHODS)
 });
 //#endregion
 export { noTransformInRecordKey };

package/dist/utils/has-zod-runtime-import-root.cjs

@@ -0,0 +1,21 @@
+let _eslint_zod_utils = require("@eslint-zod/utils");
+let _typescript_eslint_utils = require("@typescript-eslint/utils");
+//#region src/utils/has-zod-runtime-import-root.ts
+/**
+* Whether the identifier a chain starts from resolves to a runtime zod import.
+* Bails on a root that is shadowed, re-assigned, type-only, or imported from another source —
+* every case where a fix would rewrite code that is not zod, or reference a binding erased at runtime.
+*/
+function hasZodRuntimeImportRoot(node, sourceCode) {
+	let root = node;
+	while (root.type === _typescript_eslint_utils.AST_NODE_TYPES.CallExpression || root.type === _typescript_eslint_utils.AST_NODE_TYPES.MemberExpression) root = root.type === _typescript_eslint_utils.AST_NODE_TYPES.CallExpression ? root.callee : root.object;
+	if (root.type !== _typescript_eslint_utils.AST_NODE_TYPES.Identifier) return false;
+	const variable = _typescript_eslint_utils.ASTUtils.findVariable(sourceCode.getScope(root), root);
+	if (variable?.defs.length !== 1) return false;
+	const [definition] = variable.defs;
+	if (definition.type !== _typescript_eslint_utils.TSESLint.Scope.DefinitionType.ImportBinding || definition.parent.type !== _typescript_eslint_utils.AST_NODE_TYPES.ImportDeclaration || definition.parent.importKind === "type" || !_eslint_zod_utils.zodImportScope.isAllowed(definition.parent.source.value)) return false;
+	const specifier = definition.node;
+	return specifier.type === _typescript_eslint_utils.AST_NODE_TYPES.ImportDefaultSpecifier || specifier.type === _typescript_eslint_utils.AST_NODE_TYPES.ImportNamespaceSpecifier || specifier.type === _typescript_eslint_utils.AST_NODE_TYPES.ImportSpecifier && specifier.importKind !== "type";
+}
+//#endregion
+exports.hasZodRuntimeImportRoot = hasZodRuntimeImportRoot;

package/dist/utils/has-zod-runtime-import-root.mjs

@@ -0,0 +1,21 @@
+import { zodImportScope } from "@eslint-zod/utils";
+import { ASTUtils, AST_NODE_TYPES, TSESLint } from "@typescript-eslint/utils";
+//#region src/utils/has-zod-runtime-import-root.ts
+/**
+* Whether the identifier a chain starts from resolves to a runtime zod import.
+* Bails on a root that is shadowed, re-assigned, type-only, or imported from another source —
+* every case where a fix would rewrite code that is not zod, or reference a binding erased at runtime.
+*/
+function hasZodRuntimeImportRoot(node, sourceCode) {
+	let root = node;
+	while (root.type === AST_NODE_TYPES.CallExpression || root.type === AST_NODE_TYPES.MemberExpression) root = root.type === AST_NODE_TYPES.CallExpression ? root.callee : root.object;
+	if (root.type !== AST_NODE_TYPES.Identifier) return false;
+	const variable = ASTUtils.findVariable(sourceCode.getScope(root), root);
+	if (variable?.defs.length !== 1) return false;
+	const [definition] = variable.defs;
+	if (definition.type !== TSESLint.Scope.DefinitionType.ImportBinding || definition.parent.type !== AST_NODE_TYPES.ImportDeclaration || definition.parent.importKind === "type" || !zodImportScope.isAllowed(definition.parent.source.value)) return false;
+	const specifier = definition.node;
+	return specifier.type === AST_NODE_TYPES.ImportDefaultSpecifier || specifier.type === AST_NODE_TYPES.ImportNamespaceSpecifier || specifier.type === AST_NODE_TYPES.ImportSpecifier && specifier.importKind !== "type";
+}
+//#endregion
+export { hasZodRuntimeImportRoot };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-zod",
-  "version": "4.11.0",
+  "version": "4.12.1",
   "description": "ESLint plugin that adds custom linting rules to enforce best practices when using Zod",
   "keywords": [
     "eslint",
@@ -39,9 +39,10 @@
   },
   "dependencies": {
     "@typescript-eslint/utils": "^8.67.0",
-    "@eslint-zod/utils": "3.2.0"
+    "@eslint-zod/utils": "4.0.0"
   },
   "devDependencies": {
+    "@arethetypeswrong/cli": "0.18.5",
     "@typescript-eslint/rule-tester": "8.67.0",
     "dedent": "1.7.2",
     "eslint-doc-generator": "3.7.0",
@@ -70,6 +71,7 @@
   },
   "scripts": {
     "build": "tsdown",
+    "lint:publish": "attw --pack .",
     "build:docs": "pnpm run build && eslint-doc-generator",
     "lint:docs": "eslint-doc-generator --check",
     "test": "vitest"