@redocly/openapi-core 0.0.0-snapshot.1791450539 → 0.0.0-snapshot.1791479290
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/lib/config/visitors.d.ts.map +1 -1
- package/lib/config/visitors.js +17 -53
- package/lib/config/visitors.js.map +1 -1
- package/lib/types/json-schema-adapter.d.ts.map +1 -1
- package/lib/types/json-schema-adapter.js +1 -6
- package/lib/types/json-schema-adapter.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitors.d.ts","sourceRoot":"","sources":["../../src/config/visitors.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE7D,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAErF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,CAAC,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC;IACxC,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAiBF,eAAO,MAAM,uBAAuB;;;oBAQd,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;EAQ9C,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;
|
|
1
|
+
{"version":3,"file":"visitors.d.ts","sourceRoot":"","sources":["../../src/config/visitors.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE7D,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAErF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,MAAM,2BAA2B,GAAG;IACxC,OAAO,EAAE,CAAC,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC;IACxC,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAiBF,eAAO,MAAM,uBAAuB;;;oBAQd,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;EAQ9C,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B,CAAC;AAqDF,eAAO,MAAM,oBAAoB;;oBAOX,MAAM,OAAO,WAAW,YAAY,aAAa,CAAC,GAAG,CAAC;;;oBAQtD,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;;oBAMzB,OAAO,OAAO,WAAW;;;oBAKzB,OAAO,OAAO,WAAW;;EAQ9C,CAAC"}
|
package/lib/config/visitors.js
CHANGED
|
@@ -59,7 +59,17 @@ function bundlerHandleNode(node, ctx) {
|
|
|
59
59
|
delete node.extends;
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
|
-
|
|
62
|
+
function rebasePath(value, sourceRef, rootRef) {
|
|
63
|
+
if (hasScheme(value) || path.isAbsolute(value)) {
|
|
64
|
+
return value;
|
|
65
|
+
}
|
|
66
|
+
if (isAbsoluteUrl(sourceRef)) {
|
|
67
|
+
return new URL(value, sourceRef).href;
|
|
68
|
+
}
|
|
69
|
+
const resolved = path.resolve(path.dirname(sourceRef), value);
|
|
70
|
+
return path.relative(path.dirname(rootRef), resolved) || '.';
|
|
71
|
+
}
|
|
72
|
+
// Paths in a `$ref`-ed file are written relative to that file, but the bundled config is read relative to the root config.
|
|
63
73
|
function rebaseFilePaths(node, ctx) {
|
|
64
74
|
const { rootRef, rebasedNodes } = ctx.getVisitorData();
|
|
65
75
|
const sourceRef = ctx.location.source.absoluteRef;
|
|
@@ -68,66 +78,20 @@ function rebaseFilePaths(node, ctx) {
|
|
|
68
78
|
}
|
|
69
79
|
// the walker visits a shared `$ref` target once per node type name, so rebase each node once
|
|
70
80
|
rebasedNodes.add(node);
|
|
71
|
-
const
|
|
72
|
-
if (!isString(value) || !value || hasScheme(value) || path.isAbsolute(value)) {
|
|
73
|
-
return value;
|
|
74
|
-
}
|
|
75
|
-
if (isAbsoluteUrl(sourceRef)) {
|
|
76
|
-
return new URL(value, sourceRef).href;
|
|
77
|
-
}
|
|
78
|
-
const resolved = path.resolve(path.dirname(sourceRef), value);
|
|
79
|
-
return path.relative(path.dirname(rootRef), resolved) || '.';
|
|
80
|
-
};
|
|
81
|
-
// a glob is matched against project paths: `/` and `**` already anchor it, `!` negates the rest
|
|
82
|
-
const rebaseGlob = (value) => {
|
|
83
|
-
if (!isString(value) ||
|
|
84
|
-
!value ||
|
|
85
|
-
value.startsWith('/') ||
|
|
86
|
-
value.startsWith('**') ||
|
|
87
|
-
isAbsoluteUrl(sourceRef)) {
|
|
88
|
-
return value;
|
|
89
|
-
}
|
|
90
|
-
if (value.startsWith('!')) {
|
|
91
|
-
return '!' + rebaseGlob(value.slice(1));
|
|
92
|
-
}
|
|
93
|
-
const dir = path
|
|
94
|
-
.relative(path.dirname(rootRef), path.dirname(sourceRef))
|
|
95
|
-
.split(path.sep)
|
|
96
|
-
.join('/');
|
|
97
|
-
return dir ? path.posix.join(dir, value) : value;
|
|
98
|
-
};
|
|
99
|
-
// one or more images, as a path or as "path mode" pairs separated by ", "; a token without a file extension is an icon name
|
|
100
|
-
const rebaseImage = (value) => isString(value)
|
|
101
|
-
? value
|
|
102
|
-
.split(/\s*,\s*/)
|
|
103
|
-
.map((entry) => {
|
|
104
|
-
const [src, ...mode] = entry.trim().split(/\s+/);
|
|
105
|
-
return [/\.\w+$/.test(src) ? rebase(src) : src, ...mode].join(' ');
|
|
106
|
-
})
|
|
107
|
-
.join(', ')
|
|
108
|
-
: value;
|
|
109
|
-
const rebasers = {
|
|
110
|
-
'uri-reference': rebase,
|
|
111
|
-
glob: rebaseGlob,
|
|
112
|
-
image: rebaseImage,
|
|
113
|
-
};
|
|
81
|
+
const rebaseItem = (item) => isString(item) && item ? rebasePath(item, sourceRef, rootRef) : item;
|
|
114
82
|
for (const [field, schema] of Object.entries(ctx.type.properties)) {
|
|
115
|
-
|
|
116
|
-
// a oneOf property resolves to the branch that matches this value; a scalar branch keeps its format
|
|
117
|
-
const propSchema = typeof schema === 'function' ? schema(value, field) : schema;
|
|
118
|
-
if (!isPlainObject(propSchema) || isNamedType(propSchema)) {
|
|
83
|
+
if (!isPlainObject(schema) || isNamedType(schema)) {
|
|
119
84
|
continue;
|
|
120
85
|
}
|
|
121
|
-
|
|
122
|
-
const rebaseValue = format ? rebasers[format] : undefined;
|
|
123
|
-
if (!rebaseValue) {
|
|
86
|
+
if ((schema.format ?? schema.items?.format) !== 'uri-reference') {
|
|
124
87
|
continue;
|
|
125
88
|
}
|
|
89
|
+
const value = node[field];
|
|
126
90
|
if (isString(value)) {
|
|
127
|
-
node[field] =
|
|
91
|
+
node[field] = rebaseItem(value);
|
|
128
92
|
}
|
|
129
93
|
else if (Array.isArray(value)) {
|
|
130
|
-
node[field] = value.map(
|
|
94
|
+
node[field] = value.map(rebaseItem);
|
|
131
95
|
}
|
|
132
96
|
}
|
|
133
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitors.js","sourceRoot":"","sources":["../../src/config/visitors.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"visitors.js","sourceRoot":"","sources":["../../src/config/visitors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schema-adapter.d.ts","sourceRoot":"","sources":["../../src/types/json-schema-adapter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,KAAK,EAAE,QAAQ,EAAY,aAAa,EAAE,MAAM,YAAY,CAAC;AAEpE,KAAK,kBAAkB,GAAG,UAAU,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"json-schema-adapter.d.ts","sourceRoot":"","sources":["../../src/types/json-schema-adapter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,KAAK,EAAE,QAAQ,EAAY,aAAa,EAAE,MAAM,YAAY,CAAC;AAEpE,KAAK,kBAAkB,GAAG,UAAU,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAiP7F,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,kBAAkB,GAC9B;IACD,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC9B,qBAAqB,CAAC,EAAE,aAAa,CAAC;CACvC,CASA"}
|
|
@@ -4,7 +4,7 @@ import { isPlainObject } from '../utils/is-plain-object.js';
|
|
|
4
4
|
let ajv;
|
|
5
5
|
function getAjv() {
|
|
6
6
|
if (!ajv) {
|
|
7
|
-
//
|
|
7
|
+
// no formats are registered here, so skip them instead of warning about each unknown one
|
|
8
8
|
ajv = new Ajv2020({
|
|
9
9
|
strictSchema: false,
|
|
10
10
|
validateFormats: false,
|
|
@@ -50,11 +50,6 @@ function transformJSONSchemaToNodeType(propertyName, schema, ctx) {
|
|
|
50
50
|
const { default: _, ...rest } = schema;
|
|
51
51
|
return rest;
|
|
52
52
|
}
|
|
53
|
-
// a single pattern types every entry like additionalProperties does, even next to additionalProperties: false
|
|
54
|
-
const patternSchemas = Object.values(schema.patternProperties ?? {});
|
|
55
|
-
if (patternSchemas.length === 1) {
|
|
56
|
-
schema = { ...schema, additionalProperties: patternSchemas[0] };
|
|
57
|
-
}
|
|
58
53
|
if (schema.type === 'object' && !schema.properties && !schema.oneOf) {
|
|
59
54
|
if (schema.additionalProperties === undefined || schema.additionalProperties === true) {
|
|
60
55
|
return { type: 'object' };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schema-adapter.js","sourceRoot":"","sources":["../../src/types/json-schema-adapter.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAE1B,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAIpD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAK5D,IAAI,GAAwB,CAAC;AAE7B,SAAS,MAAM;IACb,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,
|
|
1
|
+
{"version":3,"file":"json-schema-adapter.js","sourceRoot":"","sources":["../../src/types/json-schema-adapter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/openapi-core",
|
|
3
|
-
"version": "0.0.0-snapshot.
|
|
3
|
+
"version": "0.0.0-snapshot.1791479290",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -53,13 +53,14 @@
|
|
|
53
53
|
],
|
|
54
54
|
"dependencies": {
|
|
55
55
|
"@redocly/ajv": "^8.18.3",
|
|
56
|
-
"@redocly/config": "file:../../vendor/redocly-config-0.0.0-feat-config-is-file-path.
|
|
56
|
+
"@redocly/config": "file:../../vendor/redocly-config-0.0.0-feat-config-is-file-path.cdcf1553b2f.tgz",
|
|
57
57
|
"ajv": "npm:@redocly/ajv@^8.18.3",
|
|
58
58
|
"ajv-formats": "^3.0.1",
|
|
59
59
|
"colorette": "^1.2.0",
|
|
60
60
|
"graphql": "^16.14.1",
|
|
61
61
|
"js-levenshtein": "^1.1.6",
|
|
62
62
|
"js-yaml": "^5.2.2",
|
|
63
|
+
"json-schema-to-ts": "^3.1.0",
|
|
63
64
|
"jsonpath-rfc9535": "1.3.0",
|
|
64
65
|
"picomatch": "^4.0.4",
|
|
65
66
|
"pluralize": "^8.0.0",
|
|
@@ -69,7 +70,6 @@
|
|
|
69
70
|
"@types/js-levenshtein": "^1.1.0",
|
|
70
71
|
"@types/picomatch": "^4.0.2",
|
|
71
72
|
"@types/pluralize": "^0.0.29",
|
|
72
|
-
"json-schema-to-ts": "^3.1.0",
|
|
73
73
|
"typescript": "6.0.2"
|
|
74
74
|
}
|
|
75
75
|
}
|