Skip to content

--extract-request-params behavior depends on presence of query params #1084

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

--extract-request-params behavior depends on presence of query params #1084

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
32 changes: 14 additions & 18 deletions src/schema-routes/schema-routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,13 +614,12 @@ export class SchemaRoutes {
};

createRequestParamsSchema = ({
queryParams,
queryObjectSchema,
pathArgsSchemas,
extractRequestParams,
routeName,
}) => {
if (!queryParams || !queryParams.length) return null;
if (!extractRequestParams) return null;

const pathParams = pathArgsSchemas.reduce((acc, pathArgSchema) => {
if (pathArgSchema.name) {
Expand Down Expand Up @@ -656,26 +655,24 @@ export class SchemaRoutes {
},
};

if (!Object.keys(schema.properties).length) return null;

const fixedSchema = this.config.hooks.onCreateRequestParams(schema);

if (fixedSchema) return fixedSchema;

if (extractRequestParams) {
const generatedTypeName = this.schemaUtils.resolveTypeName(
routeName.usage,
{
suffixes: this.config.extractingOptions.requestParamsSuffix,
resolver: this.config.extractingOptions.requestParamsNameResolver,
},
);

return this.schemaParserFabric.createParsedComponent({
typeName: generatedTypeName,
schema: schema,
});
}
const generatedTypeName = this.schemaUtils.resolveTypeName(
routeName.usage,
{
suffixes: this.config.extractingOptions.requestParamsSuffix,
resolver: this.config.extractingOptions.requestParamsNameResolver,
},
);

return schema;
return this.schemaParserFabric.createParsedComponent({
typeName: generatedTypeName,
schema: schema,
});
};

extractResponseBodyIfItNeeded = (routeInfo, responseBodyInfo, routeName) => {
Expand Down Expand Up @@ -908,7 +905,6 @@ export class SchemaRoutes {
);

const requestParamsSchema = this.createRequestParamsSchema({
queryParams: routeParams.query,
pathArgsSchemas: routeParams.path,
queryObjectSchema,
extractRequestParams,
Expand Down
12 changes: 7 additions & 5 deletions templates/default/procedure-call.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,17 @@ const requestConfigParam = {
}

const argToTmpl = ({ name, optional, type, defaultValue }) => `${name}${!defaultValue && optional ? '?' : ''}: ${type}${defaultValue ? ` = ${defaultValue}` : ''}`;

const rawWrapperArgs = config.extractRequestParams ?
const requestParamsArgs = [
_.join(pathParamsNames, ", "),
query != null ? `...${queryName}` : ''
].filter(Boolean).join(', ')
const rawWrapperArgs = requestParams ?
_.compact([
requestParams && {
name: pathParams.length ? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }` : queryName,
{
name: `{ ${requestParamsArgs} }`,
optional: false,
type: getInlineParseContent(requestParams),
},
...(!requestParams ? pathParams : []),
payload,
requestConfigParam,
]) :
Expand Down
12 changes: 7 additions & 5 deletions templates/modular/procedure-call.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,17 @@ const requestConfigParam = {
}

const argToTmpl = ({ name, optional, type, defaultValue }) => `${name}${!defaultValue && optional ? '?' : ''}: ${type}${defaultValue ? ` = ${defaultValue}` : ''}`;

const rawWrapperArgs = config.extractRequestParams ?
const requestParamsArgs = [
_.join(pathParamsNames, ", "),
query != null ? `...${queryName}` : ''
].filter(Boolean).join(', ')
const rawWrapperArgs = requestParams ?
_.compact([
requestParams && {
name: pathParams.length ? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }` : queryName,
{
name: `{ ${requestParamsArgs} }`,
optional: false,
type: getInlineParseContent(requestParams),
},
...(!requestParams ? pathParams : []),
payload,
requestConfigParam,
]) :
Expand Down
Loading