eslint-plugin-zod 3.5.2 → 3.5.4

package/dist/rules/no-empty-custom-schema.cjs

@@ -15,14 +15,16 @@ const noEmptyCustomSchema = require_create_plugin_rule.createZodPluginRule({
 	},
 	defaultOptions: [],
 	create(context) {
-		const { importDeclarationListener, detectZodSchemaRootNode } = trackZodSchemaImports();
+		const { importDeclarationListener, detectZodSchemaRootNode, collectZodChainMethods } = trackZodSchemaImports();
 		return {
 			ImportDeclaration: importDeclarationListener,
 			CallExpression(node) {
 				const zodSchemaMeta = detectZodSchemaRootNode(node);
 				if (!zodSchemaMeta) return;
-				if (zodSchemaMeta.schemaType === "custom" && node.arguments.length === 0) context.report({
-					node,
+				if (zodSchemaMeta.schemaType !== "custom") return;
+				const customCallNode = collectZodChainMethods(node).find((method) => method.name === "custom")?.node;
+				if (customCallNode?.arguments.length === 0) context.report({
+					node: customCallNode,
 					messageId: "noEmptyCustomSchema"
 				});
 			}

package/dist/rules/no-empty-custom-schema.mjs

@@ -16,14 +16,16 @@ const noEmptyCustomSchema = createZodPluginRule({
 	},
 	defaultOptions: [],
 	create(context) {
-		const { importDeclarationListener, detectZodSchemaRootNode } = trackZodSchemaImports();
+		const { importDeclarationListener, detectZodSchemaRootNode, collectZodChainMethods } = trackZodSchemaImports();
 		return {
 			ImportDeclaration: importDeclarationListener,
 			CallExpression(node) {
 				const zodSchemaMeta = detectZodSchemaRootNode(node);
 				if (!zodSchemaMeta) return;
-				if (zodSchemaMeta.schemaType === "custom" && node.arguments.length === 0) context.report({
-					node,
+				if (zodSchemaMeta.schemaType !== "custom") return;
+				const customCallNode = collectZodChainMethods(node).find((method) => method.name === "custom")?.node;
+				if (customCallNode?.arguments.length === 0) context.report({
+					node: customCallNode,
 					messageId: "noEmptyCustomSchema"
 				});
 			}

package/dist/rules/prefer-string-schema-with-trim.cjs

@@ -1,6 +1,8 @@
 const require_create_plugin_rule = require("../utils/create-plugin-rule.cjs");
+const require_track_zod_schema_imports = require("../utils/track-zod-schema-imports.cjs");
+const require_find_parent_schema_matching_condition = require("../utils/find-parent-schema-matching-condition.cjs");
 //#region src/rules/prefer-string-schema-with-trim.ts
-const { zodImportAllowedSource, trackZodSchemaImports } = require("../utils/track-zod-schema-imports.cjs").createZodSchemaImportTrack("zod");
+const { zodImportAllowedSource, trackZodSchemaImports } = require_track_zod_schema_imports.createZodSchemaImportTrack("zod");
 const preferStringSchemaWithTrim = require_create_plugin_rule.createZodPluginRule({
 	name: "prefer-string-schema-with-trim",
 	meta: {
@@ -21,6 +23,10 @@ const preferStringSchemaWithTrim = require_create_plugin_rule.createZodPluginRul
 			CallExpression(node) {
 				const zodSchemaMeta = detectZodSchemaRootNode(node);
 				if (zodSchemaMeta?.schemaType !== "string") return;
+				if (require_find_parent_schema_matching_condition.findParentSchemaMatchingCondition(zodSchemaMeta.node, {
+					schemaName: "record",
+					condition: (callParent) => callParent.arguments.length > 0 && callParent.arguments[0] === zodSchemaMeta.node
+				})) return;
 				const methods = collectZodChainMethods(zodSchemaMeta.node);
 				if (methods.some((it) => it.name === "trim")) return;
 				if (zodSchemaMeta.schemaDecl === "named") {

package/dist/rules/prefer-string-schema-with-trim.mjs

@@ -1,5 +1,6 @@
 import { createZodPluginRule } from "../utils/create-plugin-rule.mjs";
 import { createZodSchemaImportTrack } from "../utils/track-zod-schema-imports.mjs";
+import { findParentSchemaMatchingCondition } from "../utils/find-parent-schema-matching-condition.mjs";
 //#region src/rules/prefer-string-schema-with-trim.ts
 const { zodImportAllowedSource, trackZodSchemaImports } = createZodSchemaImportTrack("zod");
 const preferStringSchemaWithTrim = createZodPluginRule({
@@ -22,6 +23,10 @@ const preferStringSchemaWithTrim = createZodPluginRule({
 			CallExpression(node) {
 				const zodSchemaMeta = detectZodSchemaRootNode(node);
 				if (zodSchemaMeta?.schemaType !== "string") return;
+				if (findParentSchemaMatchingCondition(zodSchemaMeta.node, {
+					schemaName: "record",
+					condition: (callParent) => callParent.arguments.length > 0 && callParent.arguments[0] === zodSchemaMeta.node
+				})) return;
 				const methods = collectZodChainMethods(zodSchemaMeta.node);
 				if (methods.some((it) => it.name === "trim")) return;
 				if (zodSchemaMeta.schemaDecl === "named") {

package/dist/rules/require-error-message.cjs

@@ -27,19 +27,20 @@ const requireErrorMessage = require_create_plugin_rule.createZodPluginRule({
 			ImportDeclaration: importDeclarationListener,
 			CallExpression(node) {
 				if (!detectZodSchemaRootNode(node)) return;
-				const refine = collectZodChainMethods(node).find((it) => it.name === "refine" || it.name === "custom");
-				if (!refine) return;
-				const refineNode = refine.node;
-				if (refineNode.arguments.length < 2) {
-					context.report({
-						messageId: "requireErrorMessage",
-						node: node.callee
-					});
-					return;
-				}
-				const [, params] = refineNode.arguments;
-				if (params.type === _typescript_eslint_utils.AST_NODE_TYPES.Literal) return;
-				if (params.type === _typescript_eslint_utils.AST_NODE_TYPES.ObjectExpression) {
+				const refines = collectZodChainMethods(node).filter((it) => it.name === "refine" || it.name === "custom");
+				if (refines.length === 0) return;
+				for (const refine of refines) {
+					const refineNode = refine.node;
+					if (refineNode.arguments.length < 2) {
+						context.report({
+							messageId: "requireErrorMessage",
+							node: refineNode
+						});
+						continue;
+					}
+					const [, params] = refineNode.arguments;
+					if (params.type === _typescript_eslint_utils.AST_NODE_TYPES.Literal) continue;
+					if (params.type !== _typescript_eslint_utils.AST_NODE_TYPES.ObjectExpression) continue;
 					let errorPropertyNode;
 					let messagePropertyNode;
 					for (const property of params.properties) if (property.type === _typescript_eslint_utils.AST_NODE_TYPES.Property && property.key.type === _typescript_eslint_utils.AST_NODE_TYPES.Identifier) {
@@ -59,7 +60,7 @@ const requireErrorMessage = require_create_plugin_rule.createZodPluginRule({
 								return fixer.removeRange([messagePropertyNode.range[0], end]);
 							}
 						});
-						return;
+						continue;
 					}
 					if (messagePropertyNode && !errorPropertyNode) {
 						context.report({
@@ -69,7 +70,7 @@ const requireErrorMessage = require_create_plugin_rule.createZodPluginRule({
 								return fixer.replaceTextRange(messagePropertyNode.key.range, "error");
 							}
 						});
-						return;
+						continue;
 					}
 					if (!errorPropertyNode) context.report({
 						messageId: "requireErrorMessage",

package/dist/rules/require-error-message.mjs

@@ -26,19 +26,20 @@ const requireErrorMessage = createZodPluginRule({
 			ImportDeclaration: importDeclarationListener,
 			CallExpression(node) {
 				if (!detectZodSchemaRootNode(node)) return;
-				const refine = collectZodChainMethods(node).find((it) => it.name === "refine" || it.name === "custom");
-				if (!refine) return;
-				const refineNode = refine.node;
-				if (refineNode.arguments.length < 2) {
-					context.report({
-						messageId: "requireErrorMessage",
-						node: node.callee
-					});
-					return;
-				}
-				const [, params] = refineNode.arguments;
-				if (params.type === AST_NODE_TYPES.Literal) return;
-				if (params.type === AST_NODE_TYPES.ObjectExpression) {
+				const refines = collectZodChainMethods(node).filter((it) => it.name === "refine" || it.name === "custom");
+				if (refines.length === 0) return;
+				for (const refine of refines) {
+					const refineNode = refine.node;
+					if (refineNode.arguments.length < 2) {
+						context.report({
+							messageId: "requireErrorMessage",
+							node: refineNode
+						});
+						continue;
+					}
+					const [, params] = refineNode.arguments;
+					if (params.type === AST_NODE_TYPES.Literal) continue;
+					if (params.type !== AST_NODE_TYPES.ObjectExpression) continue;
 					let errorPropertyNode;
 					let messagePropertyNode;
 					for (const property of params.properties) if (property.type === AST_NODE_TYPES.Property && property.key.type === AST_NODE_TYPES.Identifier) {
@@ -58,7 +59,7 @@ const requireErrorMessage = createZodPluginRule({
 								return fixer.removeRange([messagePropertyNode.range[0], end]);
 							}
 						});
-						return;
+						continue;
 					}
 					if (messagePropertyNode && !errorPropertyNode) {
 						context.report({
@@ -68,7 +69,7 @@ const requireErrorMessage = createZodPluginRule({
 								return fixer.replaceTextRange(messagePropertyNode.key.range, "error");
 							}
 						});
-						return;
+						continue;
 					}
 					if (!errorPropertyNode) context.report({
 						messageId: "requireErrorMessage",

package/dist/utils/find-parent-schema-matching-condition.cjs

@@ -0,0 +1,25 @@
+require("../_virtual/_rolldown/runtime.cjs");
+let _typescript_eslint_utils = require("@typescript-eslint/utils");
+//#region src/utils/find-parent-schema-matching-condition.ts
+function findParentSchemaMatchingCondition(outermostNode, options) {
+	const { schemaName, condition } = options;
+	let current = outermostNode;
+	while (current.parent) {
+		const { parent } = current;
+		if (parent.type === _typescript_eslint_utils.AST_NODE_TYPES.CallExpression) {
+			const callParent = parent;
+			if (callParent.callee.type === _typescript_eslint_utils.AST_NODE_TYPES.MemberExpression) {
+				const memberExpr = callParent.callee;
+				if ((memberExpr.property.type === _typescript_eslint_utils.AST_NODE_TYPES.Identifier ? memberExpr.property.name : null) === schemaName) return condition(callParent);
+			}
+		}
+		if (parent.type === _typescript_eslint_utils.AST_NODE_TYPES.MemberExpression) {
+			current = parent;
+			continue;
+		}
+		current = parent;
+	}
+	return false;
+}
+//#endregion
+exports.findParentSchemaMatchingCondition = findParentSchemaMatchingCondition;

package/dist/utils/find-parent-schema-matching-condition.mjs

@@ -0,0 +1,24 @@
+import { AST_NODE_TYPES } from "@typescript-eslint/utils";
+//#region src/utils/find-parent-schema-matching-condition.ts
+function findParentSchemaMatchingCondition(outermostNode, options) {
+	const { schemaName, condition } = options;
+	let current = outermostNode;
+	while (current.parent) {
+		const { parent } = current;
+		if (parent.type === AST_NODE_TYPES.CallExpression) {
+			const callParent = parent;
+			if (callParent.callee.type === AST_NODE_TYPES.MemberExpression) {
+				const memberExpr = callParent.callee;
+				if ((memberExpr.property.type === AST_NODE_TYPES.Identifier ? memberExpr.property.name : null) === schemaName) return condition(callParent);
+			}
+		}
+		if (parent.type === AST_NODE_TYPES.MemberExpression) {
+			current = parent;
+			continue;
+		}
+		current = parent;
+	}
+	return false;
+}
+//#endregion
+export { findParentSchemaMatchingCondition };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-zod",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "type": "module",
   "description": "ESLint plugin that adds custom linting rules to enforce best practices when using Zod",
   "engines": {