Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions cli/src/commands/GenerateCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,17 @@ export class GenerateCommand extends Command {
const openAPIDocument = await parseOpenAPISourceFile(sourceFile);
const prettierConfig = await prettier.resolveConfig(process.cwd());

const writeFile = async (file: string, data: string) => {
const updatedConfig = await prettier.format(data, {
parser: "babel-ts",
...prettierConfig,
});
const writeFile = async (
file: string,
data: string,
format: boolean = true
) => {
const updatedConfig = format
? await prettier.format(data, {
parser: "babel-ts",
...prettierConfig,
})
: data;

await fsExtra.outputFile(
path.join(process.cwd(), config.outputDir, file),
Expand Down
6 changes: 4 additions & 2 deletions plugins/typescript/src/generators/generateFetchers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ export const generateFetchers = async (context: Context, config: Config) => {
prefix: filenamePrefix,
baseUrl: get(context.openAPIDocument, "servers.0.url"),
useTypeImports: config.useTypeImports,
})
}),
config.format
);
} else {
const fetcherSourceText = await context.readFile(`${fetcherFilename}.ts`);
Expand Down Expand Up @@ -252,6 +253,7 @@ export const generateFetchers = async (context: Context, config: Config) => {
),
...usedImportsNodes,
...nodes,
])
]),
config.format
);
};
15 changes: 11 additions & 4 deletions plugins/typescript/src/generators/generateReactQueryComponents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,16 @@ export const generateReactQueryComponents = async (
contextPath: contextFilename,
baseUrl: get(context.openAPIDocument, "servers.0.url"),
useTypeImports: finalConfig.useTypeImports,
})
}),
finalConfig.format
);
}

if (!context.existsFile(`${contextFilename}.ts`)) {
context.writeFile(
`${contextFilename}.ts`,
getContext(filenamePrefix, filename, finalConfig.useTypeImports)
getContext(filenamePrefix, filename, finalConfig.useTypeImports),
finalConfig.format
);
}

Expand Down Expand Up @@ -343,7 +345,11 @@ export const generateReactQueryComponents = async (
);

if (!context.existsFile(`${utilsFilename}.ts`)) {
await context.writeFile(`${utilsFilename}.ts`, getUtils());
await context.writeFile(
`${utilsFilename}.ts`,
getUtils(),
finalConfig.format
);
}

await context.writeFile(
Expand Down Expand Up @@ -372,7 +378,8 @@ export const generateReactQueryComponents = async (
...usedImportsNodes,
...nodes,
queryKeyManager,
])
]),
finalConfig.format
);
};

Expand Down
12 changes: 8 additions & 4 deletions plugins/typescript/src/generators/generateSchemaTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ export const generateSchemaTypes = async (
createWatermark(context.openAPIDocument.info),
...getUsedImports(schemas, files, finalConfig.useTypeImports).nodes,
...schemas,
])
]),
finalConfig.format
);
}

Expand Down Expand Up @@ -168,7 +169,8 @@ export const generateSchemaTypes = async (
createWatermark(context.openAPIDocument.info),
...getUsedImports(schemas, files, finalConfig.useTypeImports).nodes,
...schemas,
])
]),
finalConfig.format
);
}
}
Expand Down Expand Up @@ -201,7 +203,8 @@ export const generateSchemaTypes = async (
createWatermark(context.openAPIDocument.info),
...getUsedImports(schemas, files, finalConfig.useTypeImports).nodes,
...schemas,
])
]),
finalConfig.format
);
}
}
Expand Down Expand Up @@ -229,7 +232,8 @@ export const generateSchemaTypes = async (
createWatermark(context.openAPIDocument.info),
...getUsedImports(schemas, files, finalConfig.useTypeImports).nodes,
...schemas,
])
]),
finalConfig.format
);
}

Expand Down
9 changes: 8 additions & 1 deletion plugins/typescript/src/generators/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as c from "case";
*/
export type Context = {
openAPIDocument: OpenAPIObject;
writeFile: (file: string, data: string) => Promise<void>;
writeFile: (file: string, data: string, format?: boolean) => Promise<void>;
readFile: (file: string) => Promise<string>;
existsFile: (file: string) => boolean;
};
Expand Down Expand Up @@ -43,4 +43,11 @@ export type ConfigBase = {
* @default true
*/
useTypeImports?: boolean;

/**
* Format the generated code using prettier.
*
* @default true
*/
format?: boolean;
};