fix(zod): handling correctly deeper ref by deferencing

orval-labs · Apr 4, 2023 · 3aa9162 · 3aa9162 · vercel · Apr 4, 2023
1 parent d952146
commit 3aa9162
Show file tree

Hide file tree

Showing 7 changed files with 184 additions and 65 deletions.
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -716,6 +716,7 @@ export type WriteModeProps = {
   workspace: string;
   specsName: Record<string, string>;
   header: string;
+  needSchema: boolean;
 };
 
 export type GeneratorApiOperations = {

diff --git a/packages/core/src/writers/single-mode.ts b/packages/core/src/writers/single-mode.ts
@@ -14,6 +14,7 @@ export const writeSingleMode = async ({
   output,
   specsName,
   header,
+  needSchema,
 }: WriteModeProps): Promise<string[]> => {
   try {
     const { path, dirname } = getFileInfo(output.target, {
@@ -89,7 +90,7 @@ export const writeSingleMode = async ({
       data += generateMutatorImports({ mutators: formUrlEncoded });
     }
 
-    if (!output.schemas) {
+    if (!output.schemas && needSchema) {
       data += generateModelsInline(builder.schemas);
     }
 

diff --git a/packages/core/src/writers/split-mode.ts b/packages/core/src/writers/split-mode.ts
@@ -14,6 +14,7 @@ export const writeSplitMode = async ({
   output,
   specsName,
   header,
+  needSchema,
 }: WriteModeProps): Promise<string[]> => {
   try {
     const { filename, dirname, extension } = getFileInfo(output.target, {
@@ -69,7 +70,7 @@ export const writeSplitMode = async ({
       ? upath.join(dirname, filename + '.schemas' + extension)
       : undefined;
 
-    if (schemasPath) {
+    if (schemasPath && needSchema) {
       const schemasData = header + generateModelsInline(builder.schemas);
 
       await fs.outputFile(

diff --git a/packages/core/src/writers/split-tags-mode.ts b/packages/core/src/writers/split-tags-mode.ts
@@ -14,6 +14,7 @@ export const writeSplitTagsMode = async ({
   output,
   specsName,
   header,
+  needSchema,
 }: WriteModeProps): Promise<string[]> => {
   const { filename, dirname, extension } = getFileInfo(output.target, {
     backupFilename: camel(builder.info.title),
@@ -74,7 +75,7 @@ export const writeSplitTagsMode = async ({
           ? upath.join(dirname, filename + '.schemas' + extension)
           : undefined;
 
-        if (schemasPath) {
+        if (schemasPath && needSchema) {
           const schemasData = header + generateModelsInline(builder.schemas);
 
           await fs.outputFile(schemasPath, schemasData);

diff --git a/packages/core/src/writers/tags-mode.ts b/packages/core/src/writers/tags-mode.ts
@@ -15,6 +15,7 @@ export const writeTagsMode = async ({
   output,
   specsName,
   header,
+  needSchema,
 }: WriteModeProps): Promise<string[]> => {
   const { filename, dirname, extension } = getFileInfo(output.target, {
     backupFilename: camel(builder.info.title),
@@ -78,7 +79,7 @@ export const writeTagsMode = async ({
           ? upath.join(dirname, filename + '.schemas' + extension)
           : undefined;
 
-        if (schemasPath) {
+        if (schemasPath && needSchema) {
           const schemasData = header + generateModelsInline(builder.schemas);
 
           await fs.outputFile(schemasPath, schemasData);

diff --git a/packages/orval/src/write-specs.ts b/packages/orval/src/write-specs.ts
@@ -87,6 +87,7 @@ export const writeSpecs = async (
       output,
       specsName,
       header,
+      needSchema: !output.schemas && output.client !== 'zod',
     });
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,7 @@ export const writeSpecs = async ( @@
           output,
           specsName,
           header,
+          needSchema: !output.schemas && output.client !== 'zod',
         });
       }
@@ Expand Down @@