@redocly/openapi-core 0.0.0-snapshot.1790327117 → 0.0.0-snapshot.1790608326
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/bundle/bundle-visitor.d.ts +1 -1
- package/lib/format/codeframes.d.ts.map +1 -1
- package/lib/format/codeframes.js +20 -36
- package/lib/format/codeframes.js.map +1 -1
- package/lib/rules/ajv.d.ts +0 -1
- package/lib/rules/ajv.d.ts.map +1 -1
- package/lib/rules/ajv.js +1 -43
- package/lib/rules/ajv.js.map +1 -1
- package/lib/rules/arazzo/workflow-dependsOn.js +1 -1
- package/lib/rules/arazzo/workflow-dependsOn.js.map +1 -1
- package/lib/rules/common/no-ambiguous-paths.d.ts.map +1 -1
- package/lib/rules/common/no-ambiguous-paths.js +22 -36
- package/lib/rules/common/no-ambiguous-paths.js.map +1 -1
- package/lib/types/json-schema-adapter.d.ts.map +1 -1
- package/lib/types/json-schema-adapter.js +11 -15
- package/lib/types/json-schema-adapter.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,7 +3,7 @@ import { type SpecMajorVersion } from '../oas-types.js';
|
|
|
3
3
|
import { type ResolvedRefMap, type Document } from '../resolve.js';
|
|
4
4
|
import { type Oas3Visitor, type Oas2Visitor } from '../visitors.js';
|
|
5
5
|
import { type ComponentNamesStrategy } from './bundle-document.js';
|
|
6
|
-
export declare function mapTypeToComponent(typeName: string, version: SpecMajorVersion): "
|
|
6
|
+
export declare function mapTypeToComponent(typeName: string, version: SpecMajorVersion): "responses" | "headers" | "definitions" | "examples" | "parameters" | "schemas" | "requestBodies" | "mediaTypes" | "securitySchemes" | "tags" | "links" | "callbacks" | "contentDescriptors" | "errors" | "examplePairingObjects" | null;
|
|
7
7
|
export declare function makeBundleVisitor({ version, dereference, rootDocument, resolvedRefMap, keepUrlRefs, componentRenamingConflicts, componentNamesStrategy, }: {
|
|
8
8
|
version: SpecMajorVersion;
|
|
9
9
|
dereference: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeframes.d.ts","sourceRoot":"","sources":["../../src/format/codeframes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"codeframes.d.ts","sourceRoot":"","sources":["../../src/format/codeframes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAC;AAI3C,OAAO,KAAK,EAAE,qBAAqB,EAAO,cAAc,EAAE,MAAM,YAAY,CAAC;AAE7E,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAA;CAAE,CAAC;AACxE,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA;CAAE,CAAC;AAC5D,KAAK,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAA;CAAE,CAAC;AAC3F,KAAK,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA;CAAE,CAAC;AACtE,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAA;CAAE,CAAC;AACrE,KAAK,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,mBAAmB,GAAG,YAAY,GAAG,UAAU,CAAC;AAKxF,wBAAgB,YAAY,CAAC,QAAQ,EAAE,qBAAqB,EAAE,KAAK,EAAE,OAAO,UAiE3E;AAqDD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,qBAAqB,CAWlF;AAgCD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,+FAmCxF"}
|
package/lib/format/codeframes.js
CHANGED
|
@@ -107,47 +107,31 @@ export function getLineColLocation(location) {
|
|
|
107
107
|
return {
|
|
108
108
|
...location,
|
|
109
109
|
pointer: undefined,
|
|
110
|
-
...positionsToLoc(source, astNode?.startPosition ?? 1, astNode?.endPosition ?? 1),
|
|
110
|
+
...positionsToLoc(source.body, astNode?.startPosition ?? 1, astNode?.endPosition ?? 1),
|
|
111
111
|
};
|
|
112
112
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
let
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
lineStarts.push(i + 1);
|
|
121
|
-
}
|
|
122
|
-
lineStartsCache.set(source, lineStarts);
|
|
123
|
-
}
|
|
124
|
-
return lineStarts;
|
|
125
|
-
}
|
|
126
|
-
function offsetToLoc(source, lineStarts, offset) {
|
|
127
|
-
let low = 0;
|
|
128
|
-
let high = lineStarts.length - 1;
|
|
129
|
-
while (low < high) {
|
|
130
|
-
const middle = (low + high + 1) >> 1;
|
|
131
|
-
if (lineStarts[middle] <= offset) {
|
|
132
|
-
low = middle;
|
|
113
|
+
function positionsToLoc(source, startPos, endPos) {
|
|
114
|
+
let currentLine = 1;
|
|
115
|
+
let currentCol = 1;
|
|
116
|
+
let start = { line: 1, col: 1 };
|
|
117
|
+
for (let i = 0; i < endPos - 1; i++) {
|
|
118
|
+
if (i === startPos - 1) {
|
|
119
|
+
start = { line: currentLine, col: currentCol + 1 };
|
|
133
120
|
}
|
|
134
|
-
|
|
135
|
-
|
|
121
|
+
if (source[i] === '\n') {
|
|
122
|
+
currentLine++;
|
|
123
|
+
currentCol = 1;
|
|
124
|
+
if (i === startPos - 1) {
|
|
125
|
+
start = { line: currentLine, col: currentCol };
|
|
126
|
+
}
|
|
127
|
+
if (source[i + 1] === '\r')
|
|
128
|
+
i++; // TODO: test it
|
|
129
|
+
continue;
|
|
136
130
|
}
|
|
131
|
+
currentCol++;
|
|
137
132
|
}
|
|
138
|
-
const
|
|
139
|
-
|
|
140
|
-
const skippedCarriageReturn = low > 0 && source.body[lineStart] === '\r' && offset > lineStart ? 1 : 0;
|
|
141
|
-
return { line: low + 1, col: offset - lineStart + 1 - skippedCarriageReturn };
|
|
142
|
-
}
|
|
143
|
-
function positionsToLoc(source, startPos, endPos) {
|
|
144
|
-
if (startPos === endPos) {
|
|
145
|
-
return { start: { line: 1, col: 1 }, end: { line: 1, col: 1 } };
|
|
146
|
-
}
|
|
147
|
-
const lineStarts = getLineStarts(source);
|
|
148
|
-
const start = offsetToLoc(source, lineStarts, startPos);
|
|
149
|
-
const lastChar = offsetToLoc(source, lineStarts, endPos - 1);
|
|
150
|
-
return { start, end: { line: lastChar.line, col: lastChar.col + 1 } };
|
|
133
|
+
const end = startPos === endPos ? { ...start } : { line: currentLine, col: currentCol + 1 };
|
|
134
|
+
return { start, end };
|
|
151
135
|
}
|
|
152
136
|
export function getAstNodeByPointer(root, pointer, reportOnKey) {
|
|
153
137
|
const pointerSegments = parsePointer(pointer.substr(2));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeframes.js","sourceRoot":"","sources":["../../src/format/codeframes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"codeframes.js","sourceRoot":"","sources":["../../src/format/codeframes.ts"],"names":[],"mappings":"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"}
|
package/lib/rules/ajv.d.ts
CHANGED
|
@@ -4,7 +4,6 @@ import type { Oas3Schema, Oas3_1Schema } from '../typings/openapi.js';
|
|
|
4
4
|
import type { ResolveFn, UserContext } from '../walk.js';
|
|
5
5
|
export declare class AjvValidator {
|
|
6
6
|
private instances;
|
|
7
|
-
private sharedValidators;
|
|
8
7
|
validate(data: unknown, schema: Oas3Schema | Oas3_1Schema, options: {
|
|
9
8
|
schemaLoc: Location;
|
|
10
9
|
instancePath: string;
|
package/lib/rules/ajv.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajv.d.ts","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"AAAA,OAAgB,EACd,KAAK,WAAW,EAEhB,KAAK,OAAO,IAAI,UAAU,EAE3B,MAAM,2BAA2B,CAAC;AAInC,OAAO,
|
|
1
|
+
{"version":3,"file":"ajv.d.ts","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"AAAA,OAAgB,EACd,KAAK,WAAW,EAEhB,KAAK,OAAO,IAAI,UAAU,EAE3B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAyB,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAazD,qBAAa,YAAY;IACvB,OAAO,CAAC,SAAS,CAAwC;IAEzD,QAAQ,CACN,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,UAAU,GAAG,YAAY,EACjC,OAAO,EAAE;QACP,SAAS,EAAE,QAAQ,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,OAAO,EAAE,SAAS,CAAC;QACnB,yBAAyB,EAAE,OAAO,CAAC;QACnC,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;KACzC,GACA;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,CAAC,WAAW,GAAG;YAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,EAAE,CAAA;KAAE;IA2DvE,OAAO,CAAC,MAAM;IAoCd,OAAO,CAAC,YAAY;CAwBrB"}
|
package/lib/rules/ajv.js
CHANGED
|
@@ -1,17 +1,7 @@
|
|
|
1
1
|
import Ajv2020 from '@redocly/ajv/dist/2020.js';
|
|
2
2
|
import AjvDraft4 from '@redocly/ajv/dist/draft4.js';
|
|
3
3
|
import addFormats from 'ajv-formats';
|
|
4
|
-
import { escapePointerFragment
|
|
5
|
-
import { isPlainObject } from '../utils/is-plain-object.js';
|
|
6
|
-
// Ajv does not validate these keywords, so schemas that differ only in them share one compiled validator.
|
|
7
|
-
const ANNOTATION_KEYWORDS = [
|
|
8
|
-
'title',
|
|
9
|
-
'description',
|
|
10
|
-
'example',
|
|
11
|
-
'examples',
|
|
12
|
-
'default',
|
|
13
|
-
'deprecated',
|
|
14
|
-
];
|
|
4
|
+
import { escapePointerFragment } from '../ref-utils.js';
|
|
15
5
|
function getSchemaIdKey(dialect) {
|
|
16
6
|
return dialect === 'draft4' ? 'id' : '$id';
|
|
17
7
|
}
|
|
@@ -22,7 +12,6 @@ function getDialectBySpecVersion(specVersion) {
|
|
|
22
12
|
}
|
|
23
13
|
export class AjvValidator {
|
|
24
14
|
instances = {};
|
|
25
|
-
sharedValidators = new Map();
|
|
26
15
|
validate(data, schema, options) {
|
|
27
16
|
const { schemaLoc, instancePath, resolve, allowAdditionalProperties, ajvContext, specVersion } = options;
|
|
28
17
|
const dialect = getDialectBySpecVersion(specVersion);
|
|
@@ -101,26 +90,6 @@ export class AjvValidator {
|
|
|
101
90
|
}
|
|
102
91
|
getValidator(schema, loc, resolve, allowAdditionalProperties, dialect) {
|
|
103
92
|
const ajv = this.getAjv(resolve, dialect);
|
|
104
|
-
// Every plain `$ref` to a schema shares the validator of its target.
|
|
105
|
-
if (isRef(schema) && !isRefWithSiblings(schema)) {
|
|
106
|
-
const resolved = resolve(schema, loc.source.absoluteRef);
|
|
107
|
-
if (resolved.location && isPlainObject(resolved.node)) {
|
|
108
|
-
schema = resolved.node;
|
|
109
|
-
loc = resolved.location;
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
// A missing schema goes to the location path below, which accepts any value.
|
|
113
|
-
const shape = isPlainObject(schema) ? getSchemaShape(schema, dialect) : undefined;
|
|
114
|
-
if (shape) {
|
|
115
|
-
const sharedValidator = this.sharedValidators.get(shape);
|
|
116
|
-
if (sharedValidator) {
|
|
117
|
-
return sharedValidator;
|
|
118
|
-
}
|
|
119
|
-
ajv.setDefaultUnevaluatedProperties(allowAdditionalProperties);
|
|
120
|
-
const validate = ajv.compile(schema);
|
|
121
|
-
this.sharedValidators.set(shape, validate);
|
|
122
|
-
return validate;
|
|
123
|
-
}
|
|
124
93
|
const $id = encodeURI(loc.absolutePointer);
|
|
125
94
|
const schemaIdKey = getSchemaIdKey(dialect);
|
|
126
95
|
if (!ajv.getSchema($id)) {
|
|
@@ -133,15 +102,4 @@ export class AjvValidator {
|
|
|
133
102
|
return ajv.getSchema($id);
|
|
134
103
|
}
|
|
135
104
|
}
|
|
136
|
-
function getSchemaShape(schema, dialect) {
|
|
137
|
-
const keywords = { ...schema };
|
|
138
|
-
for (const keyword of ANNOTATION_KEYWORDS) {
|
|
139
|
-
delete keywords[keyword];
|
|
140
|
-
}
|
|
141
|
-
const shape = JSON.stringify(keywords);
|
|
142
|
-
if (shape.includes('"$ref"')) {
|
|
143
|
-
return undefined;
|
|
144
|
-
}
|
|
145
|
-
return `${dialect}:${shape}`;
|
|
146
|
-
}
|
|
147
105
|
//# sourceMappingURL=ajv.js.map
|
package/lib/rules/ajv.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ajv.js","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"AAAA,OAAO,OAKN,MAAM,2BAA2B,CAAC;AACnC,OAAO,SAAS,MAAM,6BAA6B,CAAC;AACpD,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,qBAAqB,
|
|
1
|
+
{"version":3,"file":"ajv.js","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export const WorkflowDependsOn = () => {
|
|
2
|
-
const seenWorkflow = new Set();
|
|
3
2
|
const existingSourceDescriptions = new Set();
|
|
4
3
|
const existingWorkflowIds = new Set();
|
|
5
4
|
return {
|
|
@@ -21,6 +20,7 @@ export const WorkflowDependsOn = () => {
|
|
|
21
20
|
leave(workflow, { report, location }) {
|
|
22
21
|
if (!workflow.dependsOn)
|
|
23
22
|
return;
|
|
23
|
+
const seenWorkflow = new Set();
|
|
24
24
|
for (const item of workflow.dependsOn) {
|
|
25
25
|
// Possible dependsOn workflow pattern: $sourceDescriptions.<name>.<workflowId>
|
|
26
26
|
if (item.startsWith('$sourceDescriptions.')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-dependsOn.js","sourceRoot":"","sources":["../../../src/rules/arazzo/workflow-dependsOn.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,iBAAiB,GAAgB,GAAG,EAAE;IACjD,MAAM,
|
|
1
|
+
{"version":3,"file":"workflow-dependsOn.js","sourceRoot":"","sources":["../../../src/rules/arazzo/workflow-dependsOn.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,iBAAiB,GAAgB,GAAG,EAAE;IACjD,MAAM,0BAA0B,GAAG,IAAI,GAAG,EAAE,CAAC;IAC7C,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAE,CAAC;IAEtC,OAAO;QACL,kBAAkB,EAAE;YAClB,KAAK,CAAC,kBAAkB;gBACtB,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;oBACnD,0BAA0B,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBACzD,CAAC;YACH,CAAC;SACF;QACD,SAAS,EAAE;YACT,KAAK,CAAC,SAAS;gBACb,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;oBACjC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBAC/C,CAAC;YACH,CAAC;SACF;QACD,QAAQ,EAAE;YACR,KAAK,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAe;gBAC/C,IAAI,CAAC,QAAQ,CAAC,SAAS;oBAAE,OAAO;gBAEhC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;gBAC/B,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,SAAS,EAAE,CAAC;oBACtC,+EAA+E;oBAC/E,IAAI,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;wBAC5C,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;wBACjD,IAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,CAAC;4BAC3D,MAAM,CAAC;gCACL,OAAO,EAAE,qBAAqB,qBAAqB,yCAAyC;gCAC5F,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gCACzE,SAAS,EAAE,8DAA8D;6BAC1E,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;oBACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC9E,MAAM,CAAC;4BACL,OAAO,EAAE,YAAY,IAAI,gCAAgC;4BACzD,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;4BACzE,SAAS,EAAE,8DAA8D;yBAC1E,CAAC,CAAC;oBACL,CAAC;oBACD,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC3B,MAAM,CAAC;4BACL,OAAO,EAAE,6CAA6C;4BACtD,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC;4BACvC,SAAS,EAAE,8DAA8D;yBAC1E,CAAC,CAAC;oBACL,CAAC;oBACD,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-ambiguous-paths.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-ambiguous-paths.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"no-ambiguous-paths.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-ambiguous-paths.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG5D,eAAO,MAAM,gBAAgB,EAAE,QAAQ,GAAG,QAoBzC,CAAC"}
|
|
@@ -1,57 +1,43 @@
|
|
|
1
1
|
export const NoAmbiguousPaths = () => {
|
|
2
2
|
return {
|
|
3
3
|
Paths(pathMap, { report, location }) {
|
|
4
|
-
|
|
5
|
-
const seenPathsByGroup = new Map();
|
|
4
|
+
const seenPaths = [];
|
|
6
5
|
for (const currentPath of Object.keys(pathMap)) {
|
|
7
|
-
const
|
|
8
|
-
const group = `${parsedPath.segments.length}:${parsedPath.variableCount}`;
|
|
9
|
-
let seenPaths = seenPathsByGroup.get(group);
|
|
10
|
-
if (!seenPaths) {
|
|
11
|
-
seenPaths = [];
|
|
12
|
-
seenPathsByGroup.set(group, seenPaths);
|
|
13
|
-
}
|
|
14
|
-
let ambiguousPath;
|
|
15
|
-
for (const seenPath of seenPaths) {
|
|
16
|
-
if (arePathsAmbiguous(seenPath, parsedPath)) {
|
|
17
|
-
ambiguousPath = seenPath;
|
|
18
|
-
break;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
6
|
+
const ambiguousPath = seenPaths.find((seenPath) => arePathsAmbiguous(seenPath, currentPath));
|
|
21
7
|
if (ambiguousPath) {
|
|
22
8
|
report({
|
|
23
|
-
message: `Paths should resolve unambiguously. Found two ambiguous paths: \`${ambiguousPath
|
|
9
|
+
message: `Paths should resolve unambiguously. Found two ambiguous paths: \`${ambiguousPath}\` and \`${currentPath}\`.`,
|
|
24
10
|
location: location.child([currentPath]).key(),
|
|
25
11
|
reference: 'https://redocly.com/docs/cli/rules/oas/no-ambiguous-paths',
|
|
26
12
|
});
|
|
27
13
|
}
|
|
28
|
-
seenPaths.push(
|
|
14
|
+
seenPaths.push(currentPath);
|
|
29
15
|
}
|
|
30
16
|
},
|
|
31
17
|
};
|
|
32
18
|
};
|
|
33
|
-
function parsePath(path) {
|
|
34
|
-
const segments = path.split('/');
|
|
35
|
-
const isVariable = [];
|
|
36
|
-
let variableCount = 0;
|
|
37
|
-
for (const segment of segments) {
|
|
38
|
-
const variable = /^{.+?}$/.test(segment);
|
|
39
|
-
isVariable.push(variable);
|
|
40
|
-
if (variable) {
|
|
41
|
-
variableCount++;
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
return { path, segments, isVariable, variableCount };
|
|
45
|
-
}
|
|
46
19
|
function arePathsAmbiguous(a, b) {
|
|
47
|
-
|
|
48
|
-
|
|
20
|
+
const partsA = a.split('/');
|
|
21
|
+
const partsB = b.split('/');
|
|
22
|
+
if (partsA.length !== partsB.length)
|
|
23
|
+
return false;
|
|
24
|
+
let aVars = 0;
|
|
25
|
+
let bVars = 0;
|
|
26
|
+
let ambiguous = true;
|
|
27
|
+
for (let i = 0; i < partsA.length; i++) {
|
|
28
|
+
const aIsVar = partsA[i].match(/^{.+?}$/);
|
|
29
|
+
const bIsVar = partsB[i].match(/^{.+?}$/);
|
|
30
|
+
if (aIsVar || bIsVar) {
|
|
31
|
+
if (aIsVar)
|
|
32
|
+
aVars++;
|
|
33
|
+
if (bIsVar)
|
|
34
|
+
bVars++;
|
|
49
35
|
continue;
|
|
50
36
|
}
|
|
51
|
-
if (
|
|
52
|
-
|
|
37
|
+
else if (partsA[i] !== partsB[i]) {
|
|
38
|
+
ambiguous = false;
|
|
53
39
|
}
|
|
54
40
|
}
|
|
55
|
-
return
|
|
41
|
+
return ambiguous && aVars === bVars;
|
|
56
42
|
}
|
|
57
43
|
//# sourceMappingURL=no-ambiguous-paths.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-ambiguous-paths.js","sourceRoot":"","sources":["../../../src/rules/common/no-ambiguous-paths.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"no-ambiguous-paths.js","sourceRoot":"","sources":["../../../src/rules/common/no-ambiguous-paths.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,gBAAgB,GAAwB,GAAG,EAAE;IACxD,OAAO;QACL,KAAK,CAAC,OAA8B,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAe;YACrE,MAAM,SAAS,GAAa,EAAE,CAAC;YAE/B,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC/C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAChD,iBAAiB,CAAC,QAAQ,EAAE,WAAW,CAAC,CACzC,CAAC;gBACF,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,CAAC;wBACL,OAAO,EAAE,oEAAoE,aAAa,YAAY,WAAW,KAAK;wBACtH,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,EAAE;wBAC7C,SAAS,EAAE,2DAA2D;qBACvE,CAAC,CAAC;gBACL,CAAC;gBACD,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,SAAS,iBAAiB,CAAC,CAAS,EAAE,CAAS;IAC7C,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE5B,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAElD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,SAAS,GAAG,IAAI,CAAC;IACrB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAE1C,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACrB,IAAI,MAAM;gBAAE,KAAK,EAAE,CAAC;YACpB,IAAI,MAAM;gBAAE,KAAK,EAAE,CAAC;YACpB,SAAS;QACX,CAAC;aAAM,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACnC,SAAS,GAAG,KAAK,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,SAAS,IAAI,KAAK,KAAK,KAAK,CAAC;AACtC,CAAC"}
|
|
@@ -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;AAwO7F,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"}
|
|
@@ -1,25 +1,21 @@
|
|
|
1
1
|
// For internal usage only
|
|
2
|
-
import
|
|
2
|
+
import Ajv from '@redocly/ajv/dist/2020.js';
|
|
3
3
|
import { isPlainObject } from '../utils/is-plain-object.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
verbose: true,
|
|
14
|
-
});
|
|
15
|
-
return ajv;
|
|
16
|
-
}
|
|
4
|
+
const ajv = new Ajv({
|
|
5
|
+
strictSchema: false,
|
|
6
|
+
allowUnionTypes: true,
|
|
7
|
+
useDefaults: true,
|
|
8
|
+
allErrors: true,
|
|
9
|
+
discriminator: true,
|
|
10
|
+
strictTypes: false,
|
|
11
|
+
verbose: true,
|
|
12
|
+
});
|
|
17
13
|
function findOneOf(schemaOneOf, oneOfs) {
|
|
18
14
|
if (oneOfs.some((option) => typeof option === 'function')) {
|
|
19
15
|
throw new Error('Unexpected oneOf inside oneOf.');
|
|
20
16
|
}
|
|
21
17
|
return (value) => {
|
|
22
|
-
let index = schemaOneOf.findIndex((option) =>
|
|
18
|
+
let index = schemaOneOf.findIndex((option) => ajv.validate(option, value));
|
|
23
19
|
if (index === -1) {
|
|
24
20
|
index = 0;
|
|
25
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schema-adapter.js","sourceRoot":"","sources":["../../src/types/json-schema-adapter.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAE1B,OAAO,
|
|
1
|
+
{"version":3,"file":"json-schema-adapter.js","sourceRoot":"","sources":["../../src/types/json-schema-adapter.ts"],"names":[],"mappings":"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"}
|