fix(zod): avoid deplicated consts declaration

dsthode · Apr 11, 2023 · 03a058f · 03a058f
1 parent 673bb55
commit 03a058f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/packages/zod/package.json b/packages/zod/package.json
@@ -13,6 +13,10 @@
  "lint": "eslint src/**/*.ts"
  },
  "dependencies": {
- "@orval/core": "6.13.1"
+ "@orval/core": "6.13.1",
+ "lodash.uniq": "^4.5.0"
+ },
+ "devDependencies": {
+ "@types/lodash.uniq": "^4.5.7"
  }
 }
diff --git a/packages/zod/src/index.ts b/packages/zod/src/index.ts
@@ -20,7 +20,7 @@ import {
  isObject,
  isBoolean,
 } from '@orval/core';
-import SwaggerParser from '@apidevtools/swagger-parser';
+import uniq from 'lodash.uniq';
 
 const ZOD_DEPENDENCIES: GeneratorDependency[] = [
  {
@@ -204,7 +204,7 @@ const generateZodValidationSchemaDefinition = (
  functions.push(['optional', undefined]);
  }
 
- return { functions, consts };
+ return { functions, consts: uniq(consts) };
 };
 
 const parseZodValidationSchemaDefinition = (
@@ -356,7 +356,7 @@ const generateZodRoute = (
  !!resolvedResponseJsonSchema?.required?.find(
  (requiredKey: string) => requiredKey === key,
  ),
- camel(`${operationName}-${key}`),
+ camel(`${operationName}-response-${key}`),
  ),
  };
  })
@@ -389,7 +389,7 @@ const generateZodRoute = (
  !!resolvedRequestBodyJsonSchema?.required?.find(
  (requiredKey: string) => requiredKey === key,
  ),
- camel(`${operationName}-${key}`),
+ camel(`${operationName}-body-${key}`),
  ),
  };
  })
@@ -408,7 +408,7 @@ const generateZodRoute = (
  const definition = generateZodValidationSchemaDefinition(
  schema,
  parameter.required,
- camel(`${operationName}-${parameter.name}`),
+ camel(`${operationName}-${parameter.in}-${parameter.name}`),
  );
 
  if (parameter.in === 'header') {

diff --git a/yarn.lock b/yarn.lock
@@ -1000,7 +1000,7 @@
 
 "@types/lodash.uniq@^4.5.7":
  version "4.5.7"
- resolved "https://registry.npmjs.org/@types/lodash.uniq/-/lodash.uniq-4.5.7.tgz"
+ resolved "https://registry.yarnpkg.com/@types/lodash.uniq/-/lodash.uniq-4.5.7.tgz#0773960ec0148b29e6a54821a65b878a0ebb5c1a"
  integrity sha512-qg7DeAbdZMi6DGvCxThlJycykLLhETrJrQZ6F2KaZ+o0sNK1qRHz46lgNA+nHHjwrmA2a91DyiZTp3ey3m1rEw==
  dependencies:
  "@types/lodash" "*"
@@ -4280,7 +4280,7 @@ lodash.topath@^4.5.2:
 
 lodash.uniq@^4.5.0:
  version "4.5.0"
- resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
+ resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
 lodash.uniqby@^4.7.0: