@ama-sdk/swagger-builder 11.6.0-prerelease.7 → 11.6.0-prerelease.9
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/package.json +17 -12
- package/src/cli/build.js +3 -3
- package/src/cli/build.js.map +1 -1
- package/src/cli/dictionary-check.js +7 -7
- package/src/cli/dictionary-check.js.map +1 -1
- package/src/cli/multi-success-check.js +8 -8
- package/src/cli/multi-success-check.js.map +1 -1
- package/src/cli/operation-id-check.js +8 -8
- package/src/cli/operation-id-check.js.map +1 -1
- package/src/core/checkers/checker.interface.d.ts.map +1 -1
- package/src/core/checkers/dictionary-checker.d.ts.map +1 -1
- package/src/core/checkers/dictionary-checker.js +20 -20
- package/src/core/checkers/dictionary-checker.js.map +1 -1
- package/src/core/checkers/multi-success-checker.d.ts.map +1 -1
- package/src/core/checkers/multi-success-checker.js +1 -1
- package/src/core/checkers/multi-success-checker.js.map +1 -1
- package/src/core/checkers/operation-id-checker.d.ts.map +1 -1
- package/src/core/checkers/operation-id-checker.js.map +1 -1
- package/src/core/formatters/json-formatter.d.ts.map +1 -1
- package/src/core/formatters/json-formatter.js +2 -3
- package/src/core/formatters/json-formatter.js.map +1 -1
- package/src/core/formatters/split-yaml-formatter.d.ts.map +1 -1
- package/src/core/formatters/split-yaml-formatter.js +9 -15
- package/src/core/formatters/split-yaml-formatter.js.map +1 -1
- package/src/core/formatters/yaml-formatter.d.ts.map +1 -1
- package/src/core/formatters/yaml-formatter.js +4 -5
- package/src/core/formatters/yaml-formatter.js.map +1 -1
- package/src/core/post-processes/aws-compat.d.ts.map +1 -1
- package/src/core/post-processes/aws-compat.js +4 -4
- package/src/core/post-processes/aws-compat.js.map +1 -1
- package/src/core/post-processes/blacklist-paths.d.ts.map +1 -1
- package/src/core/post-processes/blacklist-paths.js +1 -6
- package/src/core/post-processes/blacklist-paths.js.map +1 -1
- package/src/core/post-processes/flag-definition.d.ts.map +1 -1
- package/src/core/post-processes/flag-definition.js +0 -1
- package/src/core/post-processes/flag-definition.js.map +1 -1
- package/src/core/post-processes/flatten-conflicted-allof.d.ts.map +1 -1
- package/src/core/post-processes/flatten-conflicted-allof.js +1 -1
- package/src/core/post-processes/flatten-conflicted-allof.js.map +1 -1
- package/src/core/post-processes/propagate-xvendor.d.ts.map +1 -1
- package/src/core/post-processes/propagate-xvendor.js +1 -1
- package/src/core/post-processes/propagate-xvendor.js.map +1 -1
- package/src/core/post-processes/resolve-discriminator.d.ts.map +1 -1
- package/src/core/post-processes/resolve-discriminator.js +15 -15
- package/src/core/post-processes/resolve-discriminator.js.map +1 -1
- package/src/core/post-processes/tree-shaker.d.ts +1 -1
- package/src/core/post-processes/tree-shaker.d.ts.map +1 -1
- package/src/core/post-processes/tree-shaker.js +5 -4
- package/src/core/post-processes/tree-shaker.js.map +1 -1
- package/src/core/post-processes/validate.d.ts.map +1 -1
- package/src/core/post-processes/validate.js +2 -1
- package/src/core/post-processes/validate.js.map +1 -1
- package/src/core/post-processes/whitelist-paths.d.ts.map +1 -1
- package/src/core/post-processes/whitelist-paths.js +1 -6
- package/src/core/post-processes/whitelist-paths.js.map +1 -1
- package/src/core/swagger-spec-merger.d.ts +1 -1
- package/src/core/swagger-spec-merger.d.ts.map +1 -1
- package/src/core/swagger-spec-merger.js +24 -25
- package/src/core/swagger-spec-merger.js.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-file.d.ts.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-file.js +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-file.js.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-json.d.ts.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-json.js.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-object.d.ts.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-object.js +2 -3
- package/src/core/swagger-spec-wrappers/swagger-spec-object.js.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-split.d.ts.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-split.js +7 -7
- package/src/core/swagger-spec-wrappers/swagger-spec-split.js.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-yaml.d.ts.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec-yaml.js +2 -2
- package/src/core/swagger-spec-wrappers/swagger-spec-yaml.js.map +1 -1
- package/src/core/swagger-spec-wrappers/swagger-spec.interface.d.ts.map +1 -1
- package/src/core/swagger-spec-wrappers/utils.d.ts.map +1 -1
- package/src/core/swagger-spec-wrappers/utils.js +1 -1
- package/src/core/swagger-spec-wrappers/utils.js.map +1 -1
- package/src/core/utils.d.ts +2 -2
- package/src/core/utils.d.ts.map +1 -1
- package/src/core/utils.js +24 -22
- package/src/core/utils.js.map +1 -1
- package/src/helpers/build.d.ts.map +1 -1
- package/src/helpers/build.js +1 -6
- package/src/helpers/build.js.map +1 -1
- package/src/helpers/dictionary-check.d.ts +1 -1
- package/src/helpers/dictionary-check.d.ts.map +1 -1
- package/src/helpers/dictionary-check.js +2 -2
- package/src/helpers/dictionary-check.js.map +1 -1
- package/src/helpers/post-process.d.ts.map +1 -1
- package/src/helpers/post-process.js.map +1 -1
- package/src/helpers/spec-parser.d.ts.map +1 -1
- package/src/helpers/spec-parser.js +6 -5
- package/src/helpers/spec-parser.js.map +1 -1
- package/src/interfaces/api-configuration.d.ts.map +1 -1
- package/src/interfaces/apis-configuration.d.ts.map +1 -1
|
@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.SplitYamlFormatter = void 0;
|
|
7
7
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
|
-
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
9
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const js_yaml_1 = require("js-yaml");
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
11
|
/**
|
|
12
12
|
* Formatter to generate split Swagger spec in YAML files
|
|
@@ -30,7 +30,7 @@ class SplitYamlFormatter {
|
|
|
30
30
|
*/
|
|
31
31
|
async writeFileYaml(filePath, content) {
|
|
32
32
|
await node_fs_1.default.promises.mkdir(node_path_1.default.dirname(filePath), { recursive: true });
|
|
33
|
-
await node_fs_1.default.promises.writeFile(filePath, js_yaml_1.
|
|
33
|
+
await node_fs_1.default.promises.writeFile(filePath, (0, js_yaml_1.dump)(content, { indent: 2 }));
|
|
34
34
|
}
|
|
35
35
|
/**
|
|
36
36
|
* Write a JSON file
|
|
@@ -47,12 +47,7 @@ class SplitYamlFormatter {
|
|
|
47
47
|
}
|
|
48
48
|
else if (field === '$ref') {
|
|
49
49
|
const [refType, refPath] = currentNode.replace(/^#\//, '').split('/');
|
|
50
|
-
|
|
51
|
-
return `../${refType}.yaml#/${refType}/${refPath}`;
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
return `../${refType}/${refPath}.yaml#/${refType}/${refPath}`;
|
|
55
|
-
}
|
|
50
|
+
return refType === 'parameters' ? `../${refType}.yaml#/${refType}/${refPath}` : `../${refType}/${refPath}.yaml#/${refType}/${refPath}`;
|
|
56
51
|
}
|
|
57
52
|
else if (Array.isArray(currentNode)) {
|
|
58
53
|
return await Promise.all(currentNode.map((n) => this.rewriterReferences(n)));
|
|
@@ -108,7 +103,7 @@ class SplitYamlFormatter {
|
|
|
108
103
|
const products = pathNames
|
|
109
104
|
.map((p) => p.replace(/^\//, '').split('/')[0])
|
|
110
105
|
.reduce((acc, p) => {
|
|
111
|
-
if (acc.
|
|
106
|
+
if (!acc.includes(p)) {
|
|
112
107
|
acc.push(p);
|
|
113
108
|
}
|
|
114
109
|
return acc;
|
|
@@ -131,7 +126,7 @@ class SplitYamlFormatter {
|
|
|
131
126
|
tags: spec.tags
|
|
132
127
|
.filter((tag) => Object.keys(paths)
|
|
133
128
|
.some((k) => Object.keys(paths[k])
|
|
134
|
-
.some((pathType) => (paths[k][pathType].tags || []).
|
|
129
|
+
.some((pathType) => (paths[k][pathType].tags || []).includes(tag.name)))),
|
|
135
130
|
paths
|
|
136
131
|
});
|
|
137
132
|
}));
|
|
@@ -143,7 +138,7 @@ class SplitYamlFormatter {
|
|
|
143
138
|
*/
|
|
144
139
|
generateEnvelop(spec) {
|
|
145
140
|
return this.writeFileYaml(node_path_1.default.resolve(this.cwd, node_path_1.default.basename(this.filePath, '.json') + '.yaml'), Object.keys(spec)
|
|
146
|
-
.filter((k) => ['tags', 'parameters', 'paths', 'definitions'].
|
|
141
|
+
.filter((k) => !['tags', 'parameters', 'paths', 'definitions'].includes(k.toLowerCase()))
|
|
147
142
|
.reduce((acc, k) => {
|
|
148
143
|
acc[k] = spec[k];
|
|
149
144
|
return acc;
|
|
@@ -155,7 +150,7 @@ class SplitYamlFormatter {
|
|
|
155
150
|
*/
|
|
156
151
|
generateJsonFile(products) {
|
|
157
152
|
return this.writeFileJson(this.filePath, {
|
|
158
|
-
$schema: node_path_1.default.relative(this.cwd, node_path_1.default.resolve(__dirname, '..', '..', 'schemas', 'api-configuration.schema.json')).replace(/[
|
|
153
|
+
$schema: node_path_1.default.relative(this.cwd, node_path_1.default.resolve(__dirname, '..', '..', 'schemas', 'api-configuration.schema.json')).replace(/[/\\]/g, '/'),
|
|
159
154
|
swaggerTemplate: `./${node_path_1.default.basename(this.filePath, '.json')}.yaml`,
|
|
160
155
|
products: products.map((product) => `${product} API`)
|
|
161
156
|
});
|
|
@@ -168,7 +163,7 @@ class SplitYamlFormatter {
|
|
|
168
163
|
await this.generateParameterFile(writableSpec);
|
|
169
164
|
const products = await this.generateProductFiles(writableSpec);
|
|
170
165
|
await this.generateJsonFile(products);
|
|
171
|
-
// eslint-disable-next-line no-console
|
|
166
|
+
// eslint-disable-next-line no-console -- no logger available
|
|
172
167
|
console.info(`Spec generated to ${this.filePath}`);
|
|
173
168
|
}
|
|
174
169
|
/** @inheritdoc */
|
|
@@ -178,14 +173,13 @@ class SplitYamlFormatter {
|
|
|
178
173
|
...(0, utils_1.generatePackageJson)(artifactName, spec),
|
|
179
174
|
main: node_path_1.default.relative(this.cwd, this.filePath),
|
|
180
175
|
exports: {
|
|
181
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
182
176
|
'./openapi.yaml': {
|
|
183
177
|
default: node_path_1.default.relative(this.cwd, this.filePath)
|
|
184
178
|
}
|
|
185
179
|
}
|
|
186
180
|
}, null, 2);
|
|
187
181
|
await node_fs_1.default.promises.writeFile(node_path_1.default.resolve(this.cwd, 'package.json'), content);
|
|
188
|
-
// eslint-disable-next-line no-console
|
|
182
|
+
// eslint-disable-next-line no-console -- no logger available
|
|
189
183
|
console.info(`Artifact generated for ${this.filePath}`);
|
|
190
184
|
}
|
|
191
185
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"split-yaml-formatter.js","sourceRoot":"","sources":["../../../../src/core/formatters/split-yaml-formatter.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"split-yaml-formatter.js","sourceRoot":"","sources":["../../../../src/core/formatters/split-yaml-formatter.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,0DAA6B;AAC7B,qCAEiB;AAIjB,mCAEiB;AAEjB;;GAEG;AACH,MAAa,kBAAkB;IAa7B,YAA6B,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;QAZ7C,yBAAyB;QACT,uBAAkB,GAAG,aAAa,CAAC;QAEnD,sBAAsB;QACN,oBAAe,GAAG,UAAU,CAAC;QAE7C,sBAAsB;QACN,oBAAe,GAAG,YAAY,CAAC;QAM7C,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACzF,IAAI,CAAC,GAAG,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,aAAa,CAAC,QAAgB,EAAE,OAAY;QACxD,MAAM,iBAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,iBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAA,cAAQ,EAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,aAAa,CAAC,QAAgB,EAAE,OAAY;QACxD,MAAM,iBAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,MAAM,iBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,WAAgB,EAAE,KAAc;QAC/D,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACtD,OAAO,WAAW,CAAC;QACrB,CAAC;aAAM,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;YAC5B,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAa,CAAC;YAClF,OAAO,OAAO,KAAK,YAAY,CAAC,CAAC,CAAC,MAAM,OAAO,UAAU,OAAO,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,OAAO,IAAI,OAAO,UAAU,OAAO,IAAI,OAAO,EAAE,CAAC;QACzI,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACtC,OAAO,MAAM,OAAO,CAAC,GAAG,CACtB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CACnD,CAAC;QACJ,CAAC;aAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,GAAG,GAAwB,EAAE,CAAC;YACpC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACzC,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5D,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,uBAAuB,CAAC,IAAS;QAC7C,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC;aAC1B,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,kBAAkB,EAAE,GAAG,OAAO,OAAO,CAAC,EAAE;YACvG,OAAO,EAAE,KAAK;YACd,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBAC1B,KAAK,EAAE,OAAO;gBACd,WAAW,EAAE,iCAAiC,OAAO,EAAE;aACxD;YACD,WAAW,EAAE;gBACX,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;aACrC;SACF,CAAC,CAAC,CACN,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,qBAAqB,CAAC,IAAS;QACrC,OAAO,IAAI,CAAC,aAAa,CAAC,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,eAAe,OAAO,CAAC,EAAE;YAChF,OAAO,EAAE,KAAK;YACd,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;gBAC1B,KAAK,EAAE,YAAY;gBACnB,WAAW,EAAE,iCAAiC;aAC/C;YACD,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,oBAAoB,CAAC,IAAS;QAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,SAAS;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aAC9C,MAAM,CAAW,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YAC3B,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACd,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QAET,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ;aACL,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACf,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAsB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;gBAC7D,IAAI,IAAI,MAAM,CAAC,QAAQ,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1C,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACzB,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;YACP,OAAO,IAAI,CAAC,aAAa,CAAC,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,GAAG,OAAO,WAAW,CAAC,EAAE;gBAC7F,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;oBAC1B,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,iCAAiC;iBAC/C;gBACD,IAAI,EAAG,IAAI,CAAC,IAA2B;qBACpC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;qBAChC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;qBAC/B,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAC3E;gBACH,KAAK;aACN,CAAC,CAAC;QACL,CAAC,CAAC,CACL,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;OAGG;IACK,eAAe,CAAC,IAAS;QAC/B,OAAO,IAAI,CAAC,aAAa,CAAC,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,EAC/F,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;aACd,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;aACxF,MAAM,CAAuB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACvC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CACT,CAAC;IACJ,CAAC;IAED;;;OAGG;IACK,gBAAgB,CAAC,QAAkB;QACzC,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE;YACvC,OAAO,EAAE,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,mBAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,+BAA+B,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC;YACxI,eAAe,EAAE,KAAK,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO;YAClE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,OAAO,MAAM,CAAC;SACtD,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB;IACX,KAAK,CAAC,QAAQ,CAAC,IAAS;QAC7B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC;QAChE,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;QACjD,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAC/D,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACtC,6DAA6D;QAC7D,OAAO,CAAC,IAAI,CAAC,qBAAqB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,kBAAkB;IACX,KAAK,CAAC,gBAAgB,CAAC,YAAoB,EAAE,IAAS;QAC3D,MAAM,iBAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;YAC7B,GAAG,IAAA,2BAAmB,EAAC,YAAY,EAAE,IAAI,CAAC;YAC1C,IAAI,EAAE,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC;YAC5C,OAAO,EAAE;gBACP,gBAAgB,EAAE;oBAChB,OAAO,EAAE,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC;iBAChD;aACF;SACF,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEZ,MAAM,iBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7E,6DAA6D;QAC7D,OAAO,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;CACF;AApMD,gDAoMC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml-formatter.d.ts","sourceRoot":"","sources":["../../../../src/core/formatters/yaml-formatter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"yaml-formatter.d.ts","sourceRoot":"","sources":["../../../../src/core/formatters/yaml-formatter.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,SAAS,EACV,MAAM,uBAAuB,CAAC;AAK/B;;GAEG;AACH,qBAAa,aAAc,YAAW,SAAS;IAIjC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAHrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;gBAEA,QAAQ,EAAE,MAAM;IAK7C,kBAAkB;IACL,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAS/C,kBAAkB;IACL,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB9E"}
|
|
@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.YamlFormatter = void 0;
|
|
7
7
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
8
|
-
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
9
8
|
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const js_yaml_1 = require("js-yaml");
|
|
10
10
|
const utils_1 = require("./utils");
|
|
11
11
|
/**
|
|
12
12
|
* Formatter to generate YAML file
|
|
@@ -19,10 +19,10 @@ class YamlFormatter {
|
|
|
19
19
|
}
|
|
20
20
|
/** @inheritdoc */
|
|
21
21
|
async generate(spec) {
|
|
22
|
-
const content = js_yaml_1.
|
|
22
|
+
const content = (0, js_yaml_1.dump)(spec, { indent: 2 });
|
|
23
23
|
await node_fs_1.default.promises.mkdir(this.cwd, { recursive: true });
|
|
24
24
|
await node_fs_1.default.promises.writeFile(this.filePath, content);
|
|
25
|
-
// eslint-disable-next-line no-console
|
|
25
|
+
// eslint-disable-next-line no-console -- no logger available
|
|
26
26
|
console.info(`Swagger spec generated: ${this.filePath}`);
|
|
27
27
|
}
|
|
28
28
|
/** @inheritdoc */
|
|
@@ -32,14 +32,13 @@ class YamlFormatter {
|
|
|
32
32
|
...(0, utils_1.generatePackageJson)(artifactName, spec),
|
|
33
33
|
main: node_path_1.default.relative(this.cwd, this.filePath),
|
|
34
34
|
exports: {
|
|
35
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
36
35
|
'./openapi.yaml': {
|
|
37
36
|
default: node_path_1.default.relative(this.cwd, this.filePath)
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
39
|
}, null, 2);
|
|
41
40
|
await node_fs_1.default.promises.writeFile(node_path_1.default.resolve(this.cwd, 'package.json'), content);
|
|
42
|
-
// eslint-disable-next-line no-console
|
|
41
|
+
// eslint-disable-next-line no-console -- no logger available
|
|
43
42
|
console.info(`Artifact generated for ${this.filePath}`);
|
|
44
43
|
}
|
|
45
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml-formatter.js","sourceRoot":"","sources":["../../../../src/core/formatters/yaml-formatter.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"yaml-formatter.js","sourceRoot":"","sources":["../../../../src/core/formatters/yaml-formatter.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAyB;AACzB,0DAA6B;AAC7B,qCAEiB;AAIjB,mCAEiB;AAEjB;;GAEG;AACH,MAAa,aAAa;IAIxB,YAA6B,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;QAC3C,IAAI,CAAC,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC1F,IAAI,CAAC,GAAG,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzC,CAAC;IAED,kBAAkB;IACX,KAAK,CAAC,QAAQ,CAAC,IAAS;QAC7B,MAAM,OAAO,GAAG,IAAA,cAAQ,EAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAE9C,MAAM,iBAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,MAAM,iBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QACpD,6DAA6D;QAC7D,OAAO,CAAC,IAAI,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,kBAAkB;IACX,KAAK,CAAC,gBAAgB,CAAC,YAAoB,EAAE,IAAS;QAC3D,MAAM,iBAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;YAC7B,GAAG,IAAA,2BAAmB,EAAC,YAAY,EAAE,IAAI,CAAC;YAC1C,IAAI,EAAE,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC;YAC5C,OAAO,EAAE;gBACP,gBAAgB,EAAE;oBAChB,OAAO,EAAE,mBAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC;iBAChD;aACF;SACF,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEZ,MAAM,iBAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,mBAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7E,6DAA6D;QAC7D,OAAO,CAAC,IAAI,CAAC,0BAA0B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1D,CAAC;CACF;AArCD,sCAqCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-compat.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/aws-compat.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"aws-compat.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/aws-compat.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,kBAAmB,YAAW,WAAW;IACpD;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAStB;;;;;OAKG;YACW,mBAAmB;IA2BjC,kBAAkB;IACL,OAAO,CAAC,WAAW,EAAE,GAAG;CAGtC"}
|
|
@@ -11,10 +11,10 @@ class AwsCompatConverter {
|
|
|
11
11
|
* @param ancestors
|
|
12
12
|
*/
|
|
13
13
|
isInvalidField(field, ancestors) {
|
|
14
|
-
return field && (field.toLowerCase() === 'example'
|
|
15
|
-
field === 'default' && ancestors[0] === 'paths' && ancestors
|
|
16
|
-
field === 'discriminator'
|
|
17
|
-
/^x-.*/i.test(field));
|
|
14
|
+
return field && (field.toLowerCase() === 'example'
|
|
15
|
+
|| (field === 'default' && ancestors[0] === 'paths' && ancestors.at(-1) === 'responses')
|
|
16
|
+
|| field === 'discriminator'
|
|
17
|
+
|| /^x-.*/i.test(field));
|
|
18
18
|
}
|
|
19
19
|
/**
|
|
20
20
|
* Remove the invalid field from a given Swagger Spec
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-compat.js","sourceRoot":"","sources":["../../../../src/core/post-processes/aws-compat.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"aws-compat.js","sourceRoot":"","sources":["../../../../src/core/post-processes/aws-compat.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACH,MAAa,kBAAkB;IAC7B;;;;OAIG;IACK,cAAc,CAAC,KAAyB,EAAE,SAAmB;QACnE,OAAO,KAAK,IAAI,CACd,KAAK,CAAC,WAAW,EAAE,KAAK,SAAS;eAC9B,CAAC,KAAK,KAAK,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,OAAO,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC;eACrF,KAAK,KAAK,eAAe;eACzB,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CACxB,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,mBAAmB,CAAC,WAAgB,EAAE,YAAsB,EAAE,EAAE,KAAc;QAC1F,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;aAAM,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;YACjD,OAAO,SAAS,CAAC;QACnB,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACtC,OAAO,OAAO,CAAC,GAAG,CAChB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAC/D,CAAC;QACJ,CAAC;aAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC3C,IAAI,KAAK,EAAE,CAAC;gBACV,SAAS,GAAG,CAAC,GAAG,SAAS,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;YACD,MAAM,GAAG,GAA4B,EAAE,CAAC;YACxC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACzC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;gBACzE,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;oBACtB,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACf,CAAC;YACH,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,kBAAkB;IACX,KAAK,CAAC,OAAO,CAAC,WAAgB;QACnC,OAAO,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC/C,CAAC;CACF;AApDD,gDAoDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blacklist-paths.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/blacklist-paths.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"blacklist-paths.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/blacklist-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,gBAAiB,YAAW,WAAW;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,GAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAO;IAEnE,kBAAkB;IACX,OAAO,CAAC,WAAW,EAAE,GAAG;CAehC"}
|
|
@@ -14,12 +14,7 @@ class PathsBlacklister {
|
|
|
14
14
|
spec.paths = Object.keys(spec.paths)
|
|
15
15
|
.filter((p) => !this.pathPatterns
|
|
16
16
|
.some((pattern) => {
|
|
17
|
-
|
|
18
|
-
return p === pattern;
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
return pattern.test(p);
|
|
22
|
-
}
|
|
17
|
+
return typeof pattern === 'string' ? p === pattern : pattern.test(p);
|
|
23
18
|
}))
|
|
24
19
|
.reduce((acc, p) => {
|
|
25
20
|
acc[p] = spec.paths[p];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blacklist-paths.js","sourceRoot":"","sources":["../../../../src/core/post-processes/blacklist-paths.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"blacklist-paths.js","sourceRoot":"","sources":["../../../../src/core/post-processes/blacklist-paths.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACH,MAAa,gBAAgB;IAC3B,YAA6B,eAAoC,EAAE;QAAtC,iBAAY,GAAZ,YAAY,CAA0B;IAAG,CAAC;IAEvE,kBAAkB;IACX,OAAO,CAAC,WAAgB;QAC7B,MAAM,IAAI,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;aACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY;aAC9B,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAChB,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CACH;aACA,MAAM,CAAM,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACtB,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QAET,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAnBD,4CAmBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flag-definition.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/flag-definition.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"flag-definition.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/flag-definition.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,cAAe,YAAW,WAAW;IAChD,kBAAkB;IACX,OAAO,CAAC,WAAW,EAAE,GAAG;CAYhC"}
|
|
@@ -11,7 +11,6 @@ class FlagDefinition {
|
|
|
11
11
|
definitions: Object.entries(swaggerSpec.definitions).reduce((definitions, [definitionName, definition]) => {
|
|
12
12
|
definitions[definitionName] = {
|
|
13
13
|
...definition,
|
|
14
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
15
14
|
'x-api-ref': definitionName
|
|
16
15
|
};
|
|
17
16
|
return definitions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flag-definition.js","sourceRoot":"","sources":["../../../../src/core/post-processes/flag-definition.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"flag-definition.js","sourceRoot":"","sources":["../../../../src/core/post-processes/flag-definition.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACH,MAAa,cAAc;IACzB,kBAAkB;IACX,OAAO,CAAC,WAAgB;QAC7B,MAAM,IAAI,GAAG,EAAE,GAAG,WAAW;YAC3B,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,cAAc,EAAE,UAAU,CAAC,EAAE,EAAE;gBACxG,WAAW,CAAC,cAAc,CAAC,GAAG;oBAC5B,GAAG,UAAiB;oBACpB,WAAW,EAAE,cAAc;iBAC5B,CAAC;gBACF,OAAO,WAAW,CAAC;YACrB,CAAC,EAAE,EAAyB,CAAC;SAC9B,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAdD,wCAcC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatten-conflicted-allof.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/flatten-conflicted-allof.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"flatten-conflicted-allof.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/flatten-conflicted-allof.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,qBAAa,sBAAuB,YAAW,WAAW;IACxD,kBAAkB;IACX,OAAO,CAAC,WAAW,EAAE,GAAG;CAmFhC"}
|
|
@@ -62,7 +62,7 @@ class FlattenConflictedAllOf {
|
|
|
62
62
|
.filter((definition) => !definition[utils_1.X_VENDOR_CONFLICT_TAG] && definition.allOf)
|
|
63
63
|
.forEach((definition) => {
|
|
64
64
|
// If not an allOf or if the allOf it not based on conflicting definition, we skip the process
|
|
65
|
-
if (!(definition.allOf && definition.allOf.some((def) => def.$ref && def.$ref.split('/').
|
|
65
|
+
if (!(definition.allOf && definition.allOf.some((def) => def.$ref && def.$ref.split('/').at(-1) in Object.keys(toFlattenDefinitions)))) {
|
|
66
66
|
return;
|
|
67
67
|
}
|
|
68
68
|
// Simple case: extension of an existing definition (so an allOf with a ref to a conflicted def and an object definition to extend it)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatten-conflicted-allof.js","sourceRoot":"","sources":["../../../../src/core/post-processes/flatten-conflicted-allof.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"flatten-conflicted-allof.js","sourceRoot":"","sources":["../../../../src/core/post-processes/flatten-conflicted-allof.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"propagate-xvendor.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/propagate-xvendor.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"propagate-xvendor.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/propagate-xvendor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,gBAAiB,YAAW,WAAW;IACtC,OAAO,CAAC,QAAQ,CAAC,oBAAoB;gBAApB,oBAAoB,SAAc;IAE/D,OAAO,CAAC,aAAa;IA+BrB,OAAO,CAAC,kBAAkB;IAO1B,kBAAkB;IACX,OAAO,CAAC,WAAW,EAAE,GAAG;CAQhC"}
|
|
@@ -46,7 +46,7 @@ class PropagateXvendor {
|
|
|
46
46
|
}
|
|
47
47
|
/** @inheritdoc */
|
|
48
48
|
execute(swaggerSpec) {
|
|
49
|
-
// eslint-disable-next-line no-console
|
|
49
|
+
// eslint-disable-next-line no-console -- no logger available
|
|
50
50
|
console.info('Propagate flag: ' + this.vendorExtToPropagate);
|
|
51
51
|
return {
|
|
52
52
|
...swaggerSpec,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"propagate-xvendor.js","sourceRoot":"","sources":["../../../../src/core/post-processes/propagate-xvendor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"propagate-xvendor.js","sourceRoot":"","sources":["../../../../src/core/post-processes/propagate-xvendor.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACH,MAAa,gBAAgB;IAC3B,YAA6B,uBAAuB,WAAW;QAAlC,yBAAoB,GAApB,oBAAoB,CAAc;IAAG,CAAC;IAE3D,aAAa,CAAC,cAAsB,EAAE,UAAe,EAAE,UAAe,EAAE,aAAkB;QAChG,IAAI,CAAC,UAAU,CAAC,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC/D,aAAa,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;QAC7C,CAAC;aAAM,CAAC;YACN,MAAM,uBAAuB,GAAG,sBAAsB,CAAC;YACvD,MAAM,cAAc,GAAI,UAAU,CAAC,KAAe,CAAC,MAAM,CAAC,CAAC,GAAQ,EAA2B,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;iBACzG,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACX,MAAM,OAAO,GAAG,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAC,CAAC,CAAC;gBAC3D,OAAO;oBACL,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC;iBAC3B,CAAC;YACJ,CAAC,CAAC;iBACD,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACjB,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBAClC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;gBAC/E,CAAC;gBACD,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;gBAC3E,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,OAAO,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;oBAClC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,UAAU,CAAC;oBAChD,aAAa,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC;gBAC1C,CAAC;gBACD,OAAO,CAAC,CAAC,UAAU,CAAC;YACtB,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,aAAa,CAAC,cAAc,CAAC,GAAG,UAAU,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,WAAgB;QACzC,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,EAAE,UAAU,CAAC,EAAE,EAAE,CACnE,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QACvE,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,kBAAkB;IACX,OAAO,CAAC,WAAgB;QAC7B,6DAA6D;QAC7D,OAAO,CAAC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC7D,OAAO;YACL,GAAG,WAAW;YACd,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,WAAW,CAAC;SAC9D,CAAC;IACJ,CAAC;CACF;AAlDD,4CAkDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-discriminator.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/resolve-discriminator.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"resolve-discriminator.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/resolve-discriminator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,oBAAqB,YAAW,WAAW;IACtD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAA0B;IAElE,OAAO,CAAC,oBAAoB;IA0C5B,OAAO,CAAC,kBAAkB;IAQ1B,kBAAkB;IACX,OAAO,CAAC,WAAW,EAAE,GAAG;CAQhC"}
|
|
@@ -9,24 +9,13 @@ class ResolveDiscriminator {
|
|
|
9
9
|
this.captureDefinitionRegExp = /#\/definitions\/(.*)/;
|
|
10
10
|
}
|
|
11
11
|
resolveDiscriminator(definitionName, definition, processedDefs, discriminator) {
|
|
12
|
-
if (
|
|
13
|
-
const inlineDiscDef = definition.allOf && definition.allOf.find((allOfDef) => !!allOfDef.discriminator);
|
|
14
|
-
if (inlineDiscDef) {
|
|
15
|
-
definition.allOf.filter((ref) => !!ref.$ref)
|
|
16
|
-
.forEach((ref) => {
|
|
17
|
-
const parentDefName = this.captureDefinitionRegExp.exec(ref.$ref)[1];
|
|
18
|
-
// discriminator found on a property inside an allOf, call recursively the resolver to find if it appears on a parent definition
|
|
19
|
-
this.resolveDiscriminator(parentDefName, processedDefs[parentDefName], processedDefs, inlineDiscDef.discriminator);
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
else {
|
|
12
|
+
if (discriminator) {
|
|
24
13
|
// Looked up discriminator found at definition level.
|
|
25
14
|
if (discriminator === definition.discriminator) {
|
|
26
15
|
// Delete the discriminator in this case
|
|
27
16
|
processedDefs[definitionName] = { ...definition };
|
|
28
17
|
delete processedDefs[definitionName].discriminator;
|
|
29
|
-
// eslint-disable-next-line no-console
|
|
18
|
+
// eslint-disable-next-line no-console -- no logger available
|
|
30
19
|
console.info('Discriminator ' + discriminator + ' removed from ' + definitionName);
|
|
31
20
|
}
|
|
32
21
|
if (definition.allOf) {
|
|
@@ -37,7 +26,7 @@ class ResolveDiscriminator {
|
|
|
37
26
|
}
|
|
38
27
|
const newLine = { ...definition.allOf };
|
|
39
28
|
delete newLine.discriminator;
|
|
40
|
-
// eslint-disable-next-line no-console
|
|
29
|
+
// eslint-disable-next-line no-console -- no logger available
|
|
41
30
|
console.info('Discriminator ' + discriminator + ' removed the AllOf of ' + definitionName);
|
|
42
31
|
return newLine;
|
|
43
32
|
});
|
|
@@ -49,6 +38,17 @@ class ResolveDiscriminator {
|
|
|
49
38
|
});
|
|
50
39
|
}
|
|
51
40
|
}
|
|
41
|
+
else {
|
|
42
|
+
const inlineDiscDef = definition.allOf && definition.allOf.find((allOfDef) => !!allOfDef.discriminator);
|
|
43
|
+
if (inlineDiscDef) {
|
|
44
|
+
definition.allOf.filter((ref) => !!ref.$ref)
|
|
45
|
+
.forEach((ref) => {
|
|
46
|
+
const parentDefName = this.captureDefinitionRegExp.exec(ref.$ref)[1];
|
|
47
|
+
// discriminator found on a property inside an allOf, call recursively the resolver to find if it appears on a parent definition
|
|
48
|
+
this.resolveDiscriminator(parentDefName, processedDefs[parentDefName], processedDefs, inlineDiscDef.discriminator);
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
52
|
}
|
|
53
53
|
processDefinitions(definitions) {
|
|
54
54
|
const result = { ...definitions };
|
|
@@ -59,7 +59,7 @@ class ResolveDiscriminator {
|
|
|
59
59
|
}
|
|
60
60
|
/** @inheritdoc */
|
|
61
61
|
execute(swaggerSpec) {
|
|
62
|
-
// eslint-disable-next-line no-console
|
|
62
|
+
// eslint-disable-next-line no-console -- no logger available
|
|
63
63
|
console.info('Resolve discriminator...');
|
|
64
64
|
return {
|
|
65
65
|
...swaggerSpec,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-discriminator.js","sourceRoot":"","sources":["../../../../src/core/post-processes/resolve-discriminator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"resolve-discriminator.js","sourceRoot":"","sources":["../../../../src/core/post-processes/resolve-discriminator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-shaker.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/tree-shaker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tree-shaker.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/tree-shaker.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,mBAAmB,EACpB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,UAAW,YAAW,WAAW;IAC5C;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAKxB;;;;OAIG;YACW,sBAAsB;IAQpC;;;;OAIG;YACW,sCAAsC;IAQpD;;;;OAIG;YACW,uCAAuC;IAiBrD,kBAAkB;IACL,OAAO,CAAC,WAAW,EAAE,GAAG,EAAE,mBAAmB,GAAE,mBAAiC,GAAG,OAAO,CAAC,GAAG,CAAC;CAW7G"}
|
|
@@ -13,7 +13,7 @@ class TreeShaker {
|
|
|
13
13
|
*/
|
|
14
14
|
removeUnusedTags(spec) {
|
|
15
15
|
const tags = (0, spec_parser_1.getTags)(spec);
|
|
16
|
-
spec.tags = spec.tags.filter((tag) => tags.
|
|
16
|
+
spec.tags = spec.tags.filter((tag) => tags.includes(tag.name));
|
|
17
17
|
}
|
|
18
18
|
/**
|
|
19
19
|
* Remove all parameters not accessible from paths
|
|
@@ -21,7 +21,8 @@ class TreeShaker {
|
|
|
21
21
|
* @private
|
|
22
22
|
*/
|
|
23
23
|
async removeUnusedParameters(spec) {
|
|
24
|
-
const
|
|
24
|
+
const references = await (0, spec_parser_1.findReferences)(spec.paths);
|
|
25
|
+
const parameterReferences = references.filter((ref) => ref.type === 'parameters');
|
|
25
26
|
spec.parameters = Object.fromEntries(Object.entries(spec.parameters)
|
|
26
27
|
.filter(([parameterName]) => parameterReferences.some((ref) => ref.name === parameterName)));
|
|
27
28
|
}
|
|
@@ -48,8 +49,8 @@ class TreeShaker {
|
|
|
48
49
|
const references = await (0, spec_parser_1.findReferences)(spec);
|
|
49
50
|
const discriminatorRefs = (0, spec_parser_1.getDiscriminatorLinks)(spec);
|
|
50
51
|
spec.definitions = Object.fromEntries(Object.entries(spec.definitions)
|
|
51
|
-
.filter(([definitionName]) => references.some((ref) => ref.type === 'definitions' && ref.name === definitionName)
|
|
52
|
-
Object.keys(discriminatorRefs).some((discriminatorModel) => spec.definitions[discriminatorModel] && discriminatorRefs[discriminatorModel].
|
|
52
|
+
.filter(([definitionName]) => references.some((ref) => ref.type === 'definitions' && ref.name === definitionName)
|
|
53
|
+
|| Object.keys(discriminatorRefs).some((discriminatorModel) => spec.definitions[discriminatorModel] && discriminatorRefs[discriminatorModel].includes(definitionName))));
|
|
53
54
|
} while (nbEntities !== Object.keys(spec.definitions).length);
|
|
54
55
|
}
|
|
55
56
|
/** @inheritdoc */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree-shaker.js","sourceRoot":"","sources":["../../../../src/core/post-processes/tree-shaker.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"tree-shaker.js","sourceRoot":"","sources":["../../../../src/core/post-processes/tree-shaker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/validate.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/validate.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,SAAU,YAAW,WAAW;IAC3C;;;OAGG;YACW,IAAI;IAsBlB,kBAAkB;IACL,OAAO,CAAC,WAAW,EAAE,GAAG;CAetC"}
|
|
@@ -43,11 +43,12 @@ class Validator {
|
|
|
43
43
|
return swaggerSpec;
|
|
44
44
|
}
|
|
45
45
|
catch (error) {
|
|
46
|
-
/* eslint-disable no-console */
|
|
46
|
+
/* eslint-disable no-console -- no logger available */
|
|
47
47
|
console.error('Error while validating the swagger spec:');
|
|
48
48
|
console.error(error.message);
|
|
49
49
|
console.error(error.stack);
|
|
50
50
|
/* eslint-enable no-console */
|
|
51
|
+
// eslint-disable-next-line unicorn/no-process-exit -- false positive it will be executed in a cli
|
|
51
52
|
process.exit(1);
|
|
52
53
|
}
|
|
53
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/core/post-processes/validate.ts"],"names":[],"mappings":";;;;;;AAAA,iFAAwD;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/core/post-processes/validate.ts"],"names":[],"mappings":";;;;;;AAAA,iFAAwD;AAKxD;;GAEG;AACH,MAAa,SAAS;IACpB;;;OAGG;IACK,KAAK,CAAC,IAAI,CAAC,WAAgB;QACjC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;aAAM,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;YACtC,OAAO,OAAO,CAAC,GAAG,CAChB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CACrC,CAAC;QACJ,CAAC;aAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,GAAG,GAA4B,EAAE,CAAC;YACxC,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACzC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;oBACtB,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACf,CAAC;YACH,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,kBAAkB;IACX,KAAK,CAAC,OAAO,CAAC,WAAgB;QACnC,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACzC,MAAM,wBAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAClC,OAAO,WAAW,CAAC;QACrB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,sDAAsD;YACtD,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;YAC1D,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3B,8BAA8B;YAC9B,kGAAkG;YAClG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF;AA3CD,8BA2CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whitelist-paths.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/whitelist-paths.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"whitelist-paths.d.ts","sourceRoot":"","sources":["../../../../src/core/post-processes/whitelist-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACZ,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,gBAAiB,YAAW,WAAW;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAAZ,YAAY,GAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAO;IAEnE,kBAAkB;IACX,OAAO,CAAC,WAAW,EAAE,GAAG;CAehC"}
|
|
@@ -14,12 +14,7 @@ class PathsWhitelister {
|
|
|
14
14
|
spec.paths = Object.keys(spec.paths)
|
|
15
15
|
.filter((p) => this.pathPatterns
|
|
16
16
|
.some((pattern) => {
|
|
17
|
-
|
|
18
|
-
return p === pattern;
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
return pattern.test(p);
|
|
22
|
-
}
|
|
17
|
+
return typeof pattern === 'string' ? p === pattern : pattern.test(p);
|
|
23
18
|
}))
|
|
24
19
|
.reduce((acc, p) => {
|
|
25
20
|
acc[p] = spec.paths[p];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whitelist-paths.js","sourceRoot":"","sources":["../../../../src/core/post-processes/whitelist-paths.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"whitelist-paths.js","sourceRoot":"","sources":["../../../../src/core/post-processes/whitelist-paths.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACH,MAAa,gBAAgB;IAC3B,YAA6B,eAAoC,EAAE;QAAtC,iBAAY,GAAZ,YAAY,CAA0B;IAAG,CAAC;IAEvE,kBAAkB;IACX,OAAO,CAAC,WAAgB;QAC7B,MAAM,IAAI,GAAG,EAAE,GAAG,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;aACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY;aAC7B,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAChB,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CACH;aACA,MAAM,CAAM,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACtB,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACvB,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QAET,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAnBD,4CAmBC"}
|
|
@@ -60,9 +60,9 @@ export declare class SwaggerSpecMerger {
|
|
|
60
60
|
* @param currentNode Node to inspect in the Swagger spec object
|
|
61
61
|
* @param replace Reference to replace
|
|
62
62
|
* @param replace.swaggerPath
|
|
63
|
-
* @param field Field of the node
|
|
64
63
|
* @param replace.innerPath
|
|
65
64
|
* @param replace.newPath
|
|
65
|
+
* @param field Field of the node
|
|
66
66
|
*/
|
|
67
67
|
private replaceOuterRef;
|
|
68
68
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swagger-spec-merger.d.ts","sourceRoot":"","sources":["../../../src/core/swagger-spec-merger.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"swagger-spec-merger.d.ts","sourceRoot":"","sources":["../../../src/core/swagger-spec-merger.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,IAAI,EACL,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,WAAW,EACZ,MAAM,gDAAgD,CAAC;AAaxD;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,yCAAyC;IACzC,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAID;;GAEG;AACH,qBAAa,iBAAiB;IAmBT,KAAK,EAAE,WAAW,EAAE;IAAS,kBAAkB,EAAE,MAAM,EAAE;IAlB5E,qDAAqD;IACrD,OAAO,CAAC,eAAe,CAAoD;IAE3E,sDAAsD;IACtD,OAAO,CAAC,aAAa,CAMnB;IAEF,mEAAmE;IACnE,OAAO,CAAC,mBAAmB,CAAqE;IAEhG,sEAAsE;IAC/D,eAAe,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAA;KAAE,CAAM;gBAE1C,KAAK,EAAE,WAAW,EAAE,EAAS,kBAAkB,GAAE,MAAM,EAAO;IAEjF;;OAEG;YACW,KAAK;IAUnB;;;;;OAKG;YACW,sBAAsB;IAoEpC;;;;;OAKG;YACW,yBAAyB;IAqBvC;;;OAGG;YACW,qBAAqB;IAiBnC;;;;OAIG;YACW,eAAe;IA8B7B;;;;;;;;OAQG;YACW,eAAe;IAyB7B;;OAEG;YACW,YAAY;IAc1B;;OAEG;YACW,SAAS;IAgBvB;;OAEG;YACW,eAAe;IAc7B;;;OAGG;YACW,UAAU;IA2CxB;;OAEG;YACW,gBAAgB;IAc9B;;OAEG;YACW,cAAc;IAc5B;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAelB;;;OAGG;IACU,KAAK,CAAC,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CA4B1D"}
|