dtsgenerator 2.0.0 → 2.0.6

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 (43) hide show
  1. package/README.md +22 -0
  2. package/SupportedFeatures.md +1 -0
  3. package/ast.js +18 -0
  4. package/dist/core/dtsGenerator.js +17 -4
  5. package/dist/core/dtsGenerator.js.map +1 -1
  6. package/dist/core/referenceResolver.d.ts +1 -0
  7. package/dist/core/referenceResolver.js +31 -6
  8. package/dist/core/referenceResolver.js.map +1 -1
  9. package/dist/jsonPointer.d.ts +1 -0
  10. package/dist/jsonPointer.js +4 -0
  11. package/dist/jsonPointer.js.map +1 -1
  12. package/dist/utils.js +5 -2
  13. package/dist/utils.js.map +1 -1
  14. package/geojson.json +353 -0
  15. package/openapi.json +1607 -0
  16. package/package.json +15 -14
  17. package/src/core/dtsGenerator.js +327 -0
  18. package/src/core/dtsGenerator.js.map +1 -0
  19. package/src/core/dtsGenerator.ts +16 -4
  20. package/src/core/index.js +41 -0
  21. package/src/core/index.js.map +1 -0
  22. package/src/core/jsonSchema.js +371 -0
  23. package/src/core/jsonSchema.js.map +1 -0
  24. package/src/core/jsonSchemaDraft04.d.ts +1 -0
  25. package/src/core/jsonSchemaDraft07.d.ts +1 -0
  26. package/src/core/openApiV2.js +2 -0
  27. package/src/core/openApiV2.js.map +1 -0
  28. package/src/core/referenceResolver.js +199 -0
  29. package/src/core/referenceResolver.js.map +1 -0
  30. package/src/core/referenceResolver.ts +20 -6
  31. package/src/core/schemaConvertor.js +285 -0
  32. package/src/core/schemaConvertor.js.map +1 -0
  33. package/src/core/schemaId.js +51 -0
  34. package/src/core/schemaId.js.map +1 -0
  35. package/src/core/typeNameConvertor.js +43 -0
  36. package/src/core/typeNameConvertor.js.map +1 -0
  37. package/src/core/utils.js +58 -0
  38. package/src/core/utils.js.map +1 -0
  39. package/src/core/writeProcessor.js +130 -0
  40. package/src/core/writeProcessor.js.map +1 -0
  41. package/src/jsonPointer.ts +4 -0
  42. package/src/utils.ts +5 -2
  43. package/tsconfig.json +2 -0
package/README.md CHANGED
@@ -116,6 +116,28 @@ Output debug message by [debug](https://www.npmjs.com/package/debug) library.
116
116
 
117
117
  ## ChangeLog
118
118
 
119
+ ### [v2.0.6](https://github.com/horiuchi/dtsgenerator/releases/tag/v2.0.6) (2019-02-14)
120
+
121
+ - fixed
122
+ - Fix "Error: The $ref target is not exists" on valid OpenAPI 3 spec #322. Thank you @f1cognite :+1:
123
+
124
+ ### [v2.0.5](https://github.com/horiuchi/dtsgenerator/releases/tag/v2.0.5) (2019-01-28)
125
+
126
+ - features
127
+ - Add to support the `nullable` property on OpenAPI by #319. Thank you @sakari :+1:
128
+ https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#data-types
129
+
130
+ ### [v2.0.4](https://github.com/horiuchi/dtsgenerator/releases/tag/v2.0.4) (2019-01-07)
131
+
132
+ - fixed
133
+ - Fix missing schema due to yaml references #318. Thank you @sakari :+1:
134
+
135
+ ### [v2.0.1](https://github.com/horiuchi/dtsgenerator/releases/tag/v2.0.1) (2018-12-21)
136
+
137
+ - fixed
138
+ - A property name cannot contain a "/" #315. Thank you @Reggino :+1:
139
+ - update `.npmignore`
140
+
119
141
  ### [v2.0.0](https://github.com/horiuchi/dtsgenerator/releases/tag/v2.0.0) (2018-10-22)
120
142
 
121
143
  - features
package/SupportedFeatures.md CHANGED
@@ -41,6 +41,7 @@ Supported Features
41
41
  |dependencies|x|but also search the sub schema types|
42
42
  |enum|o|enum type, supported string and integer values|
43
43
  |type|o|The type of that property|
44
+ |nullable|o|This property is defined by OpenAPI Specification, not in JSON Schema|
44
45
  |format|o|comment string|
45
46
  |allOf|p||
46
47
  |anyOf|p||
package/ast.js ADDED
@@ -0,0 +1,18 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ var fs_1 = require("fs");
4
+ var ts = require("typescript");
5
+ function syntaxKindToName(kind) {
6
+ return ts.SyntaxKind[kind];
7
+ }
8
+ function printAllChildren(node, depth) {
9
+ if (depth === void 0) { depth = 0; }
10
+ console.log(new Array(depth + 1).join('----'), syntaxKindToName(node.kind), node.pos, node.end);
11
+ depth++;
12
+ node.getChildren().forEach(function (c) { return printAllChildren(c, depth); });
13
+ }
14
+ var fileNames = process.argv.slice(2);
15
+ fileNames.forEach(function (fileName) {
16
+ var sourceFile = ts.createSourceFile(fileName, fs_1.readFileSync(fileName).toString(), ts.ScriptTarget.ES6, true);
17
+ printAllChildren(sourceFile);
18
+ });
package/dist/core/dtsGenerator.js CHANGED
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  var tslib_1 = require("tslib");
4
4
  var debug_1 = tslib_1.__importDefault(require("debug"));
5
+ var jsonPointer_1 = require("../jsonPointer");
5
6
  var jsonSchema_1 = require("./jsonSchema");
6
7
  var utils = tslib_1.__importStar(require("./utils"));
7
8
  var debug = debug_1.default('dtsgen');
@@ -105,11 +106,23 @@ var DtsGenerator = (function () {
105
106
  delete content.allOf;
106
107
  content = work;
107
108
  }
108
- var types = content.type;
109
- if (types === undefined && (content.properties || content.additionalProperties)) {
109
+ if (content.type === undefined && (content.properties || content.additionalProperties)) {
110
110
  content.type = 'object';
111
111
  }
112
- else if (Array.isArray(types)) {
112
+ if (content.nullable) {
113
+ var type = content.type;
114
+ if (type == null) {
115
+ content.type = 'null';
116
+ }
117
+ else if (!Array.isArray(type)) {
118
+ content.type = [type, 'null'];
119
+ }
120
+ else {
121
+ type.push('null');
122
+ }
123
+ }
124
+ var types = content.type;
125
+ if (Array.isArray(types)) {
113
126
  var reduced = utils.reduceTypes(types);
114
127
  content.type = reduced.length === 1 ? reduced[0] : reduced;
115
128
  }
@@ -149,7 +162,7 @@ var DtsGenerator = (function () {
149
162
  try {
150
163
  for (var _b = tslib_1.__values(Object.keys(content.properties)), _c = _b.next(); !_c.done; _c = _b.next()) {
151
164
  var propertyName = _c.value;
152
- var schema = this.normalizeContent(baseSchema, '/properties/' + propertyName);
165
+ var schema = this.normalizeContent(baseSchema, '/properties/' + jsonPointer_1.tilde(propertyName));
153
166
  this.convertor.outputComments(schema);
154
167
  this.convertor.outputPropertyAttribute(schema);
155
168
  this.convertor.outputPropertyName(schema, propertyName, baseSchema.content.required);
package/dist/core/dtsGenerator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dtsGenerator.js","sourceRoot":"","sources":["../../src/core/dtsGenerator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dtsGenerator.js","sourceRoot":"","sources":["../../src/core/dtsGenerator.ts"],"names":[],"mappings":"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"}
package/dist/core/referenceResolver.d.ts CHANGED
@@ -6,6 +6,7 @@ export default class ReferenceResolver {
6
6
  dereference(refId: string): Schema;
7
7
  getAllRegisteredSchema(): IterableIterator<Schema>;
8
8
  resolve(): Promise<void>;
9
+ private searchParentSchema;
9
10
  registerRemoteSchema(url: string): Promise<void>;
10
11
  registerSchema(schema: Schema): void;
11
12
  private addSchema;
package/dist/core/referenceResolver.js CHANGED
@@ -46,11 +46,8 @@ var ReferenceResolver = (function () {
46
46
  result = this.schemaCache.get(id.getAbsoluteId());
47
47
  if (!(result == null)) return [3, 7];
48
48
  refSchema = this.schemaCache.get(fileId);
49
- if (!(refSchema == null)) return [3, 6];
50
- if (!id.isFetchable()) {
51
- error.push("The $ref target is not exists: " + id.getAbsoluteId());
52
- return [3, 8];
53
- }
49
+ debug("get from schema cache, fileId=" + fileId + ", exists=" + (refSchema != null) + ", " + id.getAbsoluteId());
50
+ if (!(refSchema == null && id.isFetchable())) return [3, 6];
54
51
  _e.label = 3;
55
52
  case 3:
56
53
  _e.trys.push([3, 5, , 6]);
@@ -73,7 +70,7 @@ var ReferenceResolver = (function () {
73
70
  }
74
71
  else {
75
72
  if (id.existsJsonPointerHash()) {
76
- rootSchema = this.schemaCache.get(fileId);
73
+ rootSchema = this.searchParentSchema(id);
77
74
  if (rootSchema == null) {
78
75
  error.push("The $ref targets root is not found: " + id.getAbsoluteId());
79
76
  return [3, 8];
@@ -112,6 +109,34 @@ var ReferenceResolver = (function () {
112
109
  });
113
110
  });
114
111
  };
112
+ ReferenceResolver.prototype.searchParentSchema = function (id) {
113
+ var e_3, _a;
114
+ var fileId = id.getFileId();
115
+ var rootSchema = this.schemaCache.get(fileId);
116
+ if (rootSchema != null) {
117
+ return rootSchema;
118
+ }
119
+ var key = id.getAbsoluteId();
120
+ try {
121
+ for (var _b = tslib_1.__values(this.schemaCache.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
122
+ var k = _c.value;
123
+ if (key.startsWith(k)) {
124
+ var s = this.schemaCache.get(k);
125
+ if (s != null && s.rootSchema != null) {
126
+ return s.rootSchema;
127
+ }
128
+ }
129
+ }
130
+ }
131
+ catch (e_3_1) { e_3 = { error: e_3_1 }; }
132
+ finally {
133
+ try {
134
+ if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
135
+ }
136
+ finally { if (e_3) throw e_3.error; }
137
+ }
138
+ return;
139
+ };
115
140
  ReferenceResolver.prototype.registerRemoteSchema = function (url) {
116
141
  return tslib_1.__awaiter(this, void 0, void 0, function () {
117
142
  var res, body, content, schema;
package/dist/core/referenceResolver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"referenceResolver.js","sourceRoot":"","sources":["../../src/core/referenceResolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"referenceResolver.js","sourceRoot":"","sources":["../../src/core/referenceResolver.ts"],"names":[],"mappings":"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"}
package/dist/jsonPointer.d.ts CHANGED
@@ -1,3 +1,4 @@
1
1
  export declare function get(obj: any, path: string[], isCreateOnNotExists?: boolean): any;
2
2
  export declare function set(obj: any, path: string[], value: any): void;
3
3
  export declare function parse(s: string): string[];
4
+ export declare function tilde(key: string): string;
package/dist/jsonPointer.js CHANGED
@@ -62,4 +62,8 @@ function untilde(key) {
62
62
  }
63
63
  });
64
64
  }
65
+ function tilde(key) {
66
+ return key.replace(/~/, '~0').replace(/\//g, '~1');
67
+ }
68
+ exports.tilde = tilde;
65
69
  //# sourceMappingURL=jsonPointer.js.map
package/dist/jsonPointer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"jsonPointer.js","sourceRoot":"","sources":["../src/jsonPointer.ts"],"names":[],"mappings":";;AACA,SAAgB,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,mBAAoC;IAApC,oCAAA,EAAA,2BAAoC;IAC9E,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACnB,OAAO,GAAG,CAAC;KACd;IACD,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,IAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACtC,IAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,IAAI,mBAAmB,EAAE;gBACrB,IAAI,GAAG,EAAE,CAAC;gBACV,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;aACjB;iBAAM;gBACH,OAAO,SAAS,CAAC;aACpB;SACJ;QACD,CAAC,GAAG,IAAI,CAAC;KACZ;IACD,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;AACtB,CAAC;AApBD,kBAoBC;AAED,SAAgB,GAAG,CAAC,GAAQ,EAAE,IAAc,EAAE,KAAU;IACpD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACnB,OAAO;KACV;IACD,IAAI,CAAC,GAAG,GAAG,CAAC;IACZ,IAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACtC,IAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,IAAI,IAAI,IAAI,EAAE;YACd,IAAI,GAAG,EAAE,CAAC;YACV,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;SACjB;QACD,CAAC,GAAG,IAAI,CAAC;KACZ;IACD,CAAC,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;AACvB,CAAC;AAhBD,kBAgBC;AAED,SAAgB,KAAK,CAAC,CAAS;IAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QACd,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;KACtB;IACD,IAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,CAAC,CAAC,CAAC;KACxD;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,OAAO,CAAC,GAAG,CAAC,EAAZ,CAAY,CAAC,CAAC;AAC3C,CAAC;AATD,sBASC;AACD,SAAS,OAAO,CAAC,GAAW;IACxB,OAAO,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,UAAC,KAAK;QAChC,QAAQ,KAAK,EAAE;YACX,KAAK,IAAI,CAAC,CAAC,OAAO,GAAG,CAAC;YACtB,KAAK,IAAI,CAAC,CAAC,OAAO,GAAG,CAAC;YACtB,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;SAC1D;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"jsonPointer.js","sourceRoot":"","sources":["../src/jsonPointer.ts"],"names":[],"mappings":"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"}
package/dist/utils.js CHANGED
@@ -9,7 +9,7 @@ function parseFileContent(content, filename) {
9
9
  var maybeYaml = ext === '.yaml' || ext === '.yml';
10
10
  try {
11
11
  if (maybeYaml) {
12
- return js_yaml_1.default.safeLoad(content);
12
+ return deepCopy(js_yaml_1.default.safeLoad(content));
13
13
  }
14
14
  else {
15
15
  return JSON.parse(content);
@@ -20,11 +20,14 @@ function parseFileContent(content, filename) {
20
20
  return JSON.parse(content);
21
21
  }
22
22
  else {
23
- return js_yaml_1.default.safeLoad(content);
23
+ return deepCopy(js_yaml_1.default.safeLoad(content));
24
24
  }
25
25
  }
26
26
  }
27
27
  exports.parseFileContent = parseFileContent;
28
+ function deepCopy(obj) {
29
+ return JSON.parse(JSON.stringify(obj));
30
+ }
28
31
  function globFiles(pattern, options) {
29
32
  return new Promise(function (resolve, reject) {
30
33
  glob_1.default(pattern, options || {}, function (err, matches) {
package/dist/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,sDAAwB;AACxB,4DAA2B;AAC3B,sDAAwB;AAExB,SAAgB,gBAAgB,CAAC,OAAe,EAAE,QAAiB;IAC/D,IAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,IAAM,SAAS,GAAG,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,MAAM,CAAC;IACpD,IAAI;QACA,IAAI,SAAS,EAAE;YACX,OAAO,iBAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SACjC;aAAM;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC9B;KACJ;IAAC,OAAO,CAAC,EAAE;QACR,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC9B;aAAM;YACH,OAAO,iBAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;SACjC;KACJ;AACL,CAAC;AAhBD,4CAgBC;AAED,SAAgB,SAAS,CAAC,OAAe,EAAE,OAAuB;IAC9D,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QAC/B,cAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,EAAE,UAAC,GAAG,EAAE,OAAO;YACtC,IAAI,GAAG,EAAE;gBACL,MAAM,CAAC,GAAG,CAAC,CAAC;aACf;iBAAM;gBACH,OAAO,CAAC,OAAO,CAAC,CAAC;aACpB;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAVD,8BAUC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,sDAAwB;AACxB,4DAA2B;AAC3B,sDAAwB;AAExB,SAAgB,gBAAgB,CAAC,OAAe,EAAE,QAAiB;IAC/D,IAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,IAAM,SAAS,GAAG,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,MAAM,CAAC;IACpD,IAAI;QACA,IAAI,SAAS,EAAE;YACX,OAAO,QAAQ,CAAC,iBAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;SAC3C;aAAM;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC9B;KACJ;IAAC,OAAO,CAAC,EAAE;QACR,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC9B;aAAM;YACH,OAAO,QAAQ,CAAC,iBAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;SAC3C;KACJ;AACL,CAAC;AAhBD,4CAgBC;AACD,SAAS,QAAQ,CAAC,GAAQ;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,SAAS,CAAC,OAAe,EAAE,OAAuB;IAC9D,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QAC/B,cAAI,CAAC,OAAO,EAAE,OAAO,IAAI,EAAE,EAAE,UAAC,GAAG,EAAE,OAAO;YACtC,IAAI,GAAG,EAAE;gBACL,MAAM,CAAC,GAAG,CAAC,CAAC;aACf;iBAAM;gBACH,OAAO,CAAC,OAAO,CAAC,CAAC;aACpB;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAVD,8BAUC"}