dtsgenerator 2.0.5 → 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 (19) hide show
  1. package/README.md +5 -0
  2. package/ast.js +18 -0
  3. package/dist/core/referenceResolver.d.ts +1 -0
  4. package/dist/core/referenceResolver.js +31 -6
  5. package/dist/core/referenceResolver.js.map +1 -1
  6. package/geojson.json +353 -0
  7. package/openapi.json +1607 -0
  8. package/package.json +5 -5
  9. package/src/core/referenceResolver.js +31 -6
  10. package/src/core/referenceResolver.js.map +1 -1
  11. package/src/core/referenceResolver.ts +20 -6
  12. package/src/cli.js +0 -124
  13. package/src/cli.js.map +0 -1
  14. package/src/commandOptions.js +0 -68
  15. package/src/commandOptions.js.map +0 -1
  16. package/src/jsonPointer.js +0 -69
  17. package/src/jsonPointer.js.map +0 -1
  18. package/src/utils.js +0 -44
  19. package/src/utils.js.map +0 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dtsgenerator",
3
- "version": "2.0.5",
3
+ "version": "2.0.6",
4
4
  "description": "TypeScript d.ts file generator for JSON Schema file",
5
5
  "bin": {
6
6
  "dtsgen": "./bin/dtsgen"
@@ -43,7 +43,7 @@
43
43
  },
44
44
  "dependencies": {
45
45
  "commander": "^2.19.0",
46
- "cross-fetch": "^3.0.0",
46
+ "cross-fetch": "^3.0.1",
47
47
  "debug": "^4.1.1",
48
48
  "glob": "^7.1.3",
49
49
  "js-yaml": "^3.12.1",
@@ -51,12 +51,12 @@
51
51
  "tslib": "^1.9.3"
52
52
  },
53
53
  "devDependencies": {
54
- "@types/debug": "^0.0.31",
54
+ "@types/debug": "^4.1.0",
55
55
  "@types/glob": "^7.1.1",
56
56
  "@types/js-yaml": "3.12.0",
57
57
  "@types/mkdirp": "^0.5.2",
58
58
  "@types/mocha": "^5.2.5",
59
- "@types/node": "^10.12.18",
59
+ "@types/node": "^10.12.26",
60
60
  "@types/power-assert": "^1.5.0",
61
61
  "coveralls": "^3.0.2",
62
62
  "istanbul": "^0.4.5",
@@ -66,6 +66,6 @@
66
66
  "rimraf": "^2.6.3",
67
67
  "source-map-support": "^0.5.10",
68
68
  "tslint": "^5.12.1",
69
- "typescript": "^3.2.4"
69
+ "typescript": "^3.3.3"
70
70
  }
71
71
  }
package/src/core/referenceResolver.js CHANGED
@@ -46,11 +46,8 @@ var ReferenceResolver = /** @class */ (function () {
46
46
  result = this.schemaCache.get(id.getAbsoluteId());
47
47
  if (!(result == null)) return [3 /*break*/, 7];
48
48
  refSchema = this.schemaCache.get(fileId);
49
- if (!(refSchema == null)) return [3 /*break*/, 6];
50
- if (!id.isFetchable()) {
51
- error.push("The $ref target is not exists: " + id.getAbsoluteId());
52
- return [3 /*break*/, 8];
53
- }
49
+ debug("get from schema cache, fileId=" + fileId + ", exists=" + (refSchema != null) + ", " + id.getAbsoluteId());
50
+ if (!(refSchema == null && id.isFetchable())) return [3 /*break*/, 6];
54
51
  _e.label = 3;
55
52
  case 3:
56
53
  _e.trys.push([3, 5, , 6]);
@@ -73,7 +70,7 @@ var ReferenceResolver = /** @class */ (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 /*break*/, 8];
@@ -112,6 +109,34 @@ var ReferenceResolver = /** @class */ (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/src/core/referenceResolver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"referenceResolver.js","sourceRoot":"","sources":["referenceResolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"referenceResolver.js","sourceRoot":"","sources":["referenceResolver.ts"],"names":[],"mappings":"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"}
package/src/core/referenceResolver.ts CHANGED
@@ -38,11 +38,8 @@ export default class ReferenceResolver {
38
38
  let result = this.schemaCache.get(id.getAbsoluteId());
39
39
  if (result == null) {
40
40
  const refSchema = this.schemaCache.get(fileId);
41
- if (refSchema == null) {
42
- if (!id.isFetchable()) {
43
- error.push(`The $ref target is not exists: ${id.getAbsoluteId()}`);
44
- continue;
45
- }
41
+ debug(`get from schema cache, fileId=${fileId}, exists=${refSchema != null}, ${id.getAbsoluteId()}`);
42
+ if (refSchema == null && id.isFetchable()) {
46
43
  try {
47
44
  debug(`fetch remote schema: id=[${fileId}].`);
48
45
  await this.registerRemoteSchema(fileId);
@@ -58,7 +55,7 @@ export default class ReferenceResolver {
58
55
  this.referenceCache.set(id.getAbsoluteId(), result);
59
56
  } else {
60
57
  if (id.existsJsonPointerHash()) {
61
- const rootSchema = this.schemaCache.get(fileId);
58
+ const rootSchema = this.searchParentSchema(id);
62
59
  if (rootSchema == null) {
63
60
  error.push(`The $ref targets root is not found: ${id.getAbsoluteId()}`);
64
61
  continue;
@@ -79,6 +76,23 @@ export default class ReferenceResolver {
79
76
  // debug(' resolve reference: resolved schema:');
80
77
  // debug(Array.from(this.referenceCache.keys()).join('\n'));
81
78
  }
79
+ private searchParentSchema(id: SchemaId): Schema | undefined {
80
+ const fileId = id.getFileId();
81
+ const rootSchema = this.schemaCache.get(fileId);
82
+ if (rootSchema != null) {
83
+ return rootSchema;
84
+ }
85
+ const key = id.getAbsoluteId();
86
+ for (const k of this.schemaCache.keys()) {
87
+ if (key.startsWith(k)) {
88
+ const s = this.schemaCache.get(k);
89
+ if (s != null && s.rootSchema != null) {
90
+ return s.rootSchema;
91
+ }
92
+ }
93
+ }
94
+ return;
95
+ }
82
96
 
83
97
  public async registerRemoteSchema(url: string): Promise<void> {
84
98
  const res = await fetch(url);
package/src/cli.js DELETED
@@ -1,124 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- var tslib_1 = require("tslib");
4
- var fs_1 = tslib_1.__importDefault(require("fs"));
5
- var mkdirp_1 = tslib_1.__importDefault(require("mkdirp"));
6
- var path_1 = tslib_1.__importDefault(require("path"));
7
- var commandOptions_1 = tslib_1.__importStar(require("./commandOptions"));
8
- var core_1 = tslib_1.__importDefault(require("./core"));
9
- var utils_1 = require("./utils");
10
- function readSchemaFromStdin() {
11
- process.stdin.setEncoding('utf-8');
12
- return new Promise(function (resolve, reject) {
13
- var data = '';
14
- process.stdin
15
- .on('readable', function () {
16
- var chunk;
17
- /* tslint:disable-next-line:no-conditional-assignment */
18
- while (chunk = process.stdin.read()) {
19
- if (typeof chunk === 'string') {
20
- data += chunk;
21
- }
22
- }
23
- })
24
- .once('end', function () {
25
- resolve(utils_1.parseFileContent(data));
26
- })
27
- .once('error', function (err) {
28
- reject(err);
29
- });
30
- });
31
- }
32
- function readSchemasFromFile(pattern) {
33
- return tslib_1.__awaiter(this, void 0, void 0, function () {
34
- var files;
35
- return tslib_1.__generator(this, function (_a) {
36
- switch (_a.label) {
37
- case 0: return [4 /*yield*/, utils_1.globFiles(pattern)];
38
- case 1:
39
- files = _a.sent();
40
- return [2 /*return*/, Promise.all(files.map(function (file) {
41
- return new Promise(function (resolve, reject) {
42
- fs_1.default.readFile(file, { encoding: 'utf-8' }, function (err, content) {
43
- if (err) {
44
- reject(err);
45
- }
46
- else {
47
- try {
48
- resolve(utils_1.parseFileContent(content, file));
49
- }
50
- catch (e) {
51
- reject(e);
52
- }
53
- }
54
- });
55
- });
56
- }))];
57
- }
58
- });
59
- });
60
- }
61
- function exec() {
62
- return tslib_1.__awaiter(this, void 0, void 0, function () {
63
- var e_1, _a, contents, _b, _c, _d, _e, pattern, cs, e_1_1;
64
- return tslib_1.__generator(this, function (_f) {
65
- switch (_f.label) {
66
- case 0:
67
- commandOptions_1.initialize(process.argv);
68
- contents = [];
69
- if (!commandOptions_1.default.isReadFromStdin()) return [3 /*break*/, 2];
70
- _c = (_b = contents).push;
71
- return [4 /*yield*/, readSchemaFromStdin()];
72
- case 1:
73
- _c.apply(_b, [_f.sent()]);
74
- _f.label = 2;
75
- case 2:
76
- _f.trys.push([2, 7, 8, 9]);
77
- _d = tslib_1.__values(commandOptions_1.default.files), _e = _d.next();
78
- _f.label = 3;
79
- case 3:
80
- if (!!_e.done) return [3 /*break*/, 6];
81
- pattern = _e.value;
82
- return [4 /*yield*/, readSchemasFromFile(pattern)];
83
- case 4:
84
- cs = _f.sent();
85
- contents = contents.concat(cs);
86
- _f.label = 5;
87
- case 5:
88
- _e = _d.next();
89
- return [3 /*break*/, 3];
90
- case 6: return [3 /*break*/, 9];
91
- case 7:
92
- e_1_1 = _f.sent();
93
- e_1 = { error: e_1_1 };
94
- return [3 /*break*/, 9];
95
- case 8:
96
- try {
97
- if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
98
- }
99
- finally { if (e_1) throw e_1.error; }
100
- return [7 /*endfinally*/];
101
- case 9:
102
- /* tslint:disable:no-console */
103
- core_1.default({
104
- contents: contents,
105
- inputUrls: commandOptions_1.default.urls,
106
- namespaceName: commandOptions_1.default.namespace,
107
- }).then(function (result) {
108
- if (commandOptions_1.default.out) {
109
- mkdirp_1.default.sync(path_1.default.dirname(commandOptions_1.default.out));
110
- fs_1.default.writeFileSync(commandOptions_1.default.out, result, { encoding: 'utf-8' });
111
- }
112
- else {
113
- console.log(result);
114
- }
115
- }).catch(function (err) {
116
- console.error(err.stack || err);
117
- });
118
- return [2 /*return*/];
119
- }
120
- });
121
- });
122
- }
123
- exec();
124
- //# sourceMappingURL=cli.js.map
package/src/cli.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["cli.ts"],"names":[],"mappings":"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"}
package/src/commandOptions.js DELETED
@@ -1,68 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- var tslib_1 = require("tslib");
4
- var commander_1 = tslib_1.__importDefault(require("commander"));
5
- /* tslint:disable:no-var-requires */
6
- var pkg = require('../package.json');
7
- /* tslint:enable:no-var-requires */
8
- var CommandOptions = /** @class */ (function () {
9
- function CommandOptions() {
10
- this.files = [];
11
- this.urls = [];
12
- }
13
- CommandOptions.prototype.isReadFromStdin = function () {
14
- return this.stdin || this.files.length === 0 && this.urls.length === 0;
15
- };
16
- return CommandOptions;
17
- }());
18
- exports.CommandOptions = CommandOptions;
19
- var opts = new CommandOptions();
20
- clear();
21
- exports.default = opts;
22
- function initialize(argv) {
23
- return parse(opts, argv);
24
- }
25
- exports.initialize = initialize;
26
- function clear() {
27
- opts.files = [];
28
- opts.urls = [];
29
- opts.stdin = undefined;
30
- opts.out = undefined;
31
- opts.namespace = undefined;
32
- }
33
- exports.clear = clear;
34
- function parse(o, argv) {
35
- var command = new commander_1.default.Command();
36
- function collectUrl(val, memo) {
37
- memo.push(val);
38
- return memo;
39
- }
40
- // <hoge> is required, [hoge] is optional
41
- command
42
- .version(pkg.version)
43
- .usage('[options] <file ... | file patterns using node-glob>')
44
- .option('--url <url>', 'input json schema from the url.', collectUrl, [])
45
- .option('--stdin', 'read stdin with other files or urls.')
46
- .option('-o, --out <file>', 'output d.ts filename.')
47
- .option('-n, --namespace <namespace>', 'use root namespace instead of definitions or components.schema from OpenAPI, or -n "" to suppress namespaces.')
48
- .on('--help', function () {
49
- /* tslint:disable:no-console */
50
- console.log('');
51
- console.log(' Examples:');
52
- console.log('');
53
- console.log(' $ dtsgen --help');
54
- console.log(' $ dtsgen --out types.d.ts schema/**/*.schema.json');
55
- console.log(' $ cat schema1.json | dtsgen');
56
- console.log(' $ dtsgen -o swaggerSchema.d.ts --url https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/schemas/v2.0/schema.json');
57
- console.log(' $ dtsgen -o petstore.d.ts -n PetStore --url https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v2.0/yaml/petstore.yaml');
58
- })
59
- .parse(argv);
60
- var res = command;
61
- o.files = command.args;
62
- o.urls = res.url;
63
- o.stdin = res.stdin;
64
- o.out = res.out;
65
- o.namespace = res.namespace;
66
- return command;
67
- }
68
- //# sourceMappingURL=commandOptions.js.map
package/src/commandOptions.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"commandOptions.js","sourceRoot":"","sources":["commandOptions.ts"],"names":[],"mappings":";;;AAAA,gEAAkC;AAElC,oCAAoC;AACpC,IAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACvC,mCAAmC;AAEnC;IAAA;QACW,UAAK,GAAa,EAAE,CAAC;QACrB,SAAI,GAAa,EAAE,CAAC;IAQ/B,CAAC;IAHU,wCAAe,GAAtB;QACI,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC;IAC3E,CAAC;IACL,qBAAC;AAAD,CAAC,AAVD,IAUC;AAVY,wCAAc;AAa3B,IAAM,IAAI,GAAG,IAAI,cAAc,EAAE,CAAC;AAClC,KAAK,EAAE,CAAC;AACR,kBAAe,IAAI,CAAC;AAEpB,SAAgB,UAAU,CAAC,IAAc;IACrC,OAAO,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC7B,CAAC;AAFD,gCAEC;AAED,SAAgB,KAAK;IACjB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAChB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;IACf,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;IACvB,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;IACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;AAC/B,CAAC;AAND,sBAMC;AAED,SAAS,KAAK,CAAC,CAAiB,EAAE,IAAc;IAC5C,IAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,OAAO,EAAE,CAAC;IAExC,SAAS,UAAU,CAAC,GAAW,EAAE,IAAc;QAC3C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,yCAAyC;IACzC,OAAO;SACF,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;SACpB,KAAK,CAAC,sDAAsD,CAAC;SAC7D,MAAM,CAAC,aAAa,EAAE,iCAAiC,EAAE,UAAU,EAAE,EAAE,CAAC;SACxE,MAAM,CAAC,SAAS,EAAE,sCAAsC,CAAC;SACzD,MAAM,CAAC,kBAAkB,EAAE,uBAAuB,CAAC;SACnD,MAAM,CAAC,6BAA6B,EAAE,+GAA+G,CAAC;SACtJ,EAAE,CAAC,QAAQ,EAAE;QACV,+BAA+B;QAC/B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;QACnC,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,sIAAsI,CAAC,CAAC;QACpJ,OAAO,CAAC,GAAG,CAAC,qJAAqJ,CAAC,CAAC;IACvK,CAAC,CAAC;SACD,KAAK,CAAC,IAAI,CAAC,CAAC;IAEjB,IAAM,GAAG,GAAG,OAAc,CAAC;IAC3B,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IACvB,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC;IACjB,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;IACpB,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IAChB,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC;IAC5B,OAAO,OAAO,CAAC;AACnB,CAAC"}
package/src/jsonPointer.js DELETED
@@ -1,69 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- function get(obj, path, isCreateOnNotExists) {
4
- if (isCreateOnNotExists === void 0) { isCreateOnNotExists = false; }
5
- if (path.length === 0) {
6
- return obj;
7
- }
8
- var o = obj;
9
- var lastKey = path[path.length - 1];
10
- for (var i = 0; i < path.length - 1; i++) {
11
- var key = path[i];
12
- var next = o[key];
13
- if (next == null) {
14
- if (isCreateOnNotExists) {
15
- next = {};
16
- o[key] = next;
17
- }
18
- else {
19
- return undefined;
20
- }
21
- }
22
- o = next;
23
- }
24
- return o[lastKey];
25
- }
26
- exports.get = get;
27
- function set(obj, path, value) {
28
- if (path.length === 0) {
29
- return;
30
- }
31
- var o = obj;
32
- var lastKey = path[path.length - 1];
33
- for (var i = 0; i < path.length - 1; i++) {
34
- var key = path[i];
35
- var next = o[key];
36
- if (next == null) {
37
- next = {};
38
- o[key] = next;
39
- }
40
- o = next;
41
- }
42
- o[lastKey] = value;
43
- }
44
- exports.set = set;
45
- function parse(s) {
46
- if (/^#/.test(s)) {
47
- s = s.substring(1);
48
- }
49
- var path = s.split('/');
50
- if (path.shift() !== '') {
51
- throw new Error('Invalid JSON-Pointer format: ' + s);
52
- }
53
- return path.map(function (key) { return untilde(key); });
54
- }
55
- exports.parse = parse;
56
- function untilde(key) {
57
- return key.replace(/~(0|1)/g, function (match) {
58
- switch (match) {
59
- case '~0': return '~';
60
- case '~1': return '/';
61
- default: throw new Error('Unsupported tilded number.');
62
- }
63
- });
64
- }
65
- function tilde(key) {
66
- return key.replace(/~/, '~0').replace(/\//g, '~1');
67
- }
68
- exports.tilde = tilde;
69
- //# sourceMappingURL=jsonPointer.js.map
package/src/jsonPointer.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"jsonPointer.js","sourceRoot":"","sources":["jsonPointer.ts"],"names":[],"mappings":"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"}
package/src/utils.js DELETED
@@ -1,44 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- var tslib_1 = require("tslib");
4
- var glob_1 = tslib_1.__importDefault(require("glob"));
5
- var js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
6
- var path_1 = tslib_1.__importDefault(require("path"));
7
- function parseFileContent(content, filename) {
8
- var ext = filename ? path_1.default.extname(filename).toLowerCase() : '';
9
- var maybeYaml = ext === '.yaml' || ext === '.yml';
10
- try {
11
- if (maybeYaml) {
12
- return deepCopy(js_yaml_1.default.safeLoad(content));
13
- }
14
- else {
15
- return JSON.parse(content);
16
- }
17
- }
18
- catch (e) {
19
- if (maybeYaml) {
20
- return JSON.parse(content);
21
- }
22
- else {
23
- return deepCopy(js_yaml_1.default.safeLoad(content));
24
- }
25
- }
26
- }
27
- exports.parseFileContent = parseFileContent;
28
- function deepCopy(obj) {
29
- return JSON.parse(JSON.stringify(obj));
30
- }
31
- function globFiles(pattern, options) {
32
- return new Promise(function (resolve, reject) {
33
- glob_1.default(pattern, options || {}, function (err, matches) {
34
- if (err) {
35
- reject(err);
36
- }
37
- else {
38
- resolve(matches);
39
- }
40
- });
41
- });
42
- }
43
- exports.globFiles = globFiles;
44
- //# sourceMappingURL=utils.js.map
package/src/utils.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["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"}