typoa 1.0.0-alpha.52 → 1.0.0-alpha.54

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 (2) hide show
  1. package/build/resolve.js +8 -5
  2. package/package.json +1 -1
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: {
@@ -199,7 +198,8 @@ function resolve(type, spec, resolveNullableTypeFn = resolveNullableType) {
199
198
  };
200
199
  }
201
200
  const typeName = type.getText();
202
- if (typeName === 'void') {
201
+ // map null or void as object so that the schema stays valid
202
+ if (typeName === 'null' || typeName === 'void') {
203
203
  return { type: 'object' };
204
204
  }
205
205
  return {
@@ -247,6 +247,9 @@ function resolveProperties(type, spec) {
247
247
  }
248
248
  }
249
249
  // Add to spec
250
+ if ('type' in resolvedType && resolvedType.type === 'undefined') {
251
+ return schema;
252
+ }
250
253
  schema.properties[property.getName()] = resolvedType;
251
254
  if (required) {
252
255
  schema.required.push(property.getName());
@@ -329,4 +332,4 @@ function appendInitializer(node, schema) {
329
332
  }
330
333
  return false;
331
334
  }
332
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"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"}
335
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../src/resolve.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "typoa",
3
- "version": "1.0.0-alpha.52",
3
+ "version": "1.0.0-alpha.54",
4
4
  "description": "Help you generate OpenAPI definitions via Typescript",
5
5
  "main": "build/index.js",
6
6
  "files": [