typoa 1.0.0-alpha.53 → 1.0.0-alpha.55

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.
package/build/resolve.js CHANGED
@@ -28,7 +28,7 @@ function retrieveTypeName(type) {
28
28
  }
29
29
  const typeName = (_a = type.getSymbol()) === null || _a === void 0 ? void 0 : _a.getName();
30
30
  if (typeof typeName === 'undefined') {
31
- return type.getText();
31
+ return type.getText().replace(/-/g, '_').replace(/"/g, '');
32
32
  }
33
33
  if (typeName === '__type') {
34
34
  const aliasName = (_b = type.getAliasSymbol()) === null || _b === void 0 ? void 0 : _b.getName();
@@ -44,7 +44,7 @@ function retrieveTypeName(type) {
44
44
  }
45
45
  // handle literal record
46
46
  if (type.isObject()) {
47
- return type.getProperties().map(prop => (`${prop.getName()}-${retrieveTypeName(prop.getTypeAtLocation(getDeclarationForProperty(type, prop)))}`)).join('_');
47
+ return type.getProperties().map(prop => (`${prop.getName()}_${retrieveTypeName(prop.getTypeAtLocation(getDeclarationForProperty(type, prop)))}`)).join('_');
48
48
  }
49
49
  }
50
50
  return typeName;
@@ -93,7 +93,6 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
93
93
  }
94
94
  if (type.isTuple()) { // OpenAPI doesn't support it, so we take it as an union of array
95
95
  // tslint:disable-next-line: no-console
96
- console.warn('typoa warning: Tuple aren\'t supported by OpenAPI, so we\'re transforming it to an array');
97
96
  return {
98
97
  type: 'array',
99
98
  items: {
@@ -132,7 +131,7 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
132
131
  const typeArguments = type.getAliasTypeArguments();
133
132
  const subjectType = typeArguments[0];
134
133
  if (isTypeIdentifier(subjectType) === false) {
135
- return resolveObjectType(type, spec);
134
+ return resolveMappedObjectType(type, spec, helperName, subjectType, typeArguments);
136
135
  }
137
136
  switch (helperName) {
138
137
  case 'Omit':
@@ -176,7 +175,14 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
176
175
  // Add to spec components if not already resolved
177
176
  // tslint:disable-next-line: strict-type-predicates
178
177
  if (typeof spec.components.schemas[typeName] === 'undefined') {
179
- spec.components.schemas[typeName] = resolveObjectType(type, spec);
178
+ if (helperName === 'Partial' || helperName === 'Omit' || helperName === 'Pick') {
179
+ const typeArguments = type.getAliasTypeArguments();
180
+ const subjectType = typeArguments[0];
181
+ spec.components.schemas[typeName] = resolveMappedObjectType(type, spec, helperName, subjectType, typeArguments);
182
+ }
183
+ else {
184
+ spec.components.schemas[typeName] = resolveObjectType(type, spec);
185
+ }
180
186
  }
181
187
  // Return
182
188
  return { $ref: buildRef(typeName) };
@@ -199,7 +205,8 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
199
205
  };
200
206
  }
201
207
  const typeName = type.getText();
202
- if (typeName === 'void') {
208
+ // map null or void as object so that the schema stays valid
209
+ if (typeName === 'null' || typeName === 'void') {
203
210
  return { type: 'object' };
204
211
  }
205
212
  return {
@@ -260,17 +267,86 @@ function resolveProperties(type, spec) {
260
267
  // OpenAPI don't want the required[] prop if it's empty
261
268
  delete result.required;
262
269
  }
263
- if (Object.keys(result.properties).length === 0) {
264
- const stringIndexType = type.getStringIndexType();
265
- const numberIndexType = type.getNumberIndexType();
266
- // This is a mapped type string string or number as key (ex: { [key: string]: any } or Record<string, any>)
267
- if ((typeof stringIndexType !== 'undefined' && stringIndexType.getText() !== 'never') ||
268
- (typeof numberIndexType !== 'undefined' && numberIndexType.getText() !== 'never')) {
269
- result.additionalProperties = resolve(stringIndexType !== null && stringIndexType !== void 0 ? stringIndexType : numberIndexType, spec);
270
+ // Check for index signatures regardless of whether explicit properties exist
271
+ const stringIndexType = type.getStringIndexType();
272
+ const numberIndexType = type.getNumberIndexType();
273
+ // Handle mapped types and objects with index signatures (ex: { [key: string]: any } or Record<string, any>)
274
+ if ((typeof stringIndexType !== 'undefined' && stringIndexType.getText() !== 'never') ||
275
+ (typeof numberIndexType !== 'undefined' && numberIndexType.getText() !== 'never')) {
276
+ result.additionalProperties = resolve(stringIndexType !== null && stringIndexType !== void 0 ? stringIndexType : numberIndexType, spec);
277
+ }
278
+ else {
279
+ // Edge cases where TypeScript's getStringIndexType() might fail to detect
280
+ // index signatures in complex type scenarios (e.g., after type transformations)
281
+ // Check if the type represents a Record-like structure that should have additionalProperties
282
+ const typeSymbol = type.getSymbol();
283
+ const typeText = type.getText();
284
+ // Handle cases where the type might be a transformed Record type
285
+ if ((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.getName()) === '__type' || typeText.includes('Record<')) {
286
+ // For anonymous types that might be transformed Record types,
287
+ // check if the structure suggests it should have additional properties
288
+ // Check the type's apparent type for index signatures
289
+ const apparentType = type.getApparentType();
290
+ if (apparentType && apparentType !== type) {
291
+ const apparentStringIndexType = apparentType.getStringIndexType();
292
+ const apparentNumberIndexType = apparentType.getNumberIndexType();
293
+ if ((typeof apparentStringIndexType !== 'undefined' && apparentStringIndexType.getText() !== 'never') ||
294
+ (typeof apparentNumberIndexType !== 'undefined' && apparentNumberIndexType.getText() !== 'never')) {
295
+ result.additionalProperties = resolve(apparentStringIndexType !== null && apparentStringIndexType !== void 0 ? apparentStringIndexType : apparentNumberIndexType, spec);
296
+ }
297
+ }
270
298
  }
271
299
  }
272
300
  return result;
273
301
  }
302
+ /**
303
+ * Resolves mapped object types when applied to types with toJSON methods.
304
+ *
305
+ * When a mapped type is applied to a class/interface that has a toJSON method, we need to
306
+ * apply the transformation to the toJSON return type rather than the original object properties.
307
+ * This is because the toJSON method defines the actual serialized structure.
308
+ *
309
+ * @returns The resolved OpenAPI schema with transformations applied
310
+ */
311
+ function resolveMappedObjectType(type, spec, helperName, subjectType, typeArguments) {
312
+ // Check if the subject type has a toJSON method
313
+ const toJSONProperty = subjectType.getProperty('toJSON');
314
+ if (toJSONProperty) {
315
+ const node = getDeclarationForProperty(subjectType, toJSONProperty);
316
+ const toJSONReturnType = resolve(node.getReturnType(), spec);
317
+ // Apply mapped type transformation to the toJSON return type
318
+ if ('$ref' in toJSONReturnType) {
319
+ // For reference types, we need to create a new schema with the transformation applied
320
+ // This is more complex, so for now we'll fall back to normal resolution
321
+ return resolveObjectType(type, spec);
322
+ }
323
+ if (toJSONReturnType.type === 'object' && toJSONReturnType.properties) {
324
+ const transformedSchema = { ...toJSONReturnType };
325
+ switch (helperName) {
326
+ case 'Partial':
327
+ // Make all properties optional by removing them from required array
328
+ delete transformedSchema.required;
329
+ break;
330
+ // Note: Omit and Pick are not implemented because they require understanding
331
+ // the relationship between input properties and toJSON output properties,
332
+ // which cannot be determined generically without analyzing the toJSON implementation
333
+ }
334
+ return transformedSchema;
335
+ }
336
+ }
337
+ // Fall back to normal object resolution if no toJSON or transformation failed
338
+ return resolveObjectType(type, spec);
339
+ }
340
+ /**
341
+ * Resolves object types (classes, interfaces, and plain objects) to OpenAPI schemas.
342
+ *
343
+ * This function handles the conversion of TypeScript object types to OpenAPI schema objects.
344
+ * It has special handling for classes/interfaces that have a toJSON method - in such cases,
345
+ * it resolves to the return type of the toJSON method instead of the object's properties.
346
+ * For regular objects without toJSON, it resolves all properties using resolveProperties.
347
+ *
348
+ * @returns The resolved OpenAPI schema (either a reference or inline schema)
349
+ */
274
350
  function resolveObjectType(type, spec) {
275
351
  // toJSON methods
276
352
  const toJSONProperty = type.getProperty('toJSON');
@@ -300,12 +376,36 @@ function appendMetaToResolvedType(type, metas) {
300
376
  return Object.assign(type, metas);
301
377
  }
302
378
  function appendJsDocTags(jsDocTags, resolvedType) {
379
+ const supportedTags = [
380
+ 'format',
381
+ 'example',
382
+ 'description',
383
+ 'title',
384
+ 'pattern',
385
+ 'minimum',
386
+ 'maximum',
387
+ 'minLength',
388
+ 'maxLength',
389
+ 'minItems',
390
+ 'maxItems'
391
+ ];
392
+ const numericTags = [
393
+ 'minimum',
394
+ 'maximum',
395
+ 'minLength',
396
+ 'maxLength',
397
+ 'minItems',
398
+ 'maxItems'
399
+ ];
303
400
  for (const tag of jsDocTags) {
304
- if (['format', 'example', 'description', 'pattern', 'minimum', 'maximum', 'minLength', 'maxLength', 'minItems', 'maxItems'].includes(tag.name) && tag.text) {
305
- appendMetaToResolvedType(resolvedType, {
306
- [tag.name]: ['minimum', 'maximum', 'minLength', 'maxLength', 'minItems', 'maxItems'].includes(tag.name) ? parseFloat(tag.text.map(t => t.text).join('')) : tag.text.map(t => t.text).join('\n')
307
- });
401
+ if (!supportedTags.includes(tag.name) || !tag.text) {
402
+ continue;
308
403
  }
404
+ const textValue = tag.text.map(t => t.text).join('\n');
405
+ const value = numericTags.includes(tag.name) ? parseFloat(textValue) : textValue;
406
+ appendMetaToResolvedType(resolvedType, {
407
+ [tag.name]: value
408
+ });
309
409
  }
310
410
  }
311
411
  function appendInitializer(node, schema) {
@@ -332,4 +432,4 @@ function appendInitializer(node, schema) {
332
432
  }
333
433
  return false;
334
434
  }
335
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"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"}
435
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"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"}
@@ -31,7 +31,8 @@ export function bindToRouter (router: express.Router) {
31
31
  const data = await controller.{{name}}.apply(
32
32
  controller,
33
33
  await Validator.validateAndParse(
34
- req, schemas as any,
34
+ req,
35
+ schemas as any,
35
36
  {
36
37
  params: {{json params}},
37
38
  body: {{#if body}}{{json body}}{{else}}undefined{{/if}},
@@ -41,7 +42,8 @@ export function bindToRouter (router: express.Router) {
41
42
  )
42
43
  {{#if validateResponse}}
43
44
  const validatedData = Validator.validateAndParseResponse(
44
- data, schemas as any,
45
+ data,
46
+ schemas as any,
45
47
  {{json responses}},
46
48
  ('getStatus' in controller ? (controller as any).getStatus()?.toString() : undefined) ?? (typeof data !== 'undefined' && data !== null ? '200' : '204'),
47
49
  ((('getHeaders' in controller ? (controller as any).getHeaders()?.['content-type'] : undefined) ?? '{{contentType}}')).split(';')[0]
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "typoa",
3
- "version": "1.0.0-alpha.53",
3
+ "version": "1.0.0-alpha.55",
4
4
  "description": "Help you generate OpenAPI definitions via Typescript",
5
5
  "main": "build/index.js",
6
6
  "files": [