eslint-plugin-zod-utils 1.0.3 → 1.0.4

package/dist/index.cjs

@@ -48,6 +48,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "enum",
   "file",
   "function",
+  "fromJSONSchema",
   "instanceof",
   "intersection",
   "ipv4",
@@ -56,6 +57,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "ksuid",
   "lazy",
   "literal",
+  "looseObject",
   "map",
   "nan",
   "nanoid",
@@ -72,6 +74,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "set",
   "string",
   "stringbool",
+  "strictObject",
   "symbol",
   "templateLiteral",
   "tuple",
@@ -88,6 +91,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "xid"
 ]);
 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",
@@ -170,6 +174,33 @@ 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") {
+      if (current.computed || current.property.type !== "Identifier") {
+        return null;
+      }
+      memberPath.unshift(current.property.name);
+      current = current.object;
+      continue;
+    }
+    return memberPath;
+  }
+}
 function getCallMethodName(node) {
   const { callee } = node;
   if (callee.type === "MemberExpression" && !callee.computed && callee.property.type === "Identifier") {
@@ -177,25 +208,46 @@ function getCallMethodName(node) {
   }
   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)) {
+    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 +314,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);
@@ -333,7 +398,7 @@ var rules = {
 var plugin = {
   meta: {
     name: "eslint-plugin-zod-utils",
-    version: "1.0.3"
+    version: "1.0.4"
   },
   rules,
   configs: {}

package/dist/index.js

@@ -20,6 +20,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "enum",
   "file",
   "function",
+  "fromJSONSchema",
   "instanceof",
   "intersection",
   "ipv4",
@@ -28,6 +29,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "ksuid",
   "lazy",
   "literal",
+  "looseObject",
   "map",
   "nan",
   "nanoid",
@@ -44,6 +46,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "set",
   "string",
   "stringbool",
+  "strictObject",
   "symbol",
   "templateLiteral",
   "tuple",
@@ -60,6 +63,7 @@ var ZOD_FACTORY_IMPORTS = /* @__PURE__ */ new Set([
   "xid"
 ]);
 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",
@@ -142,6 +146,33 @@ 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") {
+      if (current.computed || current.property.type !== "Identifier") {
+        return null;
+      }
+      memberPath.unshift(current.property.name);
+      current = current.object;
+      continue;
+    }
+    return memberPath;
+  }
+}
 function getCallMethodName(node) {
   const { callee } = node;
   if (callee.type === "MemberExpression" && !callee.computed && callee.property.type === "Identifier") {
@@ -149,25 +180,46 @@ function getCallMethodName(node) {
   }
   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)) {
+    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 +286,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);
@@ -305,7 +370,7 @@ var rules = {
 var plugin = {
   meta: {
     name: "eslint-plugin-zod-utils",
-    version: "1.0.3"
+    version: "1.0.4"
   },
   rules,
   configs: {}

package/package.json

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