eslint-plugin-zod-utils 1.0.3 → 1.0.5

package/dist/index.cjs

@@ -37,6 +37,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "boolean",
   "cidrv4",
   "cidrv6",
+  "codec",
   "cuid",
   "cuid2",
   "custom",
@@ -46,35 +47,65 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "email",
   "emoji",
   "enum",
+  "exactOptional",
   "file",
+  "float32",
+  "float64",
   "function",
+  "fromJSONSchema",
+  "guid",
+  "hash",
+  "hex",
+  "hostname",
+  "httpUrl",
   "instanceof",
+  "int",
+  "int32",
+  "int64",
   "intersection",
+  "invertCodec",
   "ipv4",
   "ipv6",
+  "json",
   "jwt",
+  "keyof",
   "ksuid",
   "lazy",
   "literal",
+  "looseObject",
+  "looseRecord",
+  "mac",
   "map",
   "nan",
   "nanoid",
   "nativeEnum",
   "never",
+  "nonoptional",
   "null",
   "nullable",
+  "nullish",
   "number",
   "object",
   "optional",
+  "partialRecord",
+  "pipe",
+  "prefault",
   "preprocess",
   "promise",
+  "readonly",
   "record",
   "set",
   "string",
+  "stringFormat",
   "stringbool",
+  "strictObject",
+  "success",
   "symbol",
   "templateLiteral",
+  "transform",
   "tuple",
+  "uint32",
+  "uint64",
   "undefined",
   "union",
   "unknown",
@@ -85,9 +116,21 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "uuidv6",
   "uuidv7",
   "void",
+  "xor",
   "xid"
 ]);
+var ZOD_DIRECT_COMBINATOR_IMPORTS = /* @__PURE__ */ new Set([
+  "catchall",
+  "extend",
+  "merge",
+  "omit",
+  "partial",
+  "pick",
+  "required",
+  "safeExtend"
+]);
 var ZOD_NAMESPACE_IMPORTS = /* @__PURE__ */ new Set(["z", "coerce", "iso"]);
+var ZOD_ISO_FACTORY_IMPORTS = /* @__PURE__ */ new Set(["date", "datetime", "duration", "time"]);
 var ZOD_EXECUTION_METHODS = /* @__PURE__ */ new Set([
   "parse",
   "parseAsync",
@@ -130,6 +173,15 @@ function findVariable(scope, name) {
   }
   return null;
 }
+function getStaticMemberName(node) {
+  if (!node.computed && node.property.type === "Identifier") {
+    return node.property.name;
+  }
+  if (node.computed && node.property.type === "Literal" && typeof node.property.value === "string") {
+    return node.property.value;
+  }
+  return null;
+}
 function getRootIdentifier(node) {
   if (!node) {
     return null;
@@ -161,8 +213,8 @@ function getRootMethodName(node) {
       continue;
     }
     if (current.type === "MemberExpression") {
-      if (current.object.type === "Identifier" && !current.computed && current.property.type === "Identifier") {
-        rootMethodName = current.property.name;
+      if (current.object.type === "Identifier") {
+        rootMethodName = getStaticMemberName(current);
       }
       current = current.object;
       continue;
@@ -170,32 +222,81 @@ function getRootMethodName(node) {
     return rootMethodName;
   }
 }
+function getMemberPathFromRoot(node) {
+  const memberPath = [];
+  let current = node;
+  while (true) {
+    if (current.type === "CallExpression") {
+      current = current.callee;
+      continue;
+    }
+    if (current.type === "ChainExpression") {
+      current = current.expression;
+      continue;
+    }
+    if (current.type === "TSAsExpression" || current.type === "TSNonNullExpression" || current.type === "TSSatisfiesExpression" || current.type === "TSTypeAssertion") {
+      current = current.expression;
+      continue;
+    }
+    if (current.type === "MemberExpression") {
+      const memberName = getStaticMemberName(current);
+      if (memberName === null) {
+        return null;
+      }
+      memberPath.unshift(memberName);
+      current = current.object;
+      continue;
+    }
+    return memberPath;
+  }
+}
 function getCallMethodName(node) {
   const { callee } = node;
-  if (callee.type === "MemberExpression" && !callee.computed && callee.property.type === "Identifier") {
-    return callee.property.name;
+  if (callee.type === "MemberExpression" && getStaticMemberName(callee) !== null) {
+    return getStaticMemberName(callee);
   }
   return null;
 }
-function isZodImportSpecifier(node) {
+function getZodImportKind(node) {
   if (node.type !== "ImportDefaultSpecifier" && node.type !== "ImportNamespaceSpecifier" && node.type !== "ImportSpecifier") {
-    return false;
+    return null;
   }
   const declaration = node.parent;
   if (declaration?.type !== "ImportDeclaration") {
-    return false;
+    return null;
   }
   if (declaration.source.value !== "zod") {
-    return false;
+    return null;
   }
   if (node.type === "ImportDefaultSpecifier" || node.type === "ImportNamespaceSpecifier") {
-    return true;
+    return { importedName: "z", type: "namespace" };
   }
   if (node.importKind === "type" || declaration.importKind === "type") {
-    return false;
+    return null;
   }
   const importedName = node.imported.type === "Identifier" ? node.imported.name : node.imported.value;
-  return ZOD_NAMESPACE_IMPORTS.has(importedName) || ZOD_FACTORY_IMPORTS.has(importedName);
+  if (ZOD_NAMESPACE_IMPORTS.has(importedName)) {
+    return { importedName, type: "namespace" };
+  }
+  if (ZOD_FACTORY_IMPORTS.has(importedName) || ZOD_DIRECT_COMBINATOR_IMPORTS.has(importedName)) {
+    return { type: "factory" };
+  }
+  return null;
+}
+function isZodSchemaNamespaceCall(importName, memberPath) {
+  if (importName === "coerce") {
+    return memberPath[0] !== void 0 && ZOD_FACTORY_IMPORTS.has(memberPath[0]);
+  }
+  if (importName === "iso") {
+    return memberPath[0] !== void 0 && ZOD_ISO_FACTORY_IMPORTS.has(memberPath[0]);
+  }
+  if (memberPath[0] === "coerce") {
+    return memberPath[1] !== void 0 && ZOD_FACTORY_IMPORTS.has(memberPath[1]);
+  }
+  if (memberPath[0] === "iso") {
+    return memberPath[1] !== void 0 && ZOD_ISO_FACTORY_IMPORTS.has(memberPath[1]);
+  }
+  return memberPath[0] !== void 0 && ZOD_FACTORY_IMPORTS.has(memberPath[0]);
 }
 function hasFullTypeInformation(services) {
   return services.program !== null;
@@ -262,7 +363,20 @@ var noInlineZodSchema = import_utils.ESLintUtils.RuleCreator(
       }
       const scope = sourceCode.getScope(root);
       const variable = findVariable(scope, root.name);
-      return variable?.defs.some((definition) => isZodImportSpecifier(definition.node)) ?? false;
+      return variable?.defs.some((definition) => {
+        const importKind = getZodImportKind(definition.node);
+        if (importKind?.type === "factory") {
+          return true;
+        }
+        if (importKind?.type !== "namespace") {
+          return false;
+        }
+        const memberPath = getMemberPathFromRoot(node.callee);
+        if (memberPath === null || memberPath.length === 0) {
+          return false;
+        }
+        return isZodSchemaNamespaceCall(importKind.importedName, memberPath);
+      }) ?? false;
     }
     function isTypedZodSchemaCombinatorCall(node) {
       const rootMethodName = getRootMethodName(node);
@@ -282,6 +396,37 @@ var noInlineZodSchema = import_utils.ESLintUtils.RuleCreator(
     function isSchemaCreationCall(node) {
       return isZodSchemaCall(node) || isTypedZodSchemaCombinatorCall(node);
     }
+    function isInModuleInitializationPath(node) {
+      let current = node;
+      while (current) {
+        if (current.type === "Program") {
+          return true;
+        }
+        if (current.type === "FunctionDeclaration" || current.type === "FunctionExpression" || current.type === "ArrowFunctionExpression") {
+          return false;
+        }
+        if (current.type === "PropertyDefinition" && !current.static) {
+          return false;
+        }
+        current = current.parent;
+      }
+      return false;
+    }
+    function isFunctionExecutedDuringModuleInitialization(node) {
+      if (node.type === "FunctionDeclaration") {
+        return false;
+      }
+      const parent = node.parent;
+      if (parent?.type === "CallExpression") {
+        if (parent.callee === node) {
+          return isInModuleInitializationPath(parent);
+        }
+        if (parent.arguments.includes(node)) {
+          return isInModuleInitializationPath(parent);
+        }
+      }
+      return false;
+    }
     function hasSchemaCreationCallAncestor(node) {
       let current = node.parent;
       while (current) {
@@ -296,7 +441,9 @@ var noInlineZodSchema = import_utils.ESLintUtils.RuleCreator(
       let current = node.parent;
       while (current) {
         if (current.type === "FunctionDeclaration" || current.type === "FunctionExpression" || current.type === "ArrowFunctionExpression") {
-          return true;
+          if (!isFunctionExecutedDuringModuleInitialization(current)) {
+            return true;
+          }
         }
         if (current.type === "PropertyDefinition" && !current.static) {
           return true;
@@ -333,7 +480,7 @@ var rules = {
 var plugin = {
   meta: {
     name: "eslint-plugin-zod-utils",
-    version: "1.0.3"
+    version: "1.0.5"
   },
   rules,
   configs: {}

package/dist/index.js

@@ -9,6 +9,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "boolean",
   "cidrv4",
   "cidrv6",
+  "codec",
   "cuid",
   "cuid2",
   "custom",
@@ -18,35 +19,65 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "email",
   "emoji",
   "enum",
+  "exactOptional",
   "file",
+  "float32",
+  "float64",
   "function",
+  "fromJSONSchema",
+  "guid",
+  "hash",
+  "hex",
+  "hostname",
+  "httpUrl",
   "instanceof",
+  "int",
+  "int32",
+  "int64",
   "intersection",
+  "invertCodec",
   "ipv4",
   "ipv6",
+  "json",
   "jwt",
+  "keyof",
   "ksuid",
   "lazy",
   "literal",
+  "looseObject",
+  "looseRecord",
+  "mac",
   "map",
   "nan",
   "nanoid",
   "nativeEnum",
   "never",
+  "nonoptional",
   "null",
   "nullable",
+  "nullish",
   "number",
   "object",
   "optional",
+  "partialRecord",
+  "pipe",
+  "prefault",
   "preprocess",
   "promise",
+  "readonly",
   "record",
   "set",
   "string",
+  "stringFormat",
   "stringbool",
+  "strictObject",
+  "success",
   "symbol",
   "templateLiteral",
+  "transform",
   "tuple",
+  "uint32",
+  "uint64",
   "undefined",
   "union",
   "unknown",
@@ -57,9 +88,21 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "uuidv6",
   "uuidv7",
   "void",
+  "xor",
   "xid"
 ]);
+var ZOD_DIRECT_COMBINATOR_IMPORTS = /* @__PURE__ */ new Set([
+  "catchall",
+  "extend",
+  "merge",
+  "omit",
+  "partial",
+  "pick",
+  "required",
+  "safeExtend"
+]);
 var ZOD_NAMESPACE_IMPORTS = /* @__PURE__ */ new Set(["z", "coerce", "iso"]);
+var ZOD_ISO_FACTORY_IMPORTS = /* @__PURE__ */ new Set(["date", "datetime", "duration", "time"]);
 var ZOD_EXECUTION_METHODS = /* @__PURE__ */ new Set([
   "parse",
   "parseAsync",
@@ -102,6 +145,15 @@ function findVariable(scope, name) {
   }
   return null;
 }
+function getStaticMemberName(node) {
+  if (!node.computed && node.property.type === "Identifier") {
+    return node.property.name;
+  }
+  if (node.computed && node.property.type === "Literal" && typeof node.property.value === "string") {
+    return node.property.value;
+  }
+  return null;
+}
 function getRootIdentifier(node) {
   if (!node) {
     return null;
@@ -133,8 +185,8 @@ function getRootMethodName(node) {
       continue;
     }
     if (current.type === "MemberExpression") {
-      if (current.object.type === "Identifier" && !current.computed && current.property.type === "Identifier") {
-        rootMethodName = current.property.name;
+      if (current.object.type === "Identifier") {
+        rootMethodName = getStaticMemberName(current);
       }
       current = current.object;
       continue;
@@ -142,32 +194,81 @@ function getRootMethodName(node) {
     return rootMethodName;
   }
 }
+function getMemberPathFromRoot(node) {
+  const memberPath = [];
+  let current = node;
+  while (true) {
+    if (current.type === "CallExpression") {
+      current = current.callee;
+      continue;
+    }
+    if (current.type === "ChainExpression") {
+      current = current.expression;
+      continue;
+    }
+    if (current.type === "TSAsExpression" || current.type === "TSNonNullExpression" || current.type === "TSSatisfiesExpression" || current.type === "TSTypeAssertion") {
+      current = current.expression;
+      continue;
+    }
+    if (current.type === "MemberExpression") {
+      const memberName = getStaticMemberName(current);
+      if (memberName === null) {
+        return null;
+      }
+      memberPath.unshift(memberName);
+      current = current.object;
+      continue;
+    }
+    return memberPath;
+  }
+}
 function getCallMethodName(node) {
   const { callee } = node;
-  if (callee.type === "MemberExpression" && !callee.computed && callee.property.type === "Identifier") {
-    return callee.property.name;
+  if (callee.type === "MemberExpression" && getStaticMemberName(callee) !== null) {
+    return getStaticMemberName(callee);
   }
   return null;
 }
-function isZodImportSpecifier(node) {
+function getZodImportKind(node) {
   if (node.type !== "ImportDefaultSpecifier" && node.type !== "ImportNamespaceSpecifier" && node.type !== "ImportSpecifier") {
-    return false;
+    return null;
   }
   const declaration = node.parent;
   if (declaration?.type !== "ImportDeclaration") {
-    return false;
+    return null;
   }
   if (declaration.source.value !== "zod") {
-    return false;
+    return null;
   }
   if (node.type === "ImportDefaultSpecifier" || node.type === "ImportNamespaceSpecifier") {
-    return true;
+    return { importedName: "z", type: "namespace" };
   }
   if (node.importKind === "type" || declaration.importKind === "type") {
-    return false;
+    return null;
   }
   const importedName = node.imported.type === "Identifier" ? node.imported.name : node.imported.value;
-  return ZOD_NAMESPACE_IMPORTS.has(importedName) || ZOD_FACTORY_IMPORTS.has(importedName);
+  if (ZOD_NAMESPACE_IMPORTS.has(importedName)) {
+    return { importedName, type: "namespace" };
+  }
+  if (ZOD_FACTORY_IMPORTS.has(importedName) || ZOD_DIRECT_COMBINATOR_IMPORTS.has(importedName)) {
+    return { type: "factory" };
+  }
+  return null;
+}
+function isZodSchemaNamespaceCall(importName, memberPath) {
+  if (importName === "coerce") {
+    return memberPath[0] !== void 0 && ZOD_FACTORY_IMPORTS.has(memberPath[0]);
+  }
+  if (importName === "iso") {
+    return memberPath[0] !== void 0 && ZOD_ISO_FACTORY_IMPORTS.has(memberPath[0]);
+  }
+  if (memberPath[0] === "coerce") {
+    return memberPath[1] !== void 0 && ZOD_FACTORY_IMPORTS.has(memberPath[1]);
+  }
+  if (memberPath[0] === "iso") {
+    return memberPath[1] !== void 0 && ZOD_ISO_FACTORY_IMPORTS.has(memberPath[1]);
+  }
+  return memberPath[0] !== void 0 && ZOD_FACTORY_IMPORTS.has(memberPath[0]);
 }
 function hasFullTypeInformation(services) {
   return services.program !== null;
@@ -234,7 +335,20 @@ var noInlineZodSchema = ESLintUtils.RuleCreator(
       }
       const scope = sourceCode.getScope(root);
       const variable = findVariable(scope, root.name);
-      return variable?.defs.some((definition) => isZodImportSpecifier(definition.node)) ?? false;
+      return variable?.defs.some((definition) => {
+        const importKind = getZodImportKind(definition.node);
+        if (importKind?.type === "factory") {
+          return true;
+        }
+        if (importKind?.type !== "namespace") {
+          return false;
+        }
+        const memberPath = getMemberPathFromRoot(node.callee);
+        if (memberPath === null || memberPath.length === 0) {
+          return false;
+        }
+        return isZodSchemaNamespaceCall(importKind.importedName, memberPath);
+      }) ?? false;
     }
     function isTypedZodSchemaCombinatorCall(node) {
       const rootMethodName = getRootMethodName(node);
@@ -254,6 +368,37 @@ var noInlineZodSchema = ESLintUtils.RuleCreator(
     function isSchemaCreationCall(node) {
       return isZodSchemaCall(node) || isTypedZodSchemaCombinatorCall(node);
     }
+    function isInModuleInitializationPath(node) {
+      let current = node;
+      while (current) {
+        if (current.type === "Program") {
+          return true;
+        }
+        if (current.type === "FunctionDeclaration" || current.type === "FunctionExpression" || current.type === "ArrowFunctionExpression") {
+          return false;
+        }
+        if (current.type === "PropertyDefinition" && !current.static) {
+          return false;
+        }
+        current = current.parent;
+      }
+      return false;
+    }
+    function isFunctionExecutedDuringModuleInitialization(node) {
+      if (node.type === "FunctionDeclaration") {
+        return false;
+      }
+      const parent = node.parent;
+      if (parent?.type === "CallExpression") {
+        if (parent.callee === node) {
+          return isInModuleInitializationPath(parent);
+        }
+        if (parent.arguments.includes(node)) {
+          return isInModuleInitializationPath(parent);
+        }
+      }
+      return false;
+    }
     function hasSchemaCreationCallAncestor(node) {
       let current = node.parent;
       while (current) {
@@ -268,7 +413,9 @@ var noInlineZodSchema = ESLintUtils.RuleCreator(
       let current = node.parent;
       while (current) {
         if (current.type === "FunctionDeclaration" || current.type === "FunctionExpression" || current.type === "ArrowFunctionExpression") {
-          return true;
+          if (!isFunctionExecutedDuringModuleInitialization(current)) {
+            return true;
+          }
         }
         if (current.type === "PropertyDefinition" && !current.static) {
           return true;
@@ -305,7 +452,7 @@ var rules = {
 var plugin = {
   meta: {
     name: "eslint-plugin-zod-utils",
-    version: "1.0.3"
+    version: "1.0.5"
   },
   rules,
   configs: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-zod-utils",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "ESLint utilities for safer Zod schema usage.",
   "type": "module",
   "main": "./dist/index.cjs",