Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(hono): add orverride.hono.validatorOutputPath option #1811

Merged
merged 1 commit into from
Jan 15, 2025
Merged

feat(hono): add orverride.hono.validatorOutputPath option #1811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions packages/core/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ export type OverrideOutputContentType = {
export type NormalizedHonoOptions = {
handlers?: string;
validator: boolean | 'hono';
validatorOutputPath: string;
};

export type ZodOptions = {
Expand Down Expand Up @@ -482,6 +483,7 @@ export type NormalizedZodOptions = {
export type HonoOptions = {
handlers?: string;
validator?: boolean | 'hono';
validatorOutputPath?: string;
};

export type NormalizedQueryOptions = {
Expand Down
48 changes: 39 additions & 9 deletions packages/hono/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,15 @@ ${currentValidator}async (c: ${contextTypeName}) => {
);`;
};

const getValidatorOutputRelativePath = (
validatorOutputPath: string,
handlerPath: string,
) => {
const { pathWithoutExtension } = getFileInfo(validatorOutputPath);

return upath.relativeSafe(upath.dirname(handlerPath), pathWithoutExtension);
};

const getZvalidatorImports = (
verbOption: GeneratorVerbOptions,
isHonoValidator: boolean,
Expand Down Expand Up @@ -266,7 +275,14 @@ const generateHandlers = async (

if (hasZValidator) {
if (output.override.hono.validator === true) {
validatorImport = `\nimport { zValidator } from '${outputPath}.validator';`;
const validatorPath = output.override.hono.validatorOutputPath
? getValidatorOutputRelativePath(
output.override.hono.validatorOutputPath,
handlerPath,
)
: `${outputPath}.validator`;

validatorImport = `\nimport { zValidator } from '${validatorPath}';`;
} else if (output.override.hono.validator === 'hono') {
validatorImport = `\nimport { zValidator } from '@hono/zod-validator';`;
}
Expand Down Expand Up @@ -352,10 +368,16 @@ ${getHonoHandlers({
const outputRelativePath = `./${kebab(tag)}`;

let validatorImport = '';

if (hasZValidator) {
if (output.override.hono.validator === true) {
validatorImport = `\nimport { zValidator } from '${outputRelativePath}.validator';`;
const validatorPath = output.override.hono.validatorOutputPath
? getValidatorOutputRelativePath(
output.override.hono.validatorOutputPath,
handlerPath,
)
: `${outputRelativePath}.validator`;

validatorImport = `\nimport { zValidator } from '${validatorPath}';`;
} else if (output.override.hono.validator === 'hono') {
validatorImport = `\nimport { zValidator } from '@hono/zod-validator';`;
}
Expand Down Expand Up @@ -450,7 +472,14 @@ const factory = createFactory();`;

if (hasZValidator) {
if (output.override.hono.validator === true) {
validatorImport = `\nimport { zValidator } from '${outputRelativePath}.validator';`;
const validatorPath = output.override.hono.validatorOutputPath
? getValidatorOutputRelativePath(
output.override.hono.validatorOutputPath,
handlerPath,
)
: `${outputRelativePath}.validator`;

validatorImport = `\nimport { zValidator } from '${validatorPath}';`;
} else if (output.override.hono.validator === 'hono') {
validatorImport = `\nimport { zValidator } from '@hono/zod-validator';`;
}
Expand Down Expand Up @@ -775,7 +804,6 @@ const generateZvalidator = (
context.specs[context.specKey].info,
);

const { extension, dirname, filename } = getFileInfo(output.target);
const content = `
// based on https://github.com/honojs/middleware/blob/main/packages/zod-validator/src/index.ts
import type { z, ZodSchema, ZodError } from 'zod';
Expand Down Expand Up @@ -916,10 +944,12 @@ export const zValidator =
};
`;

const validatorPath = upath.join(
dirname,
`${filename}.validator${extension}`,
);
let validatorPath = output.override.hono.validatorOutputPath;
if (!output.override.hono.validatorOutputPath) {
const { extension, dirname, filename } = getFileInfo(output.target);

validatorPath = upath.join(dirname, `${filename}.validator${extension}`);
}

return {
content: `${header}${content}`,
Expand Down
3 changes: 3 additions & 0 deletions packages/orval/src/utils/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,9 @@ const normalizeHonoOptions = (
? { handlers: upath.resolve(workspace, hono.handlers) }
: {}),
validator: hono.validator ?? true,
validatorOutputPath: hono.validatorOutputPath
? upath.resolve(workspace, hono.validatorOutputPath)
: '',
};
};

Expand Down
Loading