Skip to content

Commit b479251

Browse files
committed
fix: try to fix problems with resolving extracting path params type
1 parent d406131 commit b479251

File tree

3 files changed

+72
-15
lines changed

3 files changed

+72
-15
lines changed

src/schema-parser/schema-routes.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ class SchemaRoutes {
720720
const pathArgs = routeParams.path.map((pathArgSchema) => ({
721721
name: pathArgSchema.name,
722722
optional: !pathArgSchema.required,
723-
type: this.schemaParser.getInlineParseContent(pathArgSchema.schema),
723+
type: this.config.Ts.Keyword.Any,
724724
description: pathArgSchema.description,
725725
}));
726726
const pathArgsNames = pathArgs.map((arg) => arg.name);
@@ -817,6 +817,10 @@ class SchemaRoutes {
817817
: void 0,
818818
};
819819

820+
pathArgs.forEach((pathArg, i) => {
821+
pathArg.type = this.schemaParser.getInlineParseContent(routeParams.path[i].schema, typeName);
822+
});
823+
820824
return {
821825
id: routeId,
822826
namespace: _.replace(moduleName, /^(\d)/, "v$1"),

tests/spec/extract-enums/v3.0/expected.ts

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,14 @@ export interface TypeNamePrefixGetAbcGetParamsTypeNameSuffix {
122122
* @default "created_time"
123123
*/
124124
order_by?: TypeNamePrefixGetAbcGetParamsOrderByTypeNameSuffix;
125+
statusesPath?: any[];
126+
/**
127+
* Order By
128+
* @default "created_time"
129+
*/
130+
orderPathBy?: TypeNamePrefixGetAbcGetParamsOrderPathByTypeNameSuffix;
131+
/** Tag Ids */
132+
tagPathIds?: string[];
125133
}
126134

127135
/**
@@ -132,6 +140,22 @@ export enum TypeNamePrefixGetAbcGetParamsOrderByTypeNameSuffix {
132140
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
133141
}
134142

143+
/**
144+
* Order By
145+
* @default "created_time"
146+
*/
147+
export enum TypeNamePrefixGetAbcGetParamsOrderPathByTypeNameSuffix {
148+
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
149+
}
150+
151+
/**
152+
* Order By
153+
* @default "created_time"
154+
*/
155+
export enum TypeNamePrefixGetAbcGetParamsOrderHeaderByTypeNameSuffix {
156+
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
157+
}
158+
135159
export interface TypeNamePrefixGetCdeGetParamsTypeNameSuffix {
136160
/** Tag Ids */
137161
tag_ids?: string[];
@@ -148,6 +172,19 @@ export interface TypeNamePrefixGetCdeGetParamsTypeNameSuffix {
148172
* @default "created_time"
149173
*/
150174
order_by?: TypeNamePrefixGetCdeGetParamsOrderByTypeNameSuffix;
175+
shouldNotBeAnyPath?: {
176+
tree?: {
177+
mode?: TypeNamePrefixGetCdeGetParamsModeTypeNameSuffix;
178+
"mode-num"?: TypeNamePrefixGetCdeGetParamsModeNumTypeNameSuffix;
179+
type?: TypeNamePrefixGetCdeGetParamsTypeTypeNameSuffix;
180+
bereke?: TypeNamePrefixGetCdeGetParamsBerekeTypeNameSuffix;
181+
}[];
182+
};
183+
/**
184+
* Order By
185+
* @default "created_time"
186+
*/
187+
orderByPath?: TypeNamePrefixGetCdeGetParamsOrderByPathTypeNameSuffix;
151188
}
152189

153190
export enum TypeNamePrefixGetCdeGetParamsModeTypeNameSuffix {
@@ -185,3 +222,19 @@ export enum TypeNamePrefixGetCdeGetParamsBerekeTypeNameSuffix {
185222
export enum TypeNamePrefixGetCdeGetParamsOrderByTypeNameSuffix {
186223
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
187224
}
225+
226+
/**
227+
* Order By
228+
* @default "created_time"
229+
*/
230+
export enum TypeNamePrefixGetCdeGetParamsOrderByPathTypeNameSuffix {
231+
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
232+
}
233+
234+
/**
235+
* Order By
236+
* @default "created_time"
237+
*/
238+
export enum TypeNamePrefixGetCdeGetParamsOrderByHeaderTypeNameSuffix {
239+
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
240+
}

tests/spec/extract-enums/v3.0/schema.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,6 @@ export enum TypeNamePrefixTreeBerekeTypeNameSuffix {
115115
EnumKeyPrefixBoilerEnumKeySuffix = "Boiler",
116116
}
117117

118-
/**
119-
* Order By
120-
* @default "created_time"
121-
*/
122-
export enum TypeNamePrefixEnumRoot6TypeNameSuffix {
123-
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
124-
}
125-
126118
export interface TypeNamePrefixGetAbcGetParamsTypeNameSuffix {
127119
statuses?: any[];
128120
/**
@@ -152,15 +144,15 @@ export enum TypeNamePrefixGetAbcGetParamsOrderByTypeNameSuffix {
152144
* Order By
153145
* @default "created_time"
154146
*/
155-
export enum TypeNamePrefixGetAbcGetParamsOrderHeaderByTypeNameSuffix {
147+
export enum TypeNamePrefixGetAbcGetParamsOrderPathByTypeNameSuffix {
156148
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
157149
}
158150

159151
/**
160152
* Order By
161153
* @default "created_time"
162154
*/
163-
export enum TypeNamePrefixEnumRoot7TypeNameSuffix {
155+
export enum TypeNamePrefixGetAbcGetParamsOrderHeaderByTypeNameSuffix {
164156
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
165157
}
166158

@@ -182,10 +174,10 @@ export interface TypeNamePrefixGetCdeGetParamsTypeNameSuffix {
182174
order_by?: TypeNamePrefixGetCdeGetParamsOrderByTypeNameSuffix;
183175
shouldNotBeAnyPath?: {
184176
tree?: {
185-
mode?: TypeNamePrefixTreeModeTypeNameSuffix;
186-
"mode-num"?: TypeNamePrefixTreeModeNumTypeNameSuffix;
187-
type?: TypeNamePrefixTreeTypeTypeNameSuffix;
188-
bereke?: TypeNamePrefixTreeBerekeTypeNameSuffix;
177+
mode?: TypeNamePrefixGetCdeGetParamsModeTypeNameSuffix;
178+
"mode-num"?: TypeNamePrefixGetCdeGetParamsModeNumTypeNameSuffix;
179+
type?: TypeNamePrefixGetCdeGetParamsTypeTypeNameSuffix;
180+
bereke?: TypeNamePrefixGetCdeGetParamsBerekeTypeNameSuffix;
189181
}[];
190182
};
191183
/**
@@ -231,6 +223,14 @@ export enum TypeNamePrefixGetCdeGetParamsOrderByTypeNameSuffix {
231223
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
232224
}
233225

226+
/**
227+
* Order By
228+
* @default "created_time"
229+
*/
230+
export enum TypeNamePrefixGetCdeGetParamsOrderByPathTypeNameSuffix {
231+
EnumKeyPrefixCreatedTimeEnumKeySuffix = "created_time",
232+
}
233+
234234
/**
235235
* Order By
236236
* @default "created_time"

0 commit comments

Comments
 (0)