@sdk-it/spec 0.46.9 → 0.46.11
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/dist/lib/external-documents.d.ts +7 -0
- package/dist/lib/external-documents.d.ts.map +1 -0
- package/dist/lib/external-documents.js +54 -0
- package/dist/lib/external-documents.js.map +7 -0
- package/dist/lib/processing-plugins/bundle-external-refs.d.ts +10 -0
- package/dist/lib/processing-plugins/bundle-external-refs.d.ts.map +1 -0
- package/dist/lib/processing-plugins/bundle-external-refs.js +226 -0
- package/dist/lib/processing-plugins/bundle-external-refs.js.map +7 -0
- package/dist/lib/processing-plugins/create-default-processing-plugins.d.ts.map +1 -1
- package/dist/lib/processing-plugins/create-default-processing-plugins.js +2 -0
- package/dist/lib/processing-plugins/create-default-processing-plugins.js.map +2 -2
- package/dist/lib/processing-plugins/index.d.ts +1 -0
- package/dist/lib/processing-plugins/index.d.ts.map +1 -1
- package/dist/lib/processing-plugins/index.js +1 -0
- package/dist/lib/processing-plugins/index.js.map +2 -2
- package/dist/lib/processing-plugins/normalize-responses.d.ts.map +1 -1
- package/dist/lib/processing-plugins/normalize-responses.js +44 -25
- package/dist/lib/processing-plugins/normalize-responses.js.map +2 -2
- package/dist/lib/processing-plugins/normalize-schemas.d.ts.map +1 -1
- package/dist/lib/processing-plugins/normalize-schemas.js +10 -3
- package/dist/lib/processing-plugins/normalize-schemas.js.map +2 -2
- package/dist/lib/processing-plugins/resolve-security-scheme-uris.d.ts.map +1 -1
- package/dist/lib/processing-plugins/resolve-security-scheme-uris.js +12 -54
- package/dist/lib/processing-plugins/resolve-security-scheme-uris.js.map +2 -2
- package/dist/lib/types.d.ts +7 -3
- package/dist/lib/types.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export type Documents = Map<string, Promise<unknown>>;
|
|
2
|
+
export declare function documentUrl(location: string, base: string | undefined): URL;
|
|
3
|
+
export declare function loadDocument(url: URL, documents: Documents): Promise<unknown>;
|
|
4
|
+
export declare function splitFragment(uri: string): [string, string | undefined];
|
|
5
|
+
export declare function readPointer(document: unknown, fragment: string): unknown;
|
|
6
|
+
export declare function availableName(taken: Record<string, unknown>, candidate: string): string;
|
|
7
|
+
//# sourceMappingURL=external-documents.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"external-documents.d.ts","sourceRoot":"","sources":["../../src/lib/external-documents.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;AAEtD,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,OAOrE;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,oBAS1D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAKvE;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAmB9D;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,MAAM,UAQlB"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { fileURLToPath } from "node:url";
|
|
2
|
+
import { loadFile } from "./loaders/load-spec.js";
|
|
3
|
+
function documentUrl(location, base) {
|
|
4
|
+
if (!base && !URL.canParse(location)) {
|
|
5
|
+
throw new Error(
|
|
6
|
+
"the document declares no $self, so a relative URI has no base to resolve against"
|
|
7
|
+
);
|
|
8
|
+
}
|
|
9
|
+
return new URL(location, base);
|
|
10
|
+
}
|
|
11
|
+
function loadDocument(url, documents) {
|
|
12
|
+
let pending = documents.get(url.href);
|
|
13
|
+
if (!pending) {
|
|
14
|
+
pending = loadFile(
|
|
15
|
+
url.protocol === "file:" ? fileURLToPath(url) : url.href
|
|
16
|
+
);
|
|
17
|
+
documents.set(url.href, pending);
|
|
18
|
+
}
|
|
19
|
+
return pending;
|
|
20
|
+
}
|
|
21
|
+
function splitFragment(uri) {
|
|
22
|
+
const index = uri.indexOf("#");
|
|
23
|
+
return index === -1 ? [uri, void 0] : [uri.slice(0, index), uri.slice(index + 1)];
|
|
24
|
+
}
|
|
25
|
+
function readPointer(document, fragment) {
|
|
26
|
+
let current = document;
|
|
27
|
+
for (const segment of fragment.split("/")) {
|
|
28
|
+
if (!segment) {
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
const key = decodeURIComponent(segment).replaceAll("~1", "/").replaceAll("~0", "~");
|
|
32
|
+
if (current === null || typeof current !== "object" || !(key in current)) {
|
|
33
|
+
throw new Error(`no value at pointer #${fragment}`);
|
|
34
|
+
}
|
|
35
|
+
current = current[key];
|
|
36
|
+
}
|
|
37
|
+
return current;
|
|
38
|
+
}
|
|
39
|
+
function availableName(taken, candidate) {
|
|
40
|
+
let name = candidate;
|
|
41
|
+
let suffix = 2;
|
|
42
|
+
while (taken[name]) {
|
|
43
|
+
name = `${candidate}${suffix++}`;
|
|
44
|
+
}
|
|
45
|
+
return name;
|
|
46
|
+
}
|
|
47
|
+
export {
|
|
48
|
+
availableName,
|
|
49
|
+
documentUrl,
|
|
50
|
+
loadDocument,
|
|
51
|
+
readPointer,
|
|
52
|
+
splitFragment
|
|
53
|
+
};
|
|
54
|
+
//# sourceMappingURL=external-documents.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../src/lib/external-documents.ts"],
|
|
4
|
+
"sourcesContent": ["import { fileURLToPath } from 'node:url';\n\nimport { loadFile } from './loaders/load-spec.js';\n\nexport type Documents = Map<string, Promise<unknown>>;\n\nexport function documentUrl(location: string, base: string | undefined) {\n if (!base && !URL.canParse(location)) {\n throw new Error(\n 'the document declares no $self, so a relative URI has no base to resolve against',\n );\n }\n return new URL(location, base);\n}\n\nexport function loadDocument(url: URL, documents: Documents) {\n let pending = documents.get(url.href);\n if (!pending) {\n pending = loadFile(\n url.protocol === 'file:' ? fileURLToPath(url) : url.href,\n );\n documents.set(url.href, pending);\n }\n return pending;\n}\n\nexport function splitFragment(uri: string): [string, string | undefined] {\n const index = uri.indexOf('#');\n return index === -1\n ? [uri, undefined]\n : [uri.slice(0, index), uri.slice(index + 1)];\n}\n\nexport function readPointer(document: unknown, fragment: string) {\n let current: unknown = document;\n for (const segment of fragment.split('/')) {\n if (!segment) {\n continue;\n }\n const key = decodeURIComponent(segment)\n .replaceAll('~1', '/')\n .replaceAll('~0', '~');\n if (\n current === null ||\n typeof current !== 'object' ||\n !(key in (current as object))\n ) {\n throw new Error(`no value at pointer #${fragment}`);\n }\n current = (current as Record<string, unknown>)[key];\n }\n return current;\n}\n\nexport function availableName(\n taken: Record<string, unknown>,\n candidate: string,\n) {\n let name = candidate;\n let suffix = 2;\n while (taken[name]) {\n name = `${candidate}${suffix++}`;\n }\n return name;\n}\n"],
|
|
5
|
+
"mappings": "AAAA,SAAS,qBAAqB;AAE9B,SAAS,gBAAgB;AAIlB,SAAS,YAAY,UAAkB,MAA0B;AACtE,MAAI,CAAC,QAAQ,CAAC,IAAI,SAAS,QAAQ,GAAG;AACpC,UAAM,IAAI;AAAA,MACR;AAAA,IACF;AAAA,EACF;AACA,SAAO,IAAI,IAAI,UAAU,IAAI;AAC/B;AAEO,SAAS,aAAa,KAAU,WAAsB;AAC3D,MAAI,UAAU,UAAU,IAAI,IAAI,IAAI;AACpC,MAAI,CAAC,SAAS;AACZ,cAAU;AAAA,MACR,IAAI,aAAa,UAAU,cAAc,GAAG,IAAI,IAAI;AAAA,IACtD;AACA,cAAU,IAAI,IAAI,MAAM,OAAO;AAAA,EACjC;AACA,SAAO;AACT;AAEO,SAAS,cAAc,KAA2C;AACvE,QAAM,QAAQ,IAAI,QAAQ,GAAG;AAC7B,SAAO,UAAU,KACb,CAAC,KAAK,MAAS,IACf,CAAC,IAAI,MAAM,GAAG,KAAK,GAAG,IAAI,MAAM,QAAQ,CAAC,CAAC;AAChD;AAEO,SAAS,YAAY,UAAmB,UAAkB;AAC/D,MAAI,UAAmB;AACvB,aAAW,WAAW,SAAS,MAAM,GAAG,GAAG;AACzC,QAAI,CAAC,SAAS;AACZ;AAAA,IACF;AACA,UAAM,MAAM,mBAAmB,OAAO,EACnC,WAAW,MAAM,GAAG,EACpB,WAAW,MAAM,GAAG;AACvB,QACE,YAAY,QACZ,OAAO,YAAY,YACnB,EAAE,OAAQ,UACV;AACA,YAAM,IAAI,MAAM,wBAAwB,QAAQ,EAAE;AAAA,IACpD;AACA,cAAW,QAAoC,GAAG;AAAA,EACpD;AACA,SAAO;AACT;AAEO,SAAS,cACd,OACA,WACA;AACA,MAAI,OAAO;AACX,MAAI,SAAS;AACb,SAAO,MAAM,IAAI,GAAG;AAClB,WAAO,GAAG,SAAS,GAAG,QAAQ;AAAA,EAChC;AACA,SAAO;AACT;",
|
|
6
|
+
"names": []
|
|
7
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { ProcessingPlugin } from '../processing.js';
|
|
2
|
+
/**
|
|
3
|
+
* The IR holds only local `#/…` references; every later plugin relies on it.
|
|
4
|
+
* External references are brought in before anything else runs: each target
|
|
5
|
+
* is hoisted into the components section its position calls for and the
|
|
6
|
+
* reference rewritten to it, resolving relative references against the
|
|
7
|
+
* document that holds them.
|
|
8
|
+
*/
|
|
9
|
+
export declare function bundleExternalRefs(): ProcessingPlugin;
|
|
10
|
+
//# sourceMappingURL=bundle-external-refs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bundle-external-refs.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/bundle-external-refs.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AA4EzD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,IAAI,gBAAgB,CAmBrD"}
|
|
@@ -0,0 +1,226 @@
|
|
|
1
|
+
import { isRef } from "@sdk-it/core";
|
|
2
|
+
import {
|
|
3
|
+
availableName,
|
|
4
|
+
documentUrl,
|
|
5
|
+
loadDocument,
|
|
6
|
+
readPointer,
|
|
7
|
+
splitFragment
|
|
8
|
+
} from "../external-documents.js";
|
|
9
|
+
const sections = {
|
|
10
|
+
Schema: "schemas",
|
|
11
|
+
Parameter: "parameters",
|
|
12
|
+
Header: "headers",
|
|
13
|
+
RequestBody: "requestBodies",
|
|
14
|
+
Response: "responses",
|
|
15
|
+
Example: "examples",
|
|
16
|
+
Link: "links",
|
|
17
|
+
Callback: "callbacks",
|
|
18
|
+
SecurityScheme: "securitySchemes"
|
|
19
|
+
};
|
|
20
|
+
const componentTypes = {
|
|
21
|
+
schemas: "Schema",
|
|
22
|
+
parameters: "Parameter",
|
|
23
|
+
headers: "Header",
|
|
24
|
+
requestBodies: "RequestBody",
|
|
25
|
+
responses: "Response",
|
|
26
|
+
examples: "Example",
|
|
27
|
+
links: "Link",
|
|
28
|
+
callbacks: "Callback",
|
|
29
|
+
securitySchemes: "SecurityScheme",
|
|
30
|
+
pathItems: "PathItem"
|
|
31
|
+
};
|
|
32
|
+
const operationMethods = [
|
|
33
|
+
"get",
|
|
34
|
+
"put",
|
|
35
|
+
"post",
|
|
36
|
+
"delete",
|
|
37
|
+
"options",
|
|
38
|
+
"head",
|
|
39
|
+
"patch",
|
|
40
|
+
"trace"
|
|
41
|
+
];
|
|
42
|
+
const schemaDataKeys = /* @__PURE__ */ new Set([
|
|
43
|
+
"example",
|
|
44
|
+
"examples",
|
|
45
|
+
"default",
|
|
46
|
+
"const",
|
|
47
|
+
"enum"
|
|
48
|
+
]);
|
|
49
|
+
function bundleExternalRefs() {
|
|
50
|
+
return {
|
|
51
|
+
name: "bundle-external-refs",
|
|
52
|
+
async process({ spec }) {
|
|
53
|
+
const bundle = {
|
|
54
|
+
spec,
|
|
55
|
+
root: spec.$self,
|
|
56
|
+
documents: /* @__PURE__ */ new Map(),
|
|
57
|
+
hoisted: /* @__PURE__ */ new Map(),
|
|
58
|
+
inlining: /* @__PURE__ */ new Set()
|
|
59
|
+
};
|
|
60
|
+
await visitMap(spec.paths, "PathItem", bundle.root, bundle);
|
|
61
|
+
await visitMap(spec.webhooks, "PathItem", bundle.root, bundle);
|
|
62
|
+
const components = spec.components;
|
|
63
|
+
for (const [section, type] of Object.entries(componentTypes)) {
|
|
64
|
+
await visitMap(components[section], type, bundle.root, bundle);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
async function visit(node, type, base, bundle) {
|
|
70
|
+
if (node === null || typeof node !== "object") {
|
|
71
|
+
return node;
|
|
72
|
+
}
|
|
73
|
+
if (isRef(node)) {
|
|
74
|
+
return visitRef(node, type, base, bundle);
|
|
75
|
+
}
|
|
76
|
+
await visitChildren(node, type, base, bundle);
|
|
77
|
+
return node;
|
|
78
|
+
}
|
|
79
|
+
async function visitRef(node, type, base, bundle) {
|
|
80
|
+
const [location, fragment = ""] = splitFragment(node.$ref);
|
|
81
|
+
if (!location && base === bundle.root) {
|
|
82
|
+
return node;
|
|
83
|
+
}
|
|
84
|
+
let url;
|
|
85
|
+
try {
|
|
86
|
+
url = documentUrl(location, base);
|
|
87
|
+
} catch (error) {
|
|
88
|
+
throw unresolved(node.$ref, base, error);
|
|
89
|
+
}
|
|
90
|
+
if (url.href === bundle.root) {
|
|
91
|
+
node.$ref = `#${fragment}`;
|
|
92
|
+
return node;
|
|
93
|
+
}
|
|
94
|
+
const key = `${url.href}#${fragment}`;
|
|
95
|
+
const section = sections[type];
|
|
96
|
+
const hoisted = bundle.hoisted.get(key);
|
|
97
|
+
if (section && hoisted) {
|
|
98
|
+
node.$ref = `#/components/${section}/${hoisted}`;
|
|
99
|
+
return node;
|
|
100
|
+
}
|
|
101
|
+
if (!section && bundle.inlining.has(key)) {
|
|
102
|
+
throw unresolved(node.$ref, base, new Error("the reference is circular"));
|
|
103
|
+
}
|
|
104
|
+
let target;
|
|
105
|
+
try {
|
|
106
|
+
const document = await loadDocument(url, bundle.documents);
|
|
107
|
+
target = structuredClone(
|
|
108
|
+
fragment ? readPointer(document, fragment) : document
|
|
109
|
+
);
|
|
110
|
+
} catch (error) {
|
|
111
|
+
throw unresolved(node.$ref, base, error);
|
|
112
|
+
}
|
|
113
|
+
if (!section) {
|
|
114
|
+
bundle.inlining.add(key);
|
|
115
|
+
const inlined = await visit(target, type, url.href, bundle);
|
|
116
|
+
bundle.inlining.delete(key);
|
|
117
|
+
return inlined;
|
|
118
|
+
}
|
|
119
|
+
const components = bundle.spec.components;
|
|
120
|
+
const registry = components[section] ??= {};
|
|
121
|
+
const name = availableName(
|
|
122
|
+
registry,
|
|
123
|
+
componentName(location, fragment, section)
|
|
124
|
+
);
|
|
125
|
+
registry[name] = target;
|
|
126
|
+
bundle.hoisted.set(key, name);
|
|
127
|
+
registry[name] = await visit(target, type, url.href, bundle);
|
|
128
|
+
node.$ref = `#/components/${section}/${name}`;
|
|
129
|
+
return node;
|
|
130
|
+
}
|
|
131
|
+
async function visitChildren(node, type, base, bundle) {
|
|
132
|
+
switch (type) {
|
|
133
|
+
case "Schema":
|
|
134
|
+
return visitSchema(node, base, bundle);
|
|
135
|
+
case "PathItem":
|
|
136
|
+
await visitList(node, "parameters", "Parameter", base, bundle);
|
|
137
|
+
for (const method of operationMethods) {
|
|
138
|
+
await visitKey(node, method, "Operation", base, bundle);
|
|
139
|
+
}
|
|
140
|
+
return;
|
|
141
|
+
case "Operation":
|
|
142
|
+
await visitList(node, "parameters", "Parameter", base, bundle);
|
|
143
|
+
await visitKey(node, "requestBody", "RequestBody", base, bundle);
|
|
144
|
+
await visitMap(node["responses"], "Response", base, bundle);
|
|
145
|
+
await visitMap(node["callbacks"], "Callback", base, bundle);
|
|
146
|
+
return;
|
|
147
|
+
case "Callback":
|
|
148
|
+
return visitMap(node, "PathItem", base, bundle);
|
|
149
|
+
case "Parameter":
|
|
150
|
+
case "Header":
|
|
151
|
+
await visitKey(node, "schema", "Schema", base, bundle);
|
|
152
|
+
await visitMap(node["content"], "MediaType", base, bundle);
|
|
153
|
+
await visitMap(node["examples"], "Example", base, bundle);
|
|
154
|
+
return;
|
|
155
|
+
case "RequestBody":
|
|
156
|
+
return visitMap(node["content"], "MediaType", base, bundle);
|
|
157
|
+
case "Response":
|
|
158
|
+
await visitMap(node["headers"], "Header", base, bundle);
|
|
159
|
+
await visitMap(node["content"], "MediaType", base, bundle);
|
|
160
|
+
await visitMap(node["links"], "Link", base, bundle);
|
|
161
|
+
return;
|
|
162
|
+
case "MediaType":
|
|
163
|
+
await visitKey(node, "schema", "Schema", base, bundle);
|
|
164
|
+
await visitMap(node["examples"], "Example", base, bundle);
|
|
165
|
+
await visitMap(node["encoding"], "Encoding", base, bundle);
|
|
166
|
+
return;
|
|
167
|
+
case "Encoding":
|
|
168
|
+
return visitMap(node["headers"], "Header", base, bundle);
|
|
169
|
+
case "Example":
|
|
170
|
+
case "Link":
|
|
171
|
+
case "SecurityScheme":
|
|
172
|
+
return;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
async function visitSchema(node, base, bundle) {
|
|
176
|
+
for (const [key, value] of Object.entries(node)) {
|
|
177
|
+
if (schemaDataKeys.has(key) || value === null || typeof value !== "object") {
|
|
178
|
+
continue;
|
|
179
|
+
}
|
|
180
|
+
if (Array.isArray(value)) {
|
|
181
|
+
for (const [index, item] of value.entries()) {
|
|
182
|
+
value[index] = await visit(item, "Schema", base, bundle);
|
|
183
|
+
}
|
|
184
|
+
} else {
|
|
185
|
+
node[key] = await visit(value, "Schema", base, bundle);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
async function visitKey(node, key, type, base, bundle) {
|
|
190
|
+
if (node[key] !== void 0) {
|
|
191
|
+
node[key] = await visit(node[key], type, base, bundle);
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
async function visitList(node, key, type, base, bundle) {
|
|
195
|
+
const list = node[key];
|
|
196
|
+
if (Array.isArray(list)) {
|
|
197
|
+
for (const [index, item] of list.entries()) {
|
|
198
|
+
list[index] = await visit(item, type, base, bundle);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
async function visitMap(map, type, base, bundle) {
|
|
203
|
+
if (map === null || typeof map !== "object") {
|
|
204
|
+
return;
|
|
205
|
+
}
|
|
206
|
+
for (const key of Object.keys(map)) {
|
|
207
|
+
await visitKey(map, key, type, base, bundle);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
function componentName(location, fragment, section) {
|
|
211
|
+
const candidate = lastSegment(fragment) ?? lastSegment(location.split("?")[0])?.replace(/\.(json|ya?ml)$/i, "");
|
|
212
|
+
const sanitized = (candidate ?? "").replace(/[^a-zA-Z0-9._-]/g, "");
|
|
213
|
+
return sanitized || `external-${section}`;
|
|
214
|
+
}
|
|
215
|
+
function lastSegment(value) {
|
|
216
|
+
return value.split("/").filter(Boolean).at(-1);
|
|
217
|
+
}
|
|
218
|
+
function unresolved(ref, base, error) {
|
|
219
|
+
return new Error(
|
|
220
|
+
`Could not resolve $ref ${ref} from ${base ?? "a document without $self"}: ${error instanceof Error ? error.message : String(error)}`
|
|
221
|
+
);
|
|
222
|
+
}
|
|
223
|
+
export {
|
|
224
|
+
bundleExternalRefs
|
|
225
|
+
};
|
|
226
|
+
//# sourceMappingURL=bundle-external-refs.js.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/lib/processing-plugins/bundle-external-refs.ts"],
|
|
4
|
+
"sourcesContent": ["import { isRef } from '@sdk-it/core';\n\nimport {\n type Documents,\n availableName,\n documentUrl,\n loadDocument,\n readPointer,\n splitFragment,\n} from '../external-documents.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport type { IR } from '../types.js';\n\ntype NodeType =\n | 'Schema'\n | 'Parameter'\n | 'Header'\n | 'RequestBody'\n | 'Response'\n | 'MediaType'\n | 'Encoding'\n | 'Example'\n | 'Link'\n | 'Callback'\n | 'PathItem'\n | 'Operation'\n | 'SecurityScheme';\n\ntype Node = Record<string, unknown>;\n\n// The components section an external target of each type is hoisted into,\n// as Redocly's bundler and swagger-parser do. A type without a section (a\n// path item) is inlined where it is referenced.\nconst sections: Partial<Record<NodeType, string>> = {\n Schema: 'schemas',\n Parameter: 'parameters',\n Header: 'headers',\n RequestBody: 'requestBodies',\n Response: 'responses',\n Example: 'examples',\n Link: 'links',\n Callback: 'callbacks',\n SecurityScheme: 'securitySchemes',\n};\n\nconst componentTypes: Record<string, NodeType> = {\n schemas: 'Schema',\n parameters: 'Parameter',\n headers: 'Header',\n requestBodies: 'RequestBody',\n responses: 'Response',\n examples: 'Example',\n links: 'Link',\n callbacks: 'Callback',\n securitySchemes: 'SecurityScheme',\n pathItems: 'PathItem',\n};\n\nconst operationMethods = [\n 'get',\n 'put',\n 'post',\n 'delete',\n 'options',\n 'head',\n 'patch',\n 'trace',\n];\n\n// Keys whose values are data, not schemas, so a `$ref` inside them is content.\nconst schemaDataKeys = new Set([\n 'example',\n 'examples',\n 'default',\n 'const',\n 'enum',\n]);\n\ninterface Bundle {\n spec: IR;\n root: string | undefined;\n documents: Documents;\n hoisted: Map<string, string>;\n inlining: Set<string>;\n}\n\n/**\n * The IR holds only local `#/\u2026` references; every later plugin relies on it.\n * External references are brought in before anything else runs: each target\n * is hoisted into the components section its position calls for and the\n * reference rewritten to it, resolving relative references against the\n * document that holds them.\n */\nexport function bundleExternalRefs(): ProcessingPlugin {\n return {\n name: 'bundle-external-refs',\n async process({ spec }) {\n const bundle: Bundle = {\n spec,\n root: spec.$self,\n documents: new Map(),\n hoisted: new Map(),\n inlining: new Set(),\n };\n await visitMap(spec.paths, 'PathItem', bundle.root, bundle);\n await visitMap(spec.webhooks, 'PathItem', bundle.root, bundle);\n const components = spec.components as Record<string, Node | undefined>;\n for (const [section, type] of Object.entries(componentTypes)) {\n await visitMap(components[section], type, bundle.root, bundle);\n }\n },\n };\n}\n\nasync function visit(\n node: unknown,\n type: NodeType,\n base: string | undefined,\n bundle: Bundle,\n): Promise<unknown> {\n if (node === null || typeof node !== 'object') {\n return node;\n }\n if (isRef(node)) {\n return visitRef(node, type, base, bundle);\n }\n await visitChildren(node as Node, type, base, bundle);\n return node;\n}\n\nasync function visitRef(\n node: { $ref: string },\n type: NodeType,\n base: string | undefined,\n bundle: Bundle,\n): Promise<unknown> {\n const [location, fragment = ''] = splitFragment(node.$ref);\n if (!location && base === bundle.root) {\n return node;\n }\n let url: URL;\n try {\n url = documentUrl(location, base);\n } catch (error) {\n throw unresolved(node.$ref, base, error);\n }\n if (url.href === bundle.root) {\n node.$ref = `#${fragment}`;\n return node;\n }\n\n const key = `${url.href}#${fragment}`;\n const section = sections[type];\n const hoisted = bundle.hoisted.get(key);\n if (section && hoisted) {\n node.$ref = `#/components/${section}/${hoisted}`;\n return node;\n }\n if (!section && bundle.inlining.has(key)) {\n throw unresolved(node.$ref, base, new Error('the reference is circular'));\n }\n\n let target: unknown;\n try {\n const document = await loadDocument(url, bundle.documents);\n target = structuredClone(\n fragment ? readPointer(document, fragment) : document,\n );\n } catch (error) {\n throw unresolved(node.$ref, base, error);\n }\n\n if (!section) {\n bundle.inlining.add(key);\n const inlined = await visit(target, type, url.href, bundle);\n bundle.inlining.delete(key);\n return inlined;\n }\n\n const components = bundle.spec.components as Record<string, Node | undefined>;\n const registry = (components[section] ??= {});\n const name = availableName(\n registry,\n componentName(location, fragment, section),\n );\n registry[name] = target;\n bundle.hoisted.set(key, name);\n registry[name] = await visit(target, type, url.href, bundle);\n node.$ref = `#/components/${section}/${name}`;\n return node;\n}\n\nasync function visitChildren(\n node: Node,\n type: NodeType,\n base: string | undefined,\n bundle: Bundle,\n) {\n switch (type) {\n case 'Schema':\n return visitSchema(node, base, bundle);\n case 'PathItem':\n await visitList(node, 'parameters', 'Parameter', base, bundle);\n for (const method of operationMethods) {\n await visitKey(node, method, 'Operation', base, bundle);\n }\n return;\n case 'Operation':\n await visitList(node, 'parameters', 'Parameter', base, bundle);\n await visitKey(node, 'requestBody', 'RequestBody', base, bundle);\n await visitMap(node['responses'], 'Response', base, bundle);\n await visitMap(node['callbacks'], 'Callback', base, bundle);\n return;\n case 'Callback':\n return visitMap(node, 'PathItem', base, bundle);\n case 'Parameter':\n case 'Header':\n await visitKey(node, 'schema', 'Schema', base, bundle);\n await visitMap(node['content'], 'MediaType', base, bundle);\n await visitMap(node['examples'], 'Example', base, bundle);\n return;\n case 'RequestBody':\n return visitMap(node['content'], 'MediaType', base, bundle);\n case 'Response':\n await visitMap(node['headers'], 'Header', base, bundle);\n await visitMap(node['content'], 'MediaType', base, bundle);\n await visitMap(node['links'], 'Link', base, bundle);\n return;\n case 'MediaType':\n await visitKey(node, 'schema', 'Schema', base, bundle);\n await visitMap(node['examples'], 'Example', base, bundle);\n await visitMap(node['encoding'], 'Encoding', base, bundle);\n return;\n case 'Encoding':\n return visitMap(node['headers'], 'Header', base, bundle);\n case 'Example':\n case 'Link':\n case 'SecurityScheme':\n return;\n }\n}\n\nasync function visitSchema(\n node: Node,\n base: string | undefined,\n bundle: Bundle,\n) {\n for (const [key, value] of Object.entries(node)) {\n if (\n schemaDataKeys.has(key) ||\n value === null ||\n typeof value !== 'object'\n ) {\n continue;\n }\n if (Array.isArray(value)) {\n for (const [index, item] of value.entries()) {\n value[index] = await visit(item, 'Schema', base, bundle);\n }\n } else {\n node[key] = await visit(value, 'Schema', base, bundle);\n }\n }\n}\n\nasync function visitKey(\n node: Node,\n key: string,\n type: NodeType,\n base: string | undefined,\n bundle: Bundle,\n) {\n if (node[key] !== undefined) {\n node[key] = await visit(node[key], type, base, bundle);\n }\n}\n\nasync function visitList(\n node: Node,\n key: string,\n type: NodeType,\n base: string | undefined,\n bundle: Bundle,\n) {\n const list = node[key];\n if (Array.isArray(list)) {\n for (const [index, item] of list.entries()) {\n list[index] = await visit(item, type, base, bundle);\n }\n }\n}\n\nasync function visitMap(\n map: unknown,\n type: NodeType,\n base: string | undefined,\n bundle: Bundle,\n) {\n if (map === null || typeof map !== 'object') {\n return;\n }\n for (const key of Object.keys(map)) {\n await visitKey(map as Node, key, type, base, bundle);\n }\n}\n\nfunction componentName(location: string, fragment: string, section: string) {\n const candidate =\n lastSegment(fragment) ??\n lastSegment(location.split('?')[0])?.replace(/\\.(json|ya?ml)$/i, '');\n const sanitized = (candidate ?? '').replace(/[^a-zA-Z0-9._-]/g, '');\n return sanitized || `external-${section}`;\n}\n\nfunction lastSegment(value: string) {\n return value.split('/').filter(Boolean).at(-1);\n}\n\nfunction unresolved(ref: string, base: string | undefined, error: unknown) {\n return new Error(\n `Could not resolve $ref ${ref} from ${base ?? 'a document without $self'}: ${error instanceof Error ? error.message : String(error)}`,\n );\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": []
|
|
7
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-default-processing-plugins.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/create-default-processing-plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"create-default-processing-plugins.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/create-default-processing-plugins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAgBzD,wBAAgB,8BAA8B,CAC5C,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAClC,gBAAgB,EAAE,CAiBpB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { bundleExternalRefs } from "./bundle-external-refs.js";
|
|
1
2
|
import { canonicalizeSpec } from "./canonicalize-spec.js";
|
|
2
3
|
import { extractInlineSchemas } from "./extract-inline-schemas.js";
|
|
3
4
|
import { extractOverviewDocsPlugin } from "./extract-overview-docs.js";
|
|
@@ -13,6 +14,7 @@ import { normalizeTags } from "./normalize-tags.js";
|
|
|
13
14
|
import { resolveSecuritySchemeUris } from "./resolve-security-scheme-uris.js";
|
|
14
15
|
function createDefaultProcessingPlugins(options = {}) {
|
|
15
16
|
return [
|
|
17
|
+
bundleExternalRefs(),
|
|
16
18
|
normalizePaths(),
|
|
17
19
|
normalizeOperationIds(),
|
|
18
20
|
normalizeTags(),
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/processing-plugins/create-default-processing-plugins.ts"],
|
|
4
|
-
"sourcesContent": ["import type { ProcessingPlugin } from '../processing.js';\nimport { canonicalizeSpec } from './canonicalize-spec.js';\nimport { extractInlineSchemas } from './extract-inline-schemas.js';\nimport { extractOverviewDocsPlugin } from './extract-overview-docs.js';\nimport { inferPagination } from './infer-pagination.js';\nimport { normalizeOperationIds } from './normalize-operation-ids.js';\nimport { normalizeParameters } from './normalize-parameters.js';\nimport { normalizePaths } from './normalize-paths.js';\nimport { normalizeRequestBodies } from './normalize-request-bodies.js';\nimport { normalizeResponses } from './normalize-responses.js';\nimport { normalizeSchemas } from './normalize-schemas.js';\nimport { normalizeSecurity } from './normalize-security.js';\nimport { normalizeTags } from './normalize-tags.js';\nimport { resolveSecuritySchemeUris } from './resolve-security-scheme-uris.js';\n\nexport function createDefaultProcessingPlugins(\n options: { verbose?: boolean } = {},\n): ProcessingPlugin[] {\n return [\n normalizePaths(),\n normalizeOperationIds(),\n normalizeTags(),\n normalizeParameters(),\n normalizeResponses(),\n resolveSecuritySchemeUris(),\n normalizeSecurity(),\n normalizeRequestBodies(),\n inferPagination(),\n normalizeSchemas(),\n ...(options.verbose ? [extractInlineSchemas()] : []),\n extractOverviewDocsPlugin(),\n canonicalizeSpec(),\n ];\n}\n"],
|
|
5
|
-
"mappings": "AACA,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AACrC,SAAS,iCAAiC;AAC1C,SAAS,uBAAuB;AAChC,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AACpC,SAAS,sBAAsB;AAC/B,SAAS,8BAA8B;AACvC,SAAS,0BAA0B;AACnC,SAAS,wBAAwB;AACjC,SAAS,yBAAyB;AAClC,SAAS,qBAAqB;AAC9B,SAAS,iCAAiC;AAEnC,SAAS,+BACd,UAAiC,CAAC,GACd;AACpB,SAAO;AAAA,IACL,eAAe;AAAA,IACf,sBAAsB;AAAA,IACtB,cAAc;AAAA,IACd,oBAAoB;AAAA,IACpB,mBAAmB;AAAA,IACnB,0BAA0B;AAAA,IAC1B,kBAAkB;AAAA,IAClB,uBAAuB;AAAA,IACvB,gBAAgB;AAAA,IAChB,iBAAiB;AAAA,IACjB,GAAI,QAAQ,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC;AAAA,IAClD,0BAA0B;AAAA,IAC1B,iBAAiB;AAAA,EACnB;AACF;",
|
|
4
|
+
"sourcesContent": ["import type { ProcessingPlugin } from '../processing.js';\nimport { bundleExternalRefs } from './bundle-external-refs.js';\nimport { canonicalizeSpec } from './canonicalize-spec.js';\nimport { extractInlineSchemas } from './extract-inline-schemas.js';\nimport { extractOverviewDocsPlugin } from './extract-overview-docs.js';\nimport { inferPagination } from './infer-pagination.js';\nimport { normalizeOperationIds } from './normalize-operation-ids.js';\nimport { normalizeParameters } from './normalize-parameters.js';\nimport { normalizePaths } from './normalize-paths.js';\nimport { normalizeRequestBodies } from './normalize-request-bodies.js';\nimport { normalizeResponses } from './normalize-responses.js';\nimport { normalizeSchemas } from './normalize-schemas.js';\nimport { normalizeSecurity } from './normalize-security.js';\nimport { normalizeTags } from './normalize-tags.js';\nimport { resolveSecuritySchemeUris } from './resolve-security-scheme-uris.js';\n\nexport function createDefaultProcessingPlugins(\n options: { verbose?: boolean } = {},\n): ProcessingPlugin[] {\n return [\n bundleExternalRefs(),\n normalizePaths(),\n normalizeOperationIds(),\n normalizeTags(),\n normalizeParameters(),\n normalizeResponses(),\n resolveSecuritySchemeUris(),\n normalizeSecurity(),\n normalizeRequestBodies(),\n inferPagination(),\n normalizeSchemas(),\n ...(options.verbose ? [extractInlineSchemas()] : []),\n extractOverviewDocsPlugin(),\n canonicalizeSpec(),\n ];\n}\n"],
|
|
5
|
+
"mappings": "AACA,SAAS,0BAA0B;AACnC,SAAS,wBAAwB;AACjC,SAAS,4BAA4B;AACrC,SAAS,iCAAiC;AAC1C,SAAS,uBAAuB;AAChC,SAAS,6BAA6B;AACtC,SAAS,2BAA2B;AACpC,SAAS,sBAAsB;AAC/B,SAAS,8BAA8B;AACvC,SAAS,0BAA0B;AACnC,SAAS,wBAAwB;AACjC,SAAS,yBAAyB;AAClC,SAAS,qBAAqB;AAC9B,SAAS,iCAAiC;AAEnC,SAAS,+BACd,UAAiC,CAAC,GACd;AACpB,SAAO;AAAA,IACL,mBAAmB;AAAA,IACnB,eAAe;AAAA,IACf,sBAAsB;AAAA,IACtB,cAAc;AAAA,IACd,oBAAoB;AAAA,IACpB,mBAAmB;AAAA,IACnB,0BAA0B;AAAA,IAC1B,kBAAkB;AAAA,IAClB,uBAAuB;AAAA,IACvB,gBAAgB;AAAA,IAChB,iBAAiB;AAAA,IACjB,GAAI,QAAQ,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC;AAAA,IAClD,0BAA0B;AAAA,IAC1B,iBAAiB;AAAA,EACnB;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,wCAAwC,CAAC;AACvD,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wCAAwC,CAAC;AACvD,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/processing-plugins/index.ts"],
|
|
4
|
-
"sourcesContent": ["export * from './canonicalize-spec.js';\nexport * from './create-default-processing-plugins.js';\nexport * from './enrich-examples.js';\nexport * from './extract-inline-schemas.js';\nexport * from './extract-overview-docs.js';\nexport * from './infer-pagination.js';\nexport * from './normalize-operation-ids.js';\nexport * from './normalize-parameters.js';\nexport * from './normalize-paths.js';\nexport * from './normalize-request-bodies.js';\nexport * from './normalize-responses.js';\nexport * from './normalize-security.js';\nexport * from './normalize-schemas.js';\nexport * from './normalize-tags.js';\nexport * from './resolve-security-scheme-uris.js';\n"],
|
|
5
|
-
"mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
|
|
4
|
+
"sourcesContent": ["export * from './bundle-external-refs.js';\nexport * from './canonicalize-spec.js';\nexport * from './create-default-processing-plugins.js';\nexport * from './enrich-examples.js';\nexport * from './extract-inline-schemas.js';\nexport * from './extract-overview-docs.js';\nexport * from './infer-pagination.js';\nexport * from './normalize-operation-ids.js';\nexport * from './normalize-parameters.js';\nexport * from './normalize-paths.js';\nexport * from './normalize-request-bodies.js';\nexport * from './normalize-responses.js';\nexport * from './normalize-security.js';\nexport * from './normalize-schemas.js';\nexport * from './normalize-tags.js';\nexport * from './resolve-security-scheme-uris.js';\n"],
|
|
5
|
+
"mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-responses.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/normalize-responses.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"normalize-responses.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/normalize-responses.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAqKzD,wBAAgB,kBAAkB,IAAI,gBAAgB,CA+BrD"}
|
|
@@ -36,14 +36,11 @@ function normalizeOperationResponses(spec, operationId, operation, responsesConf
|
|
|
36
36
|
for (const status in operation.responses) {
|
|
37
37
|
const response = operation.responses[status];
|
|
38
38
|
const statusCode = +status;
|
|
39
|
+
response.content ??= {};
|
|
40
|
+
response["x-body"] = responseBody(response);
|
|
39
41
|
if (!responsesConfig?.flattenErrorResponses && !isSuccessStatusCode(status)) {
|
|
40
42
|
continue;
|
|
41
43
|
}
|
|
42
|
-
if (isEmpty(response.content)) {
|
|
43
|
-
response.content = {
|
|
44
|
-
"application/octet-stream": {}
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
44
|
let responseName;
|
|
48
45
|
for (const [contentType, mediaType] of Object.entries(
|
|
49
46
|
response.content
|
|
@@ -66,32 +63,18 @@ function normalizeOperationResponses(spec, operationId, operation, responsesConf
|
|
|
66
63
|
"result"
|
|
67
64
|
]);
|
|
68
65
|
responseName ??= outputName;
|
|
69
|
-
const
|
|
70
|
-
|
|
71
|
-
const hasContentDisposition = hasHeader(
|
|
72
|
-
response.headers,
|
|
73
|
-
"Content-Disposition"
|
|
74
|
-
);
|
|
75
|
-
const isBinary = isBinaryContentType(contentType) || isStreamingContentType(normalizedContentType) && hasContentDisposition;
|
|
76
|
-
const isText = isTextContentType(contentType);
|
|
77
|
-
if (parseJsonContentType(contentType)) {
|
|
66
|
+
const body = mediaBody(contentType, response.headers);
|
|
67
|
+
if (body === "json") {
|
|
78
68
|
if (isEmpty(mediaType.schema)) {
|
|
79
69
|
spec.components.schemas[outputName] = {
|
|
80
70
|
type: "object",
|
|
81
71
|
additionalProperties: true
|
|
82
72
|
};
|
|
83
73
|
}
|
|
84
|
-
} else {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
...isBinary ? { format: "binary" } : {}
|
|
89
|
-
};
|
|
90
|
-
}
|
|
91
|
-
spec.components.schemas[outputName] = {
|
|
92
|
-
...spec.components.schemas[outputName],
|
|
93
|
-
"x-stream": isSse || !isText && !isBinary,
|
|
94
|
-
...isSse ? { "x-sse": true } : {}
|
|
74
|
+
} else if (isEmpty(mediaType.schema) && (body === "text" || body === "binary")) {
|
|
75
|
+
mediaType.schema = {
|
|
76
|
+
type: "string",
|
|
77
|
+
...body === "binary" ? { format: "binary" } : {}
|
|
95
78
|
};
|
|
96
79
|
}
|
|
97
80
|
spec.components.schemas[outputName] = {
|
|
@@ -110,6 +93,42 @@ function normalizeOperationResponses(spec, operationId, operation, responsesConf
|
|
|
110
93
|
}
|
|
111
94
|
return operation.responses;
|
|
112
95
|
}
|
|
96
|
+
function responseBody(response) {
|
|
97
|
+
if (isEmpty(response.content)) {
|
|
98
|
+
return "empty";
|
|
99
|
+
}
|
|
100
|
+
if (hasHeader(response.headers, "Transfer-Encoding")) {
|
|
101
|
+
return "stream";
|
|
102
|
+
}
|
|
103
|
+
for (const contentType of Object.keys(response.content)) {
|
|
104
|
+
const body = mediaBody(contentType, response.headers);
|
|
105
|
+
if (body) {
|
|
106
|
+
return body;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
return "stream";
|
|
110
|
+
}
|
|
111
|
+
function mediaBody(contentType, headers) {
|
|
112
|
+
const isOctetStream = isStreamingContentType(
|
|
113
|
+
normalizeContentType(contentType)
|
|
114
|
+
);
|
|
115
|
+
if (isOctetStream && !hasHeader(headers, "Content-Disposition")) {
|
|
116
|
+
return "stream";
|
|
117
|
+
}
|
|
118
|
+
if (isOctetStream || isBinaryContentType(contentType)) {
|
|
119
|
+
return "binary";
|
|
120
|
+
}
|
|
121
|
+
if (parseJsonContentType(contentType)) {
|
|
122
|
+
return "json";
|
|
123
|
+
}
|
|
124
|
+
if (isSseContentType(contentType)) {
|
|
125
|
+
return "sse";
|
|
126
|
+
}
|
|
127
|
+
if (isTextContentType(contentType)) {
|
|
128
|
+
return "text";
|
|
129
|
+
}
|
|
130
|
+
return void 0;
|
|
131
|
+
}
|
|
113
132
|
function normalizeContentType(contentType) {
|
|
114
133
|
try {
|
|
115
134
|
return parseContentType(contentType)?.type?.toLowerCase();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/processing-plugins/normalize-responses.ts"],
|
|
4
|
-
"sourcesContent": ["import { parse as parseContentType } from 'fast-content-type-parse';\nimport type {\n MediaTypeObject,\n OperationObject,\n ResponseObject,\n} from 'openapi3-ts/oas31';\n\nimport { isRef, parseRef, resolveRef } from '@sdk-it/core/ref.js';\nimport { isEmpty, pascalcase } from '@sdk-it/core/utils.js';\n\nimport { findUniqueSchemaName } from '../find-unique-schema-name.js';\nimport { iterateOperations } from '../for-each-operation.js';\nimport {\n isBinaryContentType,\n isSseContentType,\n isStreamingContentType,\n isSuccessStatusCode,\n isTextContentType,\n parseJsonContentType,\n} from '../is.js';\nimport type { ResponsesConfig } from '../options.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport type { IR, TunedOperationObject } from '../types.js';\n\nfunction normalizeOperationResponses(\n spec: IR,\n operationId: string,\n operation: OperationObject,\n responsesConfig?: ResponsesConfig,\n) {\n const responses = operation.responses ?? {};\n operation.responses ??= {};\n let foundSuccessResponse = false;\n for (const status in responses) {\n operation.responses[status] = structuredClone(\n resolveRef<ResponseObject>(spec, responses[status]),\n );\n\n if (status !== 'default' && isSuccessStatusCode(status)) {\n foundSuccessResponse = true;\n }\n }\n\n if (!foundSuccessResponse) {\n operation.responses['200'] = {\n description: 'OK',\n content: {\n 'application/json': {\n schema: {},\n },\n },\n };\n }\n\n for (const status in operation.responses) {\n const response = operation.responses[status] as ResponseObject;\n const statusCode = +status;\n\n if (\n !responsesConfig?.flattenErrorResponses &&\n !isSuccessStatusCode(status)\n ) {\n continue;\n }\n\n
|
|
5
|
-
"mappings": "AAAA,SAAS,SAAS,wBAAwB;AAO1C,SAAS,OAAO,UAAU,kBAAkB;AAC5C,SAAS,SAAS,kBAAkB;AAEpC,SAAS,4BAA4B;AACrC,SAAS,yBAAyB;AAClC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAKP,SAAS,4BACP,MACA,aACA,WACA,iBACA;AACA,QAAM,YAAY,UAAU,aAAa,CAAC;AAC1C,YAAU,cAAc,CAAC;AACzB,MAAI,uBAAuB;AAC3B,aAAW,UAAU,WAAW;AAC9B,cAAU,UAAU,MAAM,IAAI;AAAA,MAC5B,WAA2B,MAAM,UAAU,MAAM,CAAC;AAAA,IACpD;AAEA,QAAI,WAAW,aAAa,oBAAoB,MAAM,GAAG;AACvD,6BAAuB;AAAA,IACzB;AAAA,EACF;AAEA,MAAI,CAAC,sBAAsB;AACzB,cAAU,UAAU,KAAK,IAAI;AAAA,MAC3B,aAAa;AAAA,MACb,SAAS;AAAA,QACP,oBAAoB;AAAA,UAClB,QAAQ,CAAC;AAAA,QACX;AAAA,MACF;AAAA,IACF;AAAA,EACF;AAEA,aAAW,UAAU,UAAU,WAAW;AACxC,UAAM,WAAW,UAAU,UAAU,MAAM;AAC3C,UAAM,aAAa,CAAC;
|
|
4
|
+
"sourcesContent": ["import { parse as parseContentType } from 'fast-content-type-parse';\nimport type {\n MediaTypeObject,\n OperationObject,\n ResponseObject,\n} from 'openapi3-ts/oas31';\n\nimport { isRef, parseRef, resolveRef } from '@sdk-it/core/ref.js';\nimport { isEmpty, pascalcase } from '@sdk-it/core/utils.js';\n\nimport { findUniqueSchemaName } from '../find-unique-schema-name.js';\nimport { iterateOperations } from '../for-each-operation.js';\nimport {\n isBinaryContentType,\n isSseContentType,\n isStreamingContentType,\n isSuccessStatusCode,\n isTextContentType,\n parseJsonContentType,\n} from '../is.js';\nimport type { ResponsesConfig } from '../options.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport type { IR, ResponseBody, TunedOperationObject } from '../types.js';\n\nfunction normalizeOperationResponses(\n spec: IR,\n operationId: string,\n operation: OperationObject,\n responsesConfig?: ResponsesConfig,\n) {\n const responses = operation.responses ?? {};\n operation.responses ??= {};\n let foundSuccessResponse = false;\n for (const status in responses) {\n operation.responses[status] = structuredClone(\n resolveRef<ResponseObject>(spec, responses[status]),\n );\n\n if (status !== 'default' && isSuccessStatusCode(status)) {\n foundSuccessResponse = true;\n }\n }\n\n if (!foundSuccessResponse) {\n operation.responses['200'] = {\n description: 'OK',\n content: {\n 'application/json': {\n schema: {},\n },\n },\n };\n }\n\n for (const status in operation.responses) {\n const response = operation.responses[status] as ResponseObject;\n const statusCode = +status;\n response.content ??= {};\n response['x-body'] = responseBody(response);\n\n if (\n !responsesConfig?.flattenErrorResponses &&\n !isSuccessStatusCode(status)\n ) {\n continue;\n }\n\n let responseName: string | undefined;\n for (const [contentType, mediaType] of Object.entries(\n response.content as Record<string, MediaTypeObject>,\n )) {\n if (isRef(mediaType.schema)) {\n const { model } = parseRef(mediaType.schema.$ref);\n Object.assign(spec.components.schemas[model], {\n 'x-responsebody': true,\n });\n responseName ??= model;\n continue;\n }\n const outputName =\n statusCode !== 200\n ? findUniqueSchemaName(spec, `${pascalcase(operationId)}${status}`, [\n 'output',\n 'payload',\n 'result',\n ])\n : findUniqueSchemaName(spec, operationId, [\n 'output',\n 'payload',\n 'result',\n ]);\n responseName ??= outputName;\n const body = mediaBody(contentType, response.headers);\n\n if (body === 'json') {\n if (isEmpty(mediaType.schema)) {\n spec.components.schemas[outputName] = {\n type: 'object',\n additionalProperties: true,\n };\n }\n } else if (\n isEmpty(mediaType.schema) &&\n (body === 'text' || body === 'binary')\n ) {\n mediaType.schema = {\n type: 'string',\n ...(body === 'binary' ? { format: 'binary' } : {}),\n };\n }\n\n spec.components.schemas[outputName] = {\n ...spec.components.schemas[outputName],\n ...mediaType.schema,\n 'x-responsebody': true,\n 'x-response-group': operationId,\n };\n operation.responses[status].content[contentType].schema = {\n $ref: `#/components/schemas/${outputName}`,\n };\n }\n if (responseName) {\n response['x-response-name'] = responseName;\n }\n }\n\n return operation.responses;\n}\n\nfunction responseBody(response: ResponseObject): ResponseBody {\n if (isEmpty(response.content)) {\n return 'empty';\n }\n if (hasHeader(response.headers, 'Transfer-Encoding')) {\n return 'stream';\n }\n for (const contentType of Object.keys(response.content)) {\n const body = mediaBody(contentType, response.headers);\n if (body) {\n return body;\n }\n }\n return 'stream';\n}\n\nfunction mediaBody(\n contentType: string,\n headers: ResponseObject['headers'],\n): ResponseBody | undefined {\n const isOctetStream = isStreamingContentType(\n normalizeContentType(contentType),\n );\n if (isOctetStream && !hasHeader(headers, 'Content-Disposition')) {\n return 'stream';\n }\n if (isOctetStream || isBinaryContentType(contentType)) {\n return 'binary';\n }\n if (parseJsonContentType(contentType)) {\n return 'json';\n }\n if (isSseContentType(contentType)) {\n return 'sse';\n }\n if (isTextContentType(contentType)) {\n return 'text';\n }\n return undefined;\n}\n\nfunction normalizeContentType(contentType: string) {\n try {\n return parseContentType(contentType)?.type?.toLowerCase();\n } catch {\n return contentType.split(';')[0]?.trim().toLowerCase();\n }\n}\n\nfunction hasHeader(headers: ResponseObject['headers'], name: string) {\n if (!headers) {\n return false;\n }\n const target = name.toLowerCase();\n return Object.keys(headers).some((key) => key.toLowerCase() === target);\n}\n\nexport function normalizeResponses(): ProcessingPlugin {\n return {\n name: 'normalize-responses',\n process({ spec, options, report }) {\n for (const { entry, operation } of iterateOperations(spec)) {\n if (!operation.operationId) {\n throw new Error(\n `Cannot normalize responses before assigning an operation ID for ${entry.method.toUpperCase()} ${entry.path}`,\n );\n }\n const hadSuccessResponse = Object.keys(operation.responses ?? {}).some(\n isSuccessStatusCode,\n );\n (operation as TunedOperationObject).responses =\n normalizeOperationResponses(\n spec,\n operation.operationId,\n operation,\n options.responses,\n );\n if (!hadSuccessResponse) {\n report({\n severity: 'warning',\n code: 'success-response-added',\n message: 'Added a default 200 success response',\n path: `${entry.method.toUpperCase()} ${entry.path}`,\n });\n }\n }\n },\n };\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-schemas.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/normalize-schemas.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"normalize-schemas.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/normalize-schemas.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAqMzD,wBAAgB,gBAAgB,IAAI,gBAAgB,CAOnD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { mergeWith, uniq } from "lodash-es";
|
|
2
2
|
import assert from "node:assert";
|
|
3
3
|
import { isEmpty, isRef, notRef, resolveRef, snakecase } from "@sdk-it/core";
|
|
4
4
|
import { findVarients } from "../find-polymorphic-varients.js";
|
|
@@ -78,7 +78,7 @@ function normalizeSchemaObjects(spec, schemas, visited = /* @__PURE__ */ new Set
|
|
|
78
78
|
if (hasObjects && hasOtherTypes) {
|
|
79
79
|
assert(false, `allOf must be an object`);
|
|
80
80
|
}
|
|
81
|
-
|
|
81
|
+
mergeWith(
|
|
82
82
|
schema,
|
|
83
83
|
...resolved.map((resolvedSchema, index) => {
|
|
84
84
|
const sourceSchema = schemas2[index];
|
|
@@ -100,7 +100,8 @@ function normalizeSchemaObjects(spec, schemas, visited = /* @__PURE__ */ new Set
|
|
|
100
100
|
normalizeSchemaObjects(spec, [resolvedSchema], visited);
|
|
101
101
|
}
|
|
102
102
|
return resolvedSchema;
|
|
103
|
-
})
|
|
103
|
+
}),
|
|
104
|
+
unionRequired
|
|
104
105
|
);
|
|
105
106
|
delete schema.allOf;
|
|
106
107
|
} else {
|
|
@@ -165,6 +166,12 @@ function normalizeSchemaObjects(spec, schemas, visited = /* @__PURE__ */ new Set
|
|
|
165
166
|
}
|
|
166
167
|
}
|
|
167
168
|
}
|
|
169
|
+
function unionRequired(target, source, key) {
|
|
170
|
+
if (key === "required" && Array.isArray(target) && Array.isArray(source)) {
|
|
171
|
+
return uniq([...target, ...source]);
|
|
172
|
+
}
|
|
173
|
+
return void 0;
|
|
174
|
+
}
|
|
168
175
|
function normalizeSchemas() {
|
|
169
176
|
return {
|
|
170
177
|
name: "normalize-schemas",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/processing-plugins/normalize-schemas.ts"],
|
|
4
|
-
"sourcesContent": ["import {
|
|
5
|
-
"mappings": "AAAA,SAAS,
|
|
4
|
+
"sourcesContent": ["import { mergeWith, uniq } from 'lodash-es';\nimport assert from 'node:assert';\nimport type { ReferenceObject, SchemaObject } from 'openapi3-ts/oas31';\n\nimport { isEmpty, isRef, notRef, resolveRef, snakecase } from '@sdk-it/core';\n\nimport { findVarients } from '../find-polymorphic-varients.js';\nimport { formatName } from '../format-name.js';\nimport { isPrimitiveSchema } from '../is-primitive-schema.js';\nimport { coerceTypes } from '../is.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport type { IR } from '../types.js';\n\nfunction normalizeSchemaObjects(\n spec: IR,\n schemas: (SchemaObject | ReferenceObject)[],\n visited = new Set<string>(),\n) {\n for (const schema of schemas) {\n if (isRef(schema)) continue;\n\n if (!isEmpty(schema.properties)) {\n schema.type ??= 'object';\n delete schema.oneOf;\n delete schema.anyOf;\n normalizeSchemaObjects(spec, Object.values(schema.properties), visited);\n for (const [key, value] of Object.entries(schema.properties)) {\n if (notRef(value) && isPrimitiveSchema(value)) {\n value.default ??= schema.default?.[key];\n delete schema.default?.[key];\n }\n }\n delete schema.default;\n }\n\n if (!isEmpty(schema['x-properties'])) {\n normalizeSchemaObjects(\n spec,\n Object.values(schema['x-properties']),\n visited,\n );\n }\n\n if (!isEmpty(schema.items)) {\n delete schema.oneOf;\n delete schema.anyOf;\n schema.type = 'array';\n normalizeSchemaObjects(spec, [schema.items], visited);\n const items = resolveRef<SchemaObject>(spec, schema.items);\n if (Array.isArray(items.default)) {\n schema.default ??= structuredClone(items.default);\n }\n delete items.default;\n }\n\n if (!isEmpty(schema.anyOf) && !isEmpty(schema.oneOf)) {\n delete schema.anyOf;\n }\n\n if (isEmpty(schema.enum)) {\n delete schema.enum;\n }\n\n if (!isEmpty(schema.enum)) {\n if (schema.enum.length === 1) {\n schema.const = schema.enum[0];\n delete schema.enum;\n } else {\n const valuesSet = new Set<string>();\n const valuesList = [];\n for (const value of schema.enum) {\n const formattedValue = formatName(snakecase(formatName(value)));\n if (!valuesSet.has(formattedValue)) {\n valuesSet.add(formattedValue);\n valuesList.push(value);\n }\n }\n schema.enum = valuesList;\n }\n delete schema.allOf;\n }\n\n if (schema.const !== undefined) {\n schema.default = schema.const;\n }\n\n if (!isEmpty(schema.allOf)) {\n const schemas = schema.allOf;\n const resolved = schemas.map((item) =>\n resolveRef<SchemaObject>(spec, item),\n );\n const hasObjects = resolved.some((item) => item.type === 'object');\n const hasOtherTypes = resolved.some(\n (item) => item.type && item.type !== 'object',\n );\n if (hasObjects && hasOtherTypes) {\n assert(false, `allOf must be an object`);\n }\n mergeWith(\n schema,\n ...resolved.map((resolvedSchema, index) => {\n const sourceSchema = schemas[index];\n if (isRef(sourceSchema)) {\n if (visited.has(sourceSchema.$ref)) {\n throw new Error(\n `Circular allOf reference detected: ${[\n ...visited,\n sourceSchema.$ref,\n ].join(' -> ')}`,\n );\n }\n normalizeSchemaObjects(\n spec,\n [resolvedSchema],\n new Set(visited).add(sourceSchema.$ref),\n );\n } else {\n normalizeSchemaObjects(spec, [resolvedSchema], visited);\n }\n return resolvedSchema;\n }),\n unionRequired,\n );\n delete schema.allOf;\n } else {\n delete schema.allOf;\n }\n\n if (\n schema.type === 'object' &&\n isEmpty(schema.properties) &&\n typeof schema.additionalProperties === 'object' &&\n !isEmpty(schema.additionalProperties) &&\n notRef(schema.additionalProperties) &&\n !isEmpty(schema.additionalProperties.properties)\n ) {\n normalizeSchemaObjects(\n spec,\n Object.values(schema.additionalProperties.properties),\n visited,\n );\n }\n\n for (const kind of ['oneOf', 'anyOf'] as const) {\n if (!isEmpty(schema[kind])) {\n delete schema.type;\n normalizeSchemaObjects(spec, schema[kind], visited);\n if (isEmpty(schema[kind])) {\n continue;\n }\n\n let enumSchemaIndex = -1;\n const enumValues: string[] = [];\n for (let index = 0; index < schema[kind].length; index++) {\n const item = schema[kind][index];\n if (notRef(item) && item.type === 'string') {\n if (item.enum && item.enum.length > 1) {\n enumValues.push(...item.enum);\n if (enumSchemaIndex === -1) {\n enumSchemaIndex = index;\n }\n }\n }\n }\n if (enumSchemaIndex !== -1) {\n const enumSchema = schema[kind][enumSchemaIndex];\n if (notRef(enumSchema)) {\n enumSchema.enum = uniq(enumValues);\n }\n schema[kind] = schema[kind].filter(\n (item, index) => index === enumSchemaIndex || isRef(item),\n );\n }\n const otherTypes = schema[kind].filter(\n (item) => resolveRef<SchemaObject>(spec, item).type !== 'null',\n );\n if (otherTypes.length === 1) {\n const [only] = otherTypes;\n const droppedNull = otherTypes.length !== schema[kind].length;\n Object.assign(schema, only);\n delete schema[kind];\n if (droppedNull && notRef(only)) {\n const types = coerceTypes(only, false);\n if (types.length) {\n schema.type = uniq([...types, 'null']);\n }\n }\n continue;\n }\n\n schema['x-varients'] = findVarients(spec, schema[kind]);\n } else {\n delete schema[kind];\n }\n }\n }\n}\n\n// allOf is a conjunction, so a value must carry every part's required\n// properties; lodash's default merge would overwrite the arrays by index.\nfunction unionRequired(target: unknown, source: unknown, key: string) {\n if (key === 'required' && Array.isArray(target) && Array.isArray(source)) {\n return uniq([...target, ...source]);\n }\n return undefined;\n}\n\nexport function normalizeSchemas(): ProcessingPlugin {\n return {\n name: 'normalize-schemas',\n process({ spec }) {\n normalizeSchemaObjects(spec, Object.values(spec.components.schemas));\n },\n };\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["schemas"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-security-scheme-uris.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/resolve-security-scheme-uris.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve-security-scheme-uris.d.ts","sourceRoot":"","sources":["../../../src/lib/processing-plugins/resolve-security-scheme-uris.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGzD;;;;;GAKG;AACH,wBAAgB,yBAAyB,IAAI,gBAAgB,CAoD5D"}
|
|
@@ -1,10 +1,15 @@
|
|
|
1
|
-
import { fileURLToPath } from "node:url";
|
|
2
1
|
import {
|
|
3
2
|
followRef,
|
|
4
3
|
isRef
|
|
5
4
|
} from "@sdk-it/core";
|
|
5
|
+
import {
|
|
6
|
+
availableName,
|
|
7
|
+
documentUrl,
|
|
8
|
+
loadDocument,
|
|
9
|
+
readPointer,
|
|
10
|
+
splitFragment
|
|
11
|
+
} from "../external-documents.js";
|
|
6
12
|
import { iterateOperations } from "../for-each-operation.js";
|
|
7
|
-
import { loadFile } from "../loaders/load-spec.js";
|
|
8
13
|
function resolveSecuritySchemeUris() {
|
|
9
14
|
return {
|
|
10
15
|
name: "resolve-security-scheme-uris",
|
|
@@ -26,7 +31,7 @@ function resolveSecuritySchemeUris() {
|
|
|
26
31
|
const [alias] = Object.entries(spec.components.securitySchemes).find(
|
|
27
32
|
([, registeredScheme]) => registeredScheme === scheme
|
|
28
33
|
) ?? [];
|
|
29
|
-
const name = alias ?? availableName(spec, schemeName(uri));
|
|
34
|
+
const name = alias ?? availableName(spec.components.securitySchemes, schemeName(uri));
|
|
30
35
|
spec.components.securitySchemes[name] = scheme;
|
|
31
36
|
registered.set(uri, name);
|
|
32
37
|
} catch (error) {
|
|
@@ -61,7 +66,7 @@ function isUriKey(key) {
|
|
|
61
66
|
}
|
|
62
67
|
async function resolveScheme(uri, spec, documents) {
|
|
63
68
|
const [location, fragment] = splitFragment(uri);
|
|
64
|
-
const document = location ? await
|
|
69
|
+
const document = location ? await schemeDocument(location, spec, documents) : spec;
|
|
65
70
|
let scheme = fragment ? readPointer(document, fragment) : document;
|
|
66
71
|
if (isRef(scheme)) {
|
|
67
72
|
scheme = followRef(document, scheme.$ref);
|
|
@@ -73,48 +78,9 @@ async function resolveScheme(uri, spec, documents) {
|
|
|
73
78
|
}
|
|
74
79
|
return scheme;
|
|
75
80
|
}
|
|
76
|
-
function
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
return Promise.reject(
|
|
80
|
-
new Error(
|
|
81
|
-
"the document declares no $self, so a relative URI has no base to resolve against"
|
|
82
|
-
)
|
|
83
|
-
);
|
|
84
|
-
}
|
|
85
|
-
const url = new URL(location, base);
|
|
86
|
-
if (url.href === base) {
|
|
87
|
-
return Promise.resolve(spec);
|
|
88
|
-
}
|
|
89
|
-
let pending = documents.get(url.href);
|
|
90
|
-
if (!pending) {
|
|
91
|
-
pending = loadFile(
|
|
92
|
-
url.protocol === "file:" ? fileURLToPath(url) : url.href
|
|
93
|
-
);
|
|
94
|
-
documents.set(url.href, pending);
|
|
95
|
-
}
|
|
96
|
-
return pending;
|
|
97
|
-
}
|
|
98
|
-
function isAbsolute(location) {
|
|
99
|
-
return URL.canParse(location);
|
|
100
|
-
}
|
|
101
|
-
function splitFragment(uri) {
|
|
102
|
-
const index = uri.indexOf("#");
|
|
103
|
-
return index === -1 ? [uri, void 0] : [uri.slice(0, index), uri.slice(index + 1)];
|
|
104
|
-
}
|
|
105
|
-
function readPointer(document, fragment) {
|
|
106
|
-
let current = document;
|
|
107
|
-
for (const segment of fragment.split("/")) {
|
|
108
|
-
if (!segment) {
|
|
109
|
-
continue;
|
|
110
|
-
}
|
|
111
|
-
const key = decodeURIComponent(segment).replaceAll("~1", "/").replaceAll("~0", "~");
|
|
112
|
-
if (current === null || typeof current !== "object" || !(key in current)) {
|
|
113
|
-
throw new Error(`no value at pointer #${fragment}`);
|
|
114
|
-
}
|
|
115
|
-
current = current[key];
|
|
116
|
-
}
|
|
117
|
-
return current;
|
|
81
|
+
function schemeDocument(location, spec, documents) {
|
|
82
|
+
const url = documentUrl(location, spec.$self);
|
|
83
|
+
return url.href === spec.$self ? spec : loadDocument(url, documents);
|
|
118
84
|
}
|
|
119
85
|
function schemeName(uri) {
|
|
120
86
|
const [location, fragment] = splitFragment(uri);
|
|
@@ -125,14 +91,6 @@ function schemeName(uri) {
|
|
|
125
91
|
function lastSegment(value) {
|
|
126
92
|
return value.split("/").filter(Boolean).at(-1);
|
|
127
93
|
}
|
|
128
|
-
function availableName(spec, candidate) {
|
|
129
|
-
let name = candidate;
|
|
130
|
-
let suffix = 2;
|
|
131
|
-
while (spec.components.securitySchemes[name]) {
|
|
132
|
-
name = `${candidate}${suffix++}`;
|
|
133
|
-
}
|
|
134
|
-
return name;
|
|
135
|
-
}
|
|
136
94
|
export {
|
|
137
95
|
resolveSecuritySchemeUris
|
|
138
96
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/lib/processing-plugins/resolve-security-scheme-uris.ts"],
|
|
4
|
-
"sourcesContent": ["import
|
|
5
|
-
"mappings": "AAAA,
|
|
4
|
+
"sourcesContent": ["import type { SecurityRequirementObject } from 'openapi3-ts/oas31';\n\nimport {\n type OpenAPISecuritySchemeObject,\n followRef,\n isRef,\n} from '@sdk-it/core';\n\nimport {\n type Documents,\n availableName,\n documentUrl,\n loadDocument,\n readPointer,\n splitFragment,\n} from '../external-documents.js';\nimport { iterateOperations } from '../for-each-operation.js';\nimport type { ProcessingPlugin } from '../processing.js';\nimport type { IR } from '../types.js';\n\n/**\n * OpenAPI 3.2 lets a security requirement key be a URI of a Security Scheme\n * Object instead of a `components.securitySchemes` name. Generators key\n * credentials by scheme name, so each URI is fetched, registered locally, and\n * the requirement rewritten to point at the registered name.\n */\nexport function resolveSecuritySchemeUris(): ProcessingPlugin {\n return {\n name: 'resolve-security-scheme-uris',\n async process({ spec, report }) {\n const requirements = collectRequirements(spec);\n const uris = new Set(\n requirements\n .flatMap((requirement) => Object.keys(requirement))\n .filter(\n (key) => !spec.components.securitySchemes[key] && isUriKey(key),\n ),\n );\n if (!uris.size) {\n return;\n }\n\n const documents = new Map<string, Promise<unknown>>();\n const registered = new Map<string, string>();\n for (const uri of uris) {\n try {\n const scheme = await resolveScheme(uri, spec, documents);\n // A same-document pointer lands on an already registered object;\n // reuse its name instead of registering a second copy.\n const [alias] =\n Object.entries(spec.components.securitySchemes).find(\n ([, registeredScheme]) => registeredScheme === scheme,\n ) ?? [];\n const name =\n alias ??\n availableName(spec.components.securitySchemes, schemeName(uri));\n spec.components.securitySchemes[name] = scheme;\n registered.set(uri, name);\n } catch (error) {\n report({\n code: 'unresolvable-security-scheme-uri',\n severity: 'error',\n path: uri,\n message: `Could not resolve security scheme URI ${uri}: ${error instanceof Error ? error.message : String(error)}`,\n });\n }\n }\n\n for (const requirement of requirements) {\n for (const [uri, name] of registered) {\n if (Object.hasOwn(requirement, uri)) {\n requirement[name] = requirement[uri];\n delete requirement[uri];\n }\n }\n }\n },\n };\n}\n\nfunction collectRequirements(spec: IR) {\n const requirements: SecurityRequirementObject[] = [...(spec.security ?? [])];\n for (const { operation } of iterateOperations(spec)) {\n requirements.push(...(operation.security ?? []));\n }\n return requirements;\n}\n\n/**\n * Component keys are limited to `^[a-zA-Z0-9._-]+$`, so anything else can only\n * be a URI. A bare `auth.yaml` stays a name \u2014 treating it as a document would\n * turn a typo into a file read.\n */\nfunction isUriKey(key: string) {\n return !/^[a-zA-Z0-9._-]+$/.test(key);\n}\n\nasync function resolveScheme(\n uri: string,\n spec: IR,\n documents: Documents,\n): Promise<OpenAPISecuritySchemeObject> {\n const [location, fragment] = splitFragment(uri);\n const document = location\n ? await schemeDocument(location, spec, documents)\n : spec;\n let scheme = fragment ? readPointer(document, fragment) : document;\n if (isRef(scheme)) {\n scheme = followRef(document as never, scheme.$ref);\n }\n if (\n scheme === null ||\n typeof scheme !== 'object' ||\n typeof (scheme as { type?: unknown }).type !== 'string'\n ) {\n return Promise.reject(\n new Error('the target is not a Security Scheme Object'),\n );\n }\n return scheme as OpenAPISecuritySchemeObject;\n}\n\nfunction schemeDocument(location: string, spec: IR, documents: Documents) {\n const url = documentUrl(location, spec.$self);\n return url.href === spec.$self ? spec : loadDocument(url, documents);\n}\n\nfunction schemeName(uri: string) {\n const [location, fragment] = splitFragment(uri);\n const candidate =\n lastSegment(fragment ?? '') ??\n lastSegment(location.split('?')[0])?.replace(/\\.(json|ya?ml)$/i, '');\n const sanitized = (candidate ?? '').replace(/[^a-zA-Z0-9._-]/g, '');\n return sanitized || 'externalSecurityScheme';\n}\n\nfunction lastSegment(value: string) {\n return value.split('/').filter(Boolean).at(-1);\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/lib/types.d.ts
CHANGED
|
@@ -24,15 +24,19 @@ export interface OurRequestBodyObject extends RequestBodyObject {
|
|
|
24
24
|
schema: ReferenceObject;
|
|
25
25
|
}>;
|
|
26
26
|
}
|
|
27
|
+
export type ResponseBody = 'json' | 'text' | 'binary' | 'stream' | 'sse' | 'empty';
|
|
28
|
+
export type TunedResponseObject = Omit<ResponseObject, 'content'> & {
|
|
29
|
+
content: Record<string, MediaTypeObject>;
|
|
30
|
+
'x-body': ResponseBody;
|
|
31
|
+
'x-response-name'?: string;
|
|
32
|
+
};
|
|
27
33
|
export type TunedOperationObject = Omit<OperationObject, 'operationId' | 'tags' | 'parameters' | 'responses' | 'requestBody' | 'tags'> & {
|
|
28
34
|
tags: string[];
|
|
29
35
|
operationId: string;
|
|
30
36
|
parameters: ParameterObject[];
|
|
31
37
|
['x-fn-name']: string;
|
|
32
38
|
['x-fn-group']?: string;
|
|
33
|
-
responses: Record<string,
|
|
34
|
-
content: Record<string, MediaTypeObject>;
|
|
35
|
-
}>;
|
|
39
|
+
responses: Record<string, TunedResponseObject>;
|
|
36
40
|
requestBody: OurRequestBodyObject;
|
|
37
41
|
};
|
|
38
42
|
export interface OperationEntry {
|
package/dist/lib/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,WAAW,EACX,eAAe,EACf,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,SAAS,EACV,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EACV,uBAAuB,EACvB,eAAe,EACf,2BAA2B,EAC5B,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,MAAM,EAAE,GAAG,IAAI,CACnB,eAAe,EACf,YAAY,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,CAC5C,GAAG;IACF,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,kBAAkB,CAAC,EAAE;QACnB,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,QAAQ,EAAE,WAAW,CAAC;IACtB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,UAAU,EAAE,IAAI,CAAC,uBAAuB,EAAE,SAAS,GAAG,iBAAiB,CAAC,GAAG;QACzE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,eAAe,CAAC,CAAC;QACxD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;KAC9D,CAAC;IACF,KAAK,EAAE,WAAW,CAAC;IACnB,IAAI,EAAE,SAAS,EAAE,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,OAAO,EAAE,MAAM,CACb,MAAM,EACN,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,GAAG;QAAE,MAAM,EAAE,eAAe,CAAA;KAAE,CAC9D,CAAC;CACH;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CACrC,eAAe,EACf,aAAa,GAAG,MAAM,GAAG,YAAY,GAAG,WAAW,GAAG,aAAa,GAAG,MAAM,CAC7E,GAAG;IACF,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IACtB,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sdk-it/spec",
|
|
3
|
-
"version": "0.46.
|
|
3
|
+
"version": "0.46.11",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"module": "./dist/index.js",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"!**/*.test.*"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@sdk-it/core": "0.46.
|
|
30
|
+
"@sdk-it/core": "0.46.11",
|
|
31
31
|
"@zukhruf/async": "^0.3.21",
|
|
32
32
|
"debug": "^4.4.1",
|
|
33
33
|
"fast-content-type-parse": "^3.0.0",
|