@devlearning/swagger-generator 0.0.22 → 0.0.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/generator.js +12 -6
  2. package/package.json +1 -1
  3. package/src/generator.ts +11 -6
package/dist/generator.js CHANGED
@@ -148,17 +148,23 @@ ${MODEL_POST}`, { flag: 'w' });
148
148
  let paramName = this.toFirstLetterLowercase(parameter.name);
149
149
  if (!parameter.required) {
150
150
  if (this.isDate(parameter.schema)) {
151
- return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined && ${paramName}.isValid() ? this._momentToString(${paramName}) : '';
151
+ return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined && ${paramName}.isValid() ? encodeURIComponent(this._momentToString(${paramName})) : '';
152
152
  `;
153
153
  }
154
154
  else {
155
- return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined ? '' + ${paramName} : '';
155
+ return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined ? encodeURIComponent('' + ${paramName}) : '';
156
156
  `;
157
157
  }
158
158
  }
159
159
  else {
160
- return `let ${paramName}Param: string = '' + ${paramName};
160
+ if (this.isDate(parameter.schema)) {
161
+ return `let ${paramName}Param: string = encodeURIComponent(this._momentToString(${paramName}));
161
162
  `;
163
+ }
164
+ else {
165
+ return `let ${paramName}Param: string = encodeURIComponent('' + ${paramName});
166
+ `;
167
+ }
162
168
  }
163
169
  }
164
170
  retrieveQueryParameters(swaggerMethodInfo) {
@@ -272,10 +278,10 @@ ${MODEL_POST}`, { flag: 'w' });
272
278
  const swaggerCopmponent = this._swagger.components.schemas[usedTypes[i]];
273
279
  // const name = usedTypes[i]
274
280
  // const modelName = <string>Object.getOwnPropertyNames(this._swagger.components.schemas)[name];
275
- this.retrieveNestedObjects2(swaggerCopmponent, usedTypes);
281
+ this.retrieveNestedObjectsRecursive(swaggerCopmponent, usedTypes);
276
282
  }
277
283
  }
278
- retrieveNestedObjects2(swaggerComponent, usedTypes) {
284
+ retrieveNestedObjectsRecursive(swaggerComponent, usedTypes) {
279
285
  if (!swaggerComponent.properties)
280
286
  return;
281
287
  for (let j = 0; j < Object.getOwnPropertyNames(swaggerComponent.properties).length; j++) {
@@ -290,7 +296,7 @@ ${MODEL_POST}`, { flag: 'w' });
290
296
  if (nestedUsedType != '' && usedTypes.findIndex(x => x == nestedUsedType) == -1) {
291
297
  usedTypes.push(nestedUsedType);
292
298
  let nested = this._swagger.components.schemas[nestedUsedType];
293
- this.retrieveNestedObjects2(nested, usedTypes);
299
+ this.retrieveNestedObjectsRecursive(nested, usedTypes);
294
300
  }
295
301
  }
296
302
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@devlearning/swagger-generator",
3
- "version": "0.0.22",
3
+ "version": "0.0.24",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/generator.ts CHANGED
@@ -186,15 +186,20 @@ ${MODEL_POST}`,
186
186
  let paramName = this.toFirstLetterLowercase(parameter.name);
187
187
  if (!parameter.required) {
188
188
  if (this.isDate(parameter.schema)) {
189
- return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined && ${paramName}.isValid() ? this._momentToString(${paramName}) : '';
189
+ return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined && ${paramName}.isValid() ? encodeURIComponent(this._momentToString(${paramName})) : '';
190
190
  `;
191
191
  } else {
192
- return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined ? '' + ${paramName} : '';
192
+ return `let ${paramName}Param: string = ${paramName} != null && ${paramName} != undefined ? encodeURIComponent('' + ${paramName}) : '';
193
193
  `;
194
194
  }
195
195
  } else {
196
- return `let ${paramName}Param: string = '' + ${paramName};
196
+ if (this.isDate(parameter.schema)) {
197
+ return `let ${paramName}Param: string = encodeURIComponent(this._momentToString(${paramName}));
198
+ `;
199
+ } else {
200
+ return `let ${paramName}Param: string = encodeURIComponent('' + ${paramName});
197
201
  `;
202
+ }
198
203
  }
199
204
  }
200
205
 
@@ -330,11 +335,11 @@ ${MODEL_POST}`,
330
335
  const swaggerCopmponent = this._swagger.components.schemas[usedTypes[i]];
331
336
  // const name = usedTypes[i]
332
337
  // const modelName = <string>Object.getOwnPropertyNames(this._swagger.components.schemas)[name];
333
- this.retrieveNestedObjects2(swaggerCopmponent, usedTypes);
338
+ this.retrieveNestedObjectsRecursive(swaggerCopmponent, usedTypes);
334
339
  }
335
340
  }
336
341
 
337
- retrieveNestedObjects2(swaggerComponent: SwaggerComponent, usedTypes: string[]) {
342
+ retrieveNestedObjectsRecursive(swaggerComponent: SwaggerComponent, usedTypes: string[]) {
338
343
  if (!swaggerComponent.properties) return;
339
344
 
340
345
  for (let j = 0; j < Object.getOwnPropertyNames(swaggerComponent.properties).length; j++) {
@@ -349,7 +354,7 @@ ${MODEL_POST}`,
349
354
  if (nestedUsedType != '' && usedTypes.findIndex(x => x == nestedUsedType) == -1) {
350
355
  usedTypes.push(nestedUsedType);
351
356
  let nested = this._swagger.components.schemas[nestedUsedType];
352
- this.retrieveNestedObjects2(nested, usedTypes);
357
+ this.retrieveNestedObjectsRecursive(nested, usedTypes);
353
358
  }
354
359
  }
355
360
  }