eslint-plugin-zod 3.0.1 → 3.0.2

package/dist/rules/array-style.cjs

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrayStyle = void 0;
 const utils_1 = require("@typescript-eslint/utils");
 const meta_js_1 = require("../meta.cjs");
-const is_zod_expression_js_1 = require("../utils/is-zod-expression.cjs");
 const track_zod_schema_imports_js_1 = require("../utils/track-zod-schema-imports.cjs");
 const ZOD_ARRAY_STYLES = ['function', 'method'];
 const defaultOptions = { style: 'function' };
@@ -74,14 +73,17 @@ exports.arrayStyle = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRuleURL)({
                     }
                     return;
                 }
-                const { callee } = node;
-                if ((0, is_zod_expression_js_1.isZodExpressionEndingWithMethod)(callee, 'array') &&
-                    node.arguments.length === 0) {
+                const methods = collectZodChainMethods(node);
+                const arrayMethod = methods.find((it) => it.name === 'array' &&
+                    it.node.arguments.length === 0);
+                if (arrayMethod) {
+                    const arrayNode = arrayMethod.node;
                     if (schemaDecl === 'namespace') {
                         context.report({
                             node,
                             messageId: 'useFunction',
                             fix(fixer) {
+                                const callee = arrayNode.callee;
                                 const objText = sourceCode.getText(callee.object);
                                 return fixer.replaceText(node, `z.array(${objText})`);
                             },

package/dist/rules/array-style.js

@@ -1,6 +1,5 @@
 import { ESLintUtils } from '@typescript-eslint/utils';
 import { getRuleURL } from "../meta.js";
-import { isZodExpressionEndingWithMethod } from "../utils/is-zod-expression.js";
 import { trackZodSchemaImports } from "../utils/track-zod-schema-imports.js";
 const ZOD_ARRAY_STYLES = ['function', 'method'];
 const defaultOptions = { style: 'function' };
@@ -71,14 +70,17 @@ export const arrayStyle = ESLintUtils.RuleCreator(getRuleURL)({
                     }
                     return;
                 }
-                const { callee } = node;
-                if (isZodExpressionEndingWithMethod(callee, 'array') &&
-                    node.arguments.length === 0) {
+                const methods = collectZodChainMethods(node);
+                const arrayMethod = methods.find((it) => it.name === 'array' &&
+                    it.node.arguments.length === 0);
+                if (arrayMethod) {
+                    const arrayNode = arrayMethod.node;
                     if (schemaDecl === 'namespace') {
                         context.report({
                             node,
                             messageId: 'useFunction',
                             fix(fixer) {
+                                const callee = arrayNode.callee;
                                 const objText = sourceCode.getText(callee.object);
                                 return fixer.replaceText(node, `z.array(${objText})`);
                             },

package/dist/rules/no-number-schema-with-int.cjs

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.noNumberSchemaWithInt = void 0;
 const utils_1 = require("@typescript-eslint/utils");
 const meta_js_1 = require("../meta.cjs");
-const get_outermost_call_js_1 = require("../utils/get-outermost-call.cjs");
 const track_zod_schema_imports_js_1 = require("../utils/track-zod-schema-imports.cjs");
 exports.noNumberSchemaWithInt = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRuleURL)({
     name: 'no-number-schema-with-int',
@@ -25,26 +24,18 @@ exports.noNumberSchemaWithInt = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRul
         return {
             ImportDeclaration: importDeclarationListener,
             CallExpression(node) {
-                var _a;
-                const outer = (_a = (0, get_outermost_call_js_1.getOutermostCall)(node)) !== null && _a !== void 0 ? _a : node;
-                const zodSchemaMeta = detectZodSchemaRootNode(outer);
-                if (!zodSchemaMeta) {
+                const zodSchemaMeta = detectZodSchemaRootNode(node);
+                if ((zodSchemaMeta === null || zodSchemaMeta === void 0 ? void 0 : zodSchemaMeta.schemaType) !== 'number') {
                     return;
                 }
-                if (zodSchemaMeta.schemaType !== 'number') {
-                    return;
-                }
-                const methods = collectZodChainMethods(outer);
+                const methods = collectZodChainMethods(node);
                 const numberIndex = methods.findIndex((m) => m.name === 'number');
                 const intIndex = methods.findIndex((m) => m.name === 'int');
                 if (numberIndex === -1 || intIndex === -1) {
                     return;
                 }
-                const numberMethod = methods[numberIndex];
-                const intMethod = methods[intIndex];
-                if (node !== intMethod.node) {
-                    return;
-                }
+                const numberNode = methods[numberIndex].node;
+                const intNode = methods[intIndex].node;
                 if (zodSchemaMeta.schemaDecl === 'named') {
                     context.report({
                         node,
@@ -56,8 +47,6 @@ exports.noNumberSchemaWithInt = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRul
                     node,
                     messageId: 'removeNumber',
                     fix(fixer) {
-                        const numberNode = numberMethod.node;
-                        const intNode = intMethod.node;
                         const numberCallee = numberNode.callee;
                         const prefixObj = numberCallee.object;
                         const prefixText = sourceCode.getText(prefixObj);

package/dist/rules/no-number-schema-with-int.js

@@ -1,6 +1,5 @@
 import { ESLintUtils } from '@typescript-eslint/utils';
 import { getRuleURL } from "../meta.js";
-import { getOutermostCall } from "../utils/get-outermost-call.js";
 import { trackZodSchemaImports } from "../utils/track-zod-schema-imports.js";
 export const noNumberSchemaWithInt = ESLintUtils.RuleCreator(getRuleURL)({
     name: 'no-number-schema-with-int',
@@ -22,26 +21,18 @@ export const noNumberSchemaWithInt = ESLintUtils.RuleCreator(getRuleURL)({
         return {
             ImportDeclaration: importDeclarationListener,
             CallExpression(node) {
-                var _a;
-                const outer = (_a = getOutermostCall(node)) !== null && _a !== void 0 ? _a : node;
-                const zodSchemaMeta = detectZodSchemaRootNode(outer);
-                if (!zodSchemaMeta) {
+                const zodSchemaMeta = detectZodSchemaRootNode(node);
+                if ((zodSchemaMeta === null || zodSchemaMeta === void 0 ? void 0 : zodSchemaMeta.schemaType) !== 'number') {
                     return;
                 }
-                if (zodSchemaMeta.schemaType !== 'number') {
-                    return;
-                }
-                const methods = collectZodChainMethods(outer);
+                const methods = collectZodChainMethods(node);
                 const numberIndex = methods.findIndex((m) => m.name === 'number');
                 const intIndex = methods.findIndex((m) => m.name === 'int');
                 if (numberIndex === -1 || intIndex === -1) {
                     return;
                 }
-                const numberMethod = methods[numberIndex];
-                const intMethod = methods[intIndex];
-                if (node !== intMethod.node) {
-                    return;
-                }
+                const numberNode = methods[numberIndex].node;
+                const intNode = methods[intIndex].node;
                 if (zodSchemaMeta.schemaDecl === 'named') {
                     context.report({
                         node,
@@ -53,8 +44,6 @@ export const noNumberSchemaWithInt = ESLintUtils.RuleCreator(getRuleURL)({
                     node,
                     messageId: 'removeNumber',
                     fix(fixer) {
-                        const numberNode = numberMethod.node;
-                        const intNode = intMethod.node;
                         const numberCallee = numberNode.callee;
                         const prefixObj = numberCallee.object;
                         const prefixText = sourceCode.getText(prefixObj);

package/dist/rules/no-throw-in-refine.cjs

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.noThrowInRefine = void 0;
 const utils_1 = require("@typescript-eslint/utils");
 const meta_js_1 = require("../meta.cjs");
-const is_zod_expression_js_1 = require("../utils/is-zod-expression.cjs");
 const track_zod_schema_imports_js_1 = require("../utils/track-zod-schema-imports.cjs");
 exports.noThrowInRefine = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRuleURL)({
     name: 'no-throw-in-refine',
@@ -19,7 +18,7 @@ exports.noThrowInRefine = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRuleURL)(
     },
     defaultOptions: [],
     create(context) {
-        const { importDeclarationListener, detectZodSchemaRootNode, } = (0, track_zod_schema_imports_js_1.trackZodSchemaImports)();
+        const { importDeclarationListener, detectZodSchemaRootNode, collectZodChainMethods, } = (0, track_zod_schema_imports_js_1.trackZodSchemaImports)();
         function checkNode(node) {
             if (!node) {
                 return;
@@ -71,12 +70,15 @@ exports.noThrowInRefine = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRuleURL)(
                 if (!zodSchemaMeta) {
                     return;
                 }
-                if ((0, is_zod_expression_js_1.isZodExpressionEndingWithMethod)(node.callee, 'refine')) {
-                    const [callback] = node.arguments;
-                    if (callback.type === utils_1.AST_NODE_TYPES.ArrowFunctionExpression ||
-                        callback.type === utils_1.AST_NODE_TYPES.FunctionExpression) {
-                        checkNode(callback.body);
-                    }
+                const methods = collectZodChainMethods(node);
+                const refineMethod = methods.find((it) => it.name === 'refine');
+                if (!refineMethod) {
+                    return;
+                }
+                const [callback] = refineMethod.node.arguments;
+                if (callback.type === utils_1.AST_NODE_TYPES.ArrowFunctionExpression ||
+                    callback.type === utils_1.AST_NODE_TYPES.FunctionExpression) {
+                    checkNode(callback.body);
                 }
             },
         };

package/dist/rules/no-throw-in-refine.js

@@ -1,6 +1,5 @@
 import { AST_NODE_TYPES, ESLintUtils } from '@typescript-eslint/utils';
 import { getRuleURL } from "../meta.js";
-import { isZodExpressionEndingWithMethod } from "../utils/is-zod-expression.js";
 import { trackZodSchemaImports } from "../utils/track-zod-schema-imports.js";
 export const noThrowInRefine = ESLintUtils.RuleCreator(getRuleURL)({
     name: 'no-throw-in-refine',
@@ -16,7 +15,7 @@ export const noThrowInRefine = ESLintUtils.RuleCreator(getRuleURL)({
     },
     defaultOptions: [],
     create(context) {
-        const { importDeclarationListener, detectZodSchemaRootNode, } = trackZodSchemaImports();
+        const { importDeclarationListener, detectZodSchemaRootNode, collectZodChainMethods, } = trackZodSchemaImports();
         function checkNode(node) {
             if (!node) {
                 return;
@@ -68,12 +67,15 @@ export const noThrowInRefine = ESLintUtils.RuleCreator(getRuleURL)({
                 if (!zodSchemaMeta) {
                     return;
                 }
-                if (isZodExpressionEndingWithMethod(node.callee, 'refine')) {
-                    const [callback] = node.arguments;
-                    if (callback.type === AST_NODE_TYPES.ArrowFunctionExpression ||
-                        callback.type === AST_NODE_TYPES.FunctionExpression) {
-                        checkNode(callback.body);
-                    }
+                const methods = collectZodChainMethods(node);
+                const refineMethod = methods.find((it) => it.name === 'refine');
+                if (!refineMethod) {
+                    return;
+                }
+                const [callback] = refineMethod.node.arguments;
+                if (callback.type === AST_NODE_TYPES.ArrowFunctionExpression ||
+                    callback.type === AST_NODE_TYPES.FunctionExpression) {
+                    checkNode(callback.body);
                 }
             },
         };

package/dist/rules/prefer-enum-over-literal-union.cjs

@@ -19,7 +19,7 @@ exports.preferEnumOverLiteralUnion = utils_1.ESLintUtils.RuleCreator(meta_js_1.g
     },
     defaultOptions: [],
     create(context) {
-        const { importDeclarationListener, detectZodSchemaRootNode, } = (0, track_zod_schema_imports_js_1.trackZodSchemaImports)();
+        const { importDeclarationListener, detectZodSchemaRootNode, collectZodChainMethods, } = (0, track_zod_schema_imports_js_1.trackZodSchemaImports)();
         return {
             ImportDeclaration: importDeclarationListener,
             CallExpression(node) {
@@ -27,7 +27,13 @@ exports.preferEnumOverLiteralUnion = utils_1.ESLintUtils.RuleCreator(meta_js_1.g
                 if ((zodSchema === null || zodSchema === void 0 ? void 0 : zodSchema.schemaType) !== 'union') {
                     return;
                 }
-                const unionArgument = node.arguments.at(0);
+                const methods = collectZodChainMethods(zodSchema.node);
+                const union = methods.find((it) => it.name === 'union');
+                if (!union) {
+                    return;
+                }
+                const unionNode = union.node;
+                const unionArgument = unionNode.arguments.at(0);
                 if ((unionArgument === null || unionArgument === void 0 ? void 0 : unionArgument.type) !== utils_1.AST_NODE_TYPES.ArrayExpression) {
                     return;
                 }
@@ -61,8 +67,8 @@ exports.preferEnumOverLiteralUnion = utils_1.ESLintUtils.RuleCreator(meta_js_1.g
                     messageId: 'useEnum',
                     fix(fixer) {
                         return [
-                            fixer.replaceText(node.callee.property, 'enum'),
-                            fixer.replaceText(node.arguments[0], `[${zodLiteralStrings.join(', ')}]`),
+                            fixer.replaceText(unionNode.callee.property, 'enum'),
+                            fixer.replaceText(unionNode.arguments[0], `[${zodLiteralStrings.join(', ')}]`),
                         ];
                     },
                 });

package/dist/rules/prefer-enum-over-literal-union.js

@@ -16,7 +16,7 @@ export const preferEnumOverLiteralUnion = ESLintUtils.RuleCreator(getRuleURL)({
     },
     defaultOptions: [],
     create(context) {
-        const { importDeclarationListener, detectZodSchemaRootNode, } = trackZodSchemaImports();
+        const { importDeclarationListener, detectZodSchemaRootNode, collectZodChainMethods, } = trackZodSchemaImports();
         return {
             ImportDeclaration: importDeclarationListener,
             CallExpression(node) {
@@ -24,7 +24,13 @@ export const preferEnumOverLiteralUnion = ESLintUtils.RuleCreator(getRuleURL)({
                 if ((zodSchema === null || zodSchema === void 0 ? void 0 : zodSchema.schemaType) !== 'union') {
                     return;
                 }
-                const unionArgument = node.arguments.at(0);
+                const methods = collectZodChainMethods(zodSchema.node);
+                const union = methods.find((it) => it.name === 'union');
+                if (!union) {
+                    return;
+                }
+                const unionNode = union.node;
+                const unionArgument = unionNode.arguments.at(0);
                 if ((unionArgument === null || unionArgument === void 0 ? void 0 : unionArgument.type) !== AST_NODE_TYPES.ArrayExpression) {
                     return;
                 }
@@ -58,8 +64,8 @@ export const preferEnumOverLiteralUnion = ESLintUtils.RuleCreator(getRuleURL)({
                     messageId: 'useEnum',
                     fix(fixer) {
                         return [
-                            fixer.replaceText(node.callee.property, 'enum'),
-                            fixer.replaceText(node.arguments[0], `[${zodLiteralStrings.join(', ')}]`),
+                            fixer.replaceText(unionNode.callee.property, 'enum'),
+                            fixer.replaceText(unionNode.arguments[0], `[${zodLiteralStrings.join(', ')}]`),
                         ];
                     },
                 });

package/dist/rules/prefer-meta-last.cjs

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.preferMetaLast = void 0;
 const utils_1 = require("@typescript-eslint/utils");
 const meta_js_1 = require("../meta.cjs");
-const get_outermost_call_js_1 = require("../utils/get-outermost-call.cjs");
-const is_zod_expression_js_1 = require("../utils/is-zod-expression.cjs");
 const track_zod_schema_imports_js_1 = require("../utils/track-zod-schema-imports.cjs");
 exports.preferMetaLast = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRuleURL)({
     name: 'prefer-meta-last',
@@ -23,19 +21,11 @@ exports.preferMetaLast = utils_1.ESLintUtils.RuleCreator(meta_js_1.getRuleURL)({
         return {
             ImportDeclaration: importDeclarationListener,
             CallExpression(node) {
-                if (node.callee.type !== utils_1.AST_NODE_TYPES.MemberExpression ||
-                    !(0, is_zod_expression_js_1.isZodExpressionEndingWithMethod)(node.callee, 'meta')) {
-                    return;
-                }
-                const outer = (0, get_outermost_call_js_1.getOutermostCall)(node);
-                if (!outer) {
-                    return;
-                }
-                const zodSchemaMeta = detectZodSchemaRootNode(outer);
-                const chain = collectZodChainMethods(outer);
+                const zodSchemaMeta = detectZodSchemaRootNode(node);
                 if (!zodSchemaMeta) {
                     return;
                 }
+                const chain = collectZodChainMethods(node);
                 const metaIndex = chain.findIndex((c) => c.name === 'meta');
                 if (metaIndex === -1) {
                     return;

package/dist/rules/prefer-meta-last.js

@@ -1,7 +1,5 @@
-import { AST_NODE_TYPES, ESLintUtils } from '@typescript-eslint/utils';
+import { ESLintUtils } from '@typescript-eslint/utils';
 import { getRuleURL } from "../meta.js";
-import { getOutermostCall } from "../utils/get-outermost-call.js";
-import { isZodExpressionEndingWithMethod } from "../utils/is-zod-expression.js";
 import { trackZodSchemaImports } from "../utils/track-zod-schema-imports.js";
 export const preferMetaLast = ESLintUtils.RuleCreator(getRuleURL)({
     name: 'prefer-meta-last',
@@ -20,19 +18,11 @@ export const preferMetaLast = ESLintUtils.RuleCreator(getRuleURL)({
         return {
             ImportDeclaration: importDeclarationListener,
             CallExpression(node) {
-                if (node.callee.type !== AST_NODE_TYPES.MemberExpression ||
-                    !isZodExpressionEndingWithMethod(node.callee, 'meta')) {
-                    return;
-                }
-                const outer = getOutermostCall(node);
-                if (!outer) {
-                    return;
-                }
-                const zodSchemaMeta = detectZodSchemaRootNode(outer);
-                const chain = collectZodChainMethods(outer);
+                const zodSchemaMeta = detectZodSchemaRootNode(node);
                 if (!zodSchemaMeta) {
                     return;
                 }
+                const chain = collectZodChainMethods(node);
                 const metaIndex = chain.findIndex((c) => c.name === 'meta');
                 if (metaIndex === -1) {
                     return;

package/package.json

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

package/dist/utils/get-outermost-call.cjs

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOutermostCall = getOutermostCall;
-const utils_1 = require("@typescript-eslint/utils");
-function getOutermostCall(node) {
-    var _a;
-    let current = node;
-    while (((_a = current.parent) === null || _a === void 0 ? void 0 : _a.type) === utils_1.AST_NODE_TYPES.MemberExpression &&
-        current.parent.object === current &&
-        current.parent.parent.type === utils_1.AST_NODE_TYPES.CallExpression) {
-        current = current.parent.parent;
-    }
-    return current.type === utils_1.AST_NODE_TYPES.CallExpression ? current : null;
-}

package/dist/utils/get-outermost-call.d.cts

@@ -1,2 +0,0 @@
-import type { TSESTree } from '@typescript-eslint/utils';
-export declare function getOutermostCall(node: TSESTree.Node): TSESTree.CallExpression | null;

package/dist/utils/get-outermost-call.d.ts

@@ -1,2 +0,0 @@
-import type { TSESTree } from '@typescript-eslint/utils';
-export declare function getOutermostCall(node: TSESTree.Node): TSESTree.CallExpression | null;

package/dist/utils/get-outermost-call.js

@@ -1,11 +0,0 @@
-import { AST_NODE_TYPES } from '@typescript-eslint/utils';
-export function getOutermostCall(node) {
-    var _a;
-    let current = node;
-    while (((_a = current.parent) === null || _a === void 0 ? void 0 : _a.type) === AST_NODE_TYPES.MemberExpression &&
-        current.parent.object === current &&
-        current.parent.parent.type === AST_NODE_TYPES.CallExpression) {
-        current = current.parent.parent;
-    }
-    return current.type === AST_NODE_TYPES.CallExpression ? current : null;
-}

package/dist/utils/is-zod-expression.cjs

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isZodExpressionEndingWithMethod = isZodExpressionEndingWithMethod;
-const utils_1 = require("@typescript-eslint/utils");
-function isZodExpressionEndingWithMethod(node, propName) {
-    if (node.type !== utils_1.AST_NODE_TYPES.MemberExpression) {
-        return false;
-    }
-    if (node.property.type === utils_1.AST_NODE_TYPES.Identifier &&
-        node.property.name === propName) {
-        return true;
-    }
-    return false;
-}

package/dist/utils/is-zod-expression.d.cts

@@ -1,2 +0,0 @@
-import type { TSESTree } from '@typescript-eslint/utils';
-export declare function isZodExpressionEndingWithMethod(node: TSESTree.Node, propName: string): node is TSESTree.MemberExpression;

package/dist/utils/is-zod-expression.d.ts

@@ -1,2 +0,0 @@
-import type { TSESTree } from '@typescript-eslint/utils';
-export declare function isZodExpressionEndingWithMethod(node: TSESTree.Node, propName: string): node is TSESTree.MemberExpression;

package/dist/utils/is-zod-expression.js

@@ -1,11 +0,0 @@
-import { AST_NODE_TYPES } from '@typescript-eslint/utils';
-export function isZodExpressionEndingWithMethod(node, propName) {
-    if (node.type !== AST_NODE_TYPES.MemberExpression) {
-        return false;
-    }
-    if (node.property.type === AST_NODE_TYPES.Identifier &&
-        node.property.name === propName) {
-        return true;
-    }
-    return false;
-}