@redocly/openapi-core 0.0.0-snapshot.1780933952 → 0.0.0-snapshot.1781010215
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-document.d.ts +2 -0
- package/lib/bundle/bundle-document.d.ts.map +1 -1
- package/lib/bundle/bundle-document.js +2 -1
- package/lib/bundle/bundle-document.js.map +1 -1
- package/lib/bundle/bundle-visitor.d.ts +2 -1
- package/lib/bundle/bundle-visitor.d.ts.map +1 -1
- package/lib/bundle/bundle-visitor.js +60 -7
- package/lib/bundle/bundle-visitor.js.map +1 -1
- package/lib/lint.d.ts.map +1 -1
- package/lib/lint.js +2 -0
- package/lib/lint.js.map +1 -1
- package/lib/oas-types.d.ts +2 -0
- package/lib/oas-types.d.ts.map +1 -1
- package/lib/oas-types.js +2 -0
- package/lib/oas-types.js.map +1 -1
- package/lib/rules/ajv.d.ts +14 -18
- package/lib/rules/ajv.d.ts.map +1 -1
- package/lib/rules/ajv.js +88 -86
- package/lib/rules/ajv.js.map +1 -1
- package/lib/rules/common/no-invalid-parameter-examples.d.ts.map +1 -1
- package/lib/rules/common/no-invalid-parameter-examples.js +0 -4
- package/lib/rules/common/no-invalid-parameter-examples.js.map +1 -1
- package/lib/rules/common/no-invalid-schema-examples.d.ts.map +1 -1
- package/lib/rules/common/no-invalid-schema-examples.js +0 -4
- package/lib/rules/common/no-invalid-schema-examples.js.map +1 -1
- package/lib/rules/oas3/no-invalid-media-type-examples.d.ts.map +1 -1
- package/lib/rules/oas3/no-invalid-media-type-examples.js +0 -3
- package/lib/rules/oas3/no-invalid-media-type-examples.js.map +1 -1
- package/lib/rules/oas3/spec-components-invalid-map-name.d.ts.map +1 -1
- package/lib/rules/oas3/spec-components-invalid-map-name.js +3 -3
- package/lib/rules/oas3/spec-components-invalid-map-name.js.map +1 -1
- package/lib/rules/utils.d.ts +0 -2
- package/lib/rules/utils.d.ts.map +1 -1
- package/lib/rules/utils.js +3 -2
- package/lib/rules/utils.js.map +1 -1
- package/lib/utils/to-pascal-case.d.ts +2 -0
- package/lib/utils/to-pascal-case.d.ts.map +1 -0
- package/lib/utils/to-pascal-case.js +8 -0
- package/lib/utils/to-pascal-case.js.map +1 -0
- package/package.json +1 -1
|
@@ -11,6 +11,7 @@ export type CoreBundleOptions = {
|
|
|
11
11
|
removeUnusedComponents?: boolean;
|
|
12
12
|
keepUrlRefs?: boolean;
|
|
13
13
|
componentRenamingConflicts?: RuleSeverity;
|
|
14
|
+
useTitlesForComponentNames?: boolean;
|
|
14
15
|
};
|
|
15
16
|
export type BundleResult = {
|
|
16
17
|
bundle: Document;
|
|
@@ -29,5 +30,6 @@ export declare function bundleDocument(opts: {
|
|
|
29
30
|
removeUnusedComponents?: boolean;
|
|
30
31
|
keepUrlRefs?: boolean;
|
|
31
32
|
componentRenamingConflicts?: RuleSeverity;
|
|
33
|
+
useTitlesForComponentNames?: boolean;
|
|
32
34
|
}): Promise<BundleResult>;
|
|
33
35
|
//# sourceMappingURL=bundle-document.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-document.d.ts","sourceRoot":"","sources":["../../src/bundle/bundle-document.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIvD,OAAO,EAAmB,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EAAkB,KAAK,kBAAkB,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE3F,OAAO,EAAkC,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,0BAA0B,CAAC,EAAE,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"bundle-document.d.ts","sourceRoot":"","sources":["../../src/bundle/bundle-document.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIvD,OAAO,EAAmB,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EAAkB,KAAK,kBAAkB,EAAE,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE3F,OAAO,EAAkC,KAAK,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,0BAA0B,CAAC,EAAE,YAAY,CAAC;IAC1C,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC,CAAC;AAIF,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CACvD,CAAC;AAEF,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAChC,mBAAmB,EAAE,YAAY,CAAC;IAClC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,0BAA0B,CAAC,EAAE,YAAY,CAAC;IAC1C,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC,GAAG,OAAO,CAAC,YAAY,CAAC,CAsHxB"}
|
|
@@ -8,7 +8,7 @@ import { normalizeTypes } from '../types/index.js';
|
|
|
8
8
|
import { normalizeVisitors } from '../visitors.js';
|
|
9
9
|
import { walkDocument } from '../walk.js';
|
|
10
10
|
export async function bundleDocument(opts) {
|
|
11
|
-
const { document, config, types, externalRefResolver, dereference = false, removeUnusedComponents = false, keepUrlRefs = false, componentRenamingConflicts, } = opts;
|
|
11
|
+
const { document, config, types, externalRefResolver, dereference = false, removeUnusedComponents = false, keepUrlRefs = false, componentRenamingConflicts, useTitlesForComponentNames = false, } = opts;
|
|
12
12
|
const specVersion = detectSpec(document.parsed);
|
|
13
13
|
const specMajorVersion = getMajorSpecVersion(specVersion);
|
|
14
14
|
const rules = config.getRulesForSpecVersion(specMajorVersion);
|
|
@@ -53,6 +53,7 @@ export async function bundleDocument(opts) {
|
|
|
53
53
|
resolvedRefMap,
|
|
54
54
|
keepUrlRefs,
|
|
55
55
|
componentRenamingConflicts,
|
|
56
|
+
useTitlesForComponentNames,
|
|
56
57
|
}),
|
|
57
58
|
},
|
|
58
59
|
...decorators.filter((decorator) => decorator.ruleId !== 'remove-unused-components'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-document.js","sourceRoot":"","sources":["../../src/bundle/bundle-document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,sBAAsB,IAAI,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AACtH,OAAO,EAAE,sBAAsB,IAAI,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AACtH,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAoC,MAAM,eAAe,CAAC;AAClF,OAAO,EAAE,cAAc,EAA0C,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,YAAY,EAA4C,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"bundle-document.js","sourceRoot":"","sources":["../../src/bundle/bundle-document.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EAAE,sBAAsB,IAAI,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AACtH,OAAO,EAAE,sBAAsB,IAAI,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AACtH,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAoC,MAAM,eAAe,CAAC;AAClF,OAAO,EAAE,cAAc,EAA0C,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,YAAY,EAA4C,MAAM,YAAY,CAAC;AAwBpF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAUpC;IACC,MAAM,EACJ,QAAQ,EACR,MAAM,EACN,KAAK,EACL,mBAAmB,EACnB,WAAW,GAAG,KAAK,EACnB,sBAAsB,GAAG,KAAK,EAC9B,WAAW,GAAG,KAAK,EACnB,0BAA0B,EAC1B,0BAA0B,GAAG,KAAK,GACnC,GAAG,IAAI,CAAC;IACT,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;IAEvF,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;IAC7E,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAEvE,MAAM,GAAG,GAAkB;QACzB,QAAQ,EAAE,EAAE;QACZ,WAAW;QACX,MAAM;QACN,QAAQ,EAAE,IAAI,GAAG,EAA8B;QAC/C,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,IAAI,cAAc,GAAG,MAAM,eAAe,CAAC;QACzC,YAAY,EAAE,QAAQ;QACtB,QAAQ,EAAE,eAAe,CAAC,IAAI;QAC9B,mBAAmB;KACpB,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,iEAAiE;QACjE,YAAY,CAAC;YACX,QAAQ;YACR,QAAQ,EAAE,eAAe,CAAC,IAA0B;YACpD,kBAAkB,EAAE,iBAAiB,CAAC,aAAa,EAAE,eAAe,CAAC;YACrE,cAAc;YACd,GAAG;SACJ,CAAC,CAAC;QACH,cAAc,GAAG,MAAM,eAAe,CAAC;YACrC,YAAY,EAAE,QAAQ;YACtB,QAAQ,EAAE,eAAe,CAAC,IAAI;YAC9B,mBAAmB;SACpB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,aAAa,GAAG,iBAAiB,CACrC;QACE;YACE,QAAQ,EAAE,OAAO;YACjB,MAAM,EAAE,SAAS;YACjB,OAAO,EAAE,iBAAiB,CAAC;gBACzB,OAAO,EAAE,gBAAgB;gBACzB,WAAW;gBACX,YAAY,EAAE,QAAQ;gBACtB,cAAc;gBACd,WAAW;gBACX,0BAA0B;gBAC1B,0BAA0B;aAC3B,CAAC;SACH;QACD,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,KAAK,0BAA0B,CAAC;KACrF,EACD,eAAe,CAChB,CAAC;IAEF,YAAY,CAAC;QACX,QAAQ;QACR,QAAQ,EAAE,eAAe,CAAC,IAAI;QAC9B,kBAAkB,EAAE,aAAa;QACjC,cAAc;QACd,GAAG;KACJ,CAAC,CAAC;IAEH,IACE,sBAAsB;QACtB,MAAM,CAAC,oBAAoB,CAAC,0BAA0B,EAAE,WAAW,CAAC,CAAC,QAAQ,KAAK,KAAK,EACvF,CAAC;QACD,MAAM,gBAAgB,GAAG,MAAM,eAAe,CAAC;YAC7C,YAAY,EAAE,QAAQ;YACtB,QAAQ,EAAE,eAAe,CAAC,IAAI;YAC9B,mBAAmB;SACpB,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,iBAAiB,CAC1C;YACE;gBACE,QAAQ,EAAE,OAAO;gBACjB,MAAM,EAAE,0BAA0B;gBAClC,OAAO,EACL,gBAAgB,KAAK,MAAM;oBACzB,CAAC,CAAC,0BAA0B,CAAC,EAAE,CAAC;oBAChC,CAAC,CAAC,0BAA0B,CAAC,EAAE,CAAC;aACrC;SACF,EACD,eAAe,CAChB,CAAC;QAEF,YAAY,CAAC;YACX,QAAQ;YACR,QAAQ,EAAE,eAAe,CAAC,IAAI;YAC9B,kBAAkB,EAAE,kBAAkB;YACtC,cAAc,EAAE,gBAAgB;YAChC,GAAG;SACJ,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,MAAM,EAAE,QAAQ;QAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC3E,gBAAgB,EAAE,mBAAmB,CAAC,QAAQ,EAAE;QAChD,QAAQ,EAAE,eAAe,CAAC,IAAI;QAC9B,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,YAAY,EAAE,GAAG,CAAC,YAAY;KAC/B,CAAC;AACJ,CAAC"}
|
|
@@ -3,12 +3,13 @@ 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
|
export declare function mapTypeToComponent(typeName: string, version: SpecMajorVersion): "definitions" | "examples" | "parameters" | "responses" | "schemas" | "requestBodies" | "headers" | "mediaTypes" | "securitySchemes" | "tags" | "links" | "callbacks" | "contentDescriptors" | "errors" | "examplePairingObjects" | null;
|
|
6
|
-
export declare function makeBundleVisitor({ version, dereference, rootDocument, resolvedRefMap, keepUrlRefs, componentRenamingConflicts, }: {
|
|
6
|
+
export declare function makeBundleVisitor({ version, dereference, rootDocument, resolvedRefMap, keepUrlRefs, componentRenamingConflicts, useTitlesForComponentNames, }: {
|
|
7
7
|
version: SpecMajorVersion;
|
|
8
8
|
dereference: boolean;
|
|
9
9
|
rootDocument: Document;
|
|
10
10
|
resolvedRefMap: ResolvedRefMap;
|
|
11
11
|
keepUrlRefs: boolean;
|
|
12
12
|
componentRenamingConflicts?: RuleSeverity;
|
|
13
|
+
useTitlesForComponentNames?: boolean;
|
|
13
14
|
}): Oas3Visitor | Oas2Visitor;
|
|
14
15
|
//# sourceMappingURL=bundle-visitor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-visitor.d.ts","sourceRoot":"","sources":["../../src/bundle/bundle-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"bundle-visitor.d.ts","sourceRoot":"","sources":["../../src/bundle/bundle-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAWhF,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAQnE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AASpE,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,4OAyF7E;AAED,wBAAgB,iBAAiB,CAAC,EAChC,OAAO,EACP,WAAW,EACX,YAAY,EACZ,cAAc,EACd,WAAW,EACX,0BAAmC,EACnC,0BAAkC,GACnC,EAAE;IACD,OAAO,EAAE,gBAAgB,CAAC;IAC1B,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,QAAQ,CAAC;IACvB,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,0BAA0B,CAAC,EAAE,YAAY,CAAC;IAC1C,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC,6BA+PA"}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
|
+
import { COMPONENT_NAME_PATTERN } from '../oas-types.js';
|
|
1
2
|
import { isAbsoluteUrl, replaceRef, isExternalValue, isRef, pointerBaseName, refBaseName, isMappingRef, } from '../ref-utils.js';
|
|
2
3
|
import { reportUnresolvedRef } from '../rules/common/no-unresolved-refs.js';
|
|
3
4
|
import { dequal } from '../utils/dequal.js';
|
|
5
|
+
import { isPlainObject } from '../utils/is-plain-object.js';
|
|
6
|
+
import { isString } from '../utils/is-string.js';
|
|
4
7
|
import { makeRefId } from '../utils/make-ref-id.js';
|
|
8
|
+
import { toPascalCase } from '../utils/to-pascal-case.js';
|
|
9
|
+
function getTitle(node) {
|
|
10
|
+
return isPlainObject(node) && isString(node.title) ? node.title.trim() : '';
|
|
11
|
+
}
|
|
5
12
|
export function mapTypeToComponent(typeName, version) {
|
|
6
13
|
switch (version) {
|
|
7
14
|
case 'oas3':
|
|
@@ -92,9 +99,12 @@ export function mapTypeToComponent(typeName, version) {
|
|
|
92
99
|
}
|
|
93
100
|
}
|
|
94
101
|
}
|
|
95
|
-
export function makeBundleVisitor({ version, dereference, rootDocument, resolvedRefMap, keepUrlRefs, componentRenamingConflicts = 'warn', }) {
|
|
102
|
+
export function makeBundleVisitor({ version, dereference, rootDocument, resolvedRefMap, keepUrlRefs, componentRenamingConflicts = 'warn', useTitlesForComponentNames = false, }) {
|
|
96
103
|
let components;
|
|
97
104
|
let rootLocation;
|
|
105
|
+
// Location of the schema that first claimed each title-based component name, used for a collision's `from`.
|
|
106
|
+
const titleNameLocations = new Map();
|
|
107
|
+
const schemaComponentType = mapTypeToComponent('Schema', version);
|
|
98
108
|
const visitor = {
|
|
99
109
|
ref: {
|
|
100
110
|
leave(node, ctx, resolved) {
|
|
@@ -172,7 +182,7 @@ export function makeBundleVisitor({ version, dereference, rootDocument, resolved
|
|
|
172
182
|
},
|
|
173
183
|
};
|
|
174
184
|
if (version === 'oas3') {
|
|
175
|
-
const componentType =
|
|
185
|
+
const componentType = schemaComponentType;
|
|
176
186
|
visitor.Discriminator = {
|
|
177
187
|
leave(discriminator, ctx) {
|
|
178
188
|
if (typeof discriminator.defaultMapping !== 'string' ||
|
|
@@ -236,16 +246,59 @@ export function makeBundleVisitor({ version, dereference, rootDocument, resolved
|
|
|
236
246
|
}
|
|
237
247
|
return dequal(node, target.node);
|
|
238
248
|
}
|
|
239
|
-
function
|
|
240
|
-
const
|
|
241
|
-
|
|
242
|
-
let name = pointerBaseName(pointer) || refBaseName(fileRef);
|
|
243
|
-
const prevName = name;
|
|
249
|
+
function componentNameFromBasename(target, componentsGroup, ctx) {
|
|
250
|
+
const prevName = pointerBaseName(target.location.pointer) || refBaseName(target.location.source.absoluteRef);
|
|
251
|
+
let name = prevName;
|
|
244
252
|
let serialId = 2;
|
|
245
253
|
while (componentsGroup[name] && !isEqualOrEqualRef(componentsGroup[name], target, ctx)) {
|
|
246
254
|
name = `${prevName}-${serialId}`;
|
|
247
255
|
serialId++;
|
|
248
256
|
}
|
|
257
|
+
return { name, prevName };
|
|
258
|
+
}
|
|
259
|
+
function componentNameFromTitle(target, componentsGroup, ctx) {
|
|
260
|
+
const title = getTitle(target.node);
|
|
261
|
+
const key = toPascalCase(title);
|
|
262
|
+
const titleLocation = target.location.child('title');
|
|
263
|
+
if (title === '') {
|
|
264
|
+
return fallbackName(target, componentsGroup, ctx, {
|
|
265
|
+
message: 'Schema must define a `title` to build a component name.',
|
|
266
|
+
location: target.location,
|
|
267
|
+
});
|
|
268
|
+
}
|
|
269
|
+
if (!new RegExp(COMPONENT_NAME_PATTERN).test(key)) {
|
|
270
|
+
return fallbackName(target, componentsGroup, ctx, {
|
|
271
|
+
message: `Title "${title}" can't be turned into a component name. ` +
|
|
272
|
+
`Use only letters, digits, \`.\`, \`-\`, \`_\`, and spaces.`,
|
|
273
|
+
location: titleLocation,
|
|
274
|
+
});
|
|
275
|
+
}
|
|
276
|
+
const existing = componentsGroup[key];
|
|
277
|
+
if (existing && !isEqualOrEqualRef(existing, target, ctx)) {
|
|
278
|
+
return fallbackName(target, componentsGroup, ctx, {
|
|
279
|
+
message: `Title "${title}" maps to component name \`${key}\`, ` +
|
|
280
|
+
`already used by another schema. Rename one of the titles.`,
|
|
281
|
+
location: titleLocation,
|
|
282
|
+
from: titleNameLocations.get(key),
|
|
283
|
+
});
|
|
284
|
+
}
|
|
285
|
+
titleNameLocations.set(key, titleLocation);
|
|
286
|
+
return key;
|
|
287
|
+
}
|
|
288
|
+
function fallbackName(target, componentsGroup, ctx, problem) {
|
|
289
|
+
const name = componentNameFromBasename(target, componentsGroup, ctx).name;
|
|
290
|
+
if (!componentsGroup[name]) {
|
|
291
|
+
ctx.report({ ...problem, forceSeverity: 'error' });
|
|
292
|
+
titleNameLocations.set(name, target.location);
|
|
293
|
+
}
|
|
294
|
+
return name;
|
|
295
|
+
}
|
|
296
|
+
function getComponentName(target, componentType, ctx) {
|
|
297
|
+
const componentsGroup = components[componentType];
|
|
298
|
+
if (useTitlesForComponentNames && componentType === schemaComponentType) {
|
|
299
|
+
return componentNameFromTitle(target, componentsGroup, ctx);
|
|
300
|
+
}
|
|
301
|
+
const { name, prevName } = componentNameFromBasename(target, componentsGroup, ctx);
|
|
249
302
|
if (!componentsGroup[name] && prevName !== name) {
|
|
250
303
|
ctx.report({
|
|
251
304
|
message: `Two schemas are referenced with the same name but different content. Renamed ${prevName} to ${name}.`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-visitor.js","sourceRoot":"","sources":["../../src/bundle/bundle-visitor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bundle-visitor.js","sourceRoot":"","sources":["../../src/bundle/bundle-visitor.ts"],"names":[],"mappings":"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"}
|
package/lib/lint.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,YAAY,EAA2C,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAIhD,OAAO,EAAE,YAAY,EAA2C,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIpG,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAalD,OAAO,EAAgB,KAAK,eAAe,EAAoB,MAAM,WAAW,CAAC;AASjF,wBAAsB,IAAI,CAAC,IAAI,EAAE;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,SAAS,CAAC;CAC7B,oDAUA;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,YAAY,CAAC;CACpC,oDASA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,mBAAmB,EAAE,YAAY,CAAC;CACnC,oDAsDA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAChD,oDAgEA"}
|
package/lib/lint.js
CHANGED
|
@@ -3,6 +3,7 @@ import { initRules } from './config/rules.js';
|
|
|
3
3
|
import { detectSpec, getMajorSpecVersion } from './detect-spec.js';
|
|
4
4
|
import { getTypes } from './oas-types.js';
|
|
5
5
|
import { BaseResolver, resolveDocument, makeDocumentFromString } from './resolve.js';
|
|
6
|
+
import { releaseAjvInstance } from './rules/ajv.js';
|
|
6
7
|
import { NoUnresolvedRefs } from './rules/common/no-unresolved-refs.js';
|
|
7
8
|
import { Struct } from './rules/common/struct.js';
|
|
8
9
|
import { normalizeTypes } from './types/index.js';
|
|
@@ -35,6 +36,7 @@ export async function lintFromString(opts) {
|
|
|
35
36
|
});
|
|
36
37
|
}
|
|
37
38
|
export async function lintDocument(opts) {
|
|
39
|
+
releaseAjvInstance(); // FIXME: preprocessors can modify nodes which are then cached to ajv-instance by absolute path
|
|
38
40
|
const { document, customTypes, externalRefResolver, config } = opts;
|
|
39
41
|
const specVersion = detectSpec(document.parsed);
|
|
40
42
|
const specMajorVersion = getMajorSpecVersion(specVersion);
|
package/lib/lint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"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"}
|
package/lib/oas-types.d.ts
CHANGED
|
@@ -2,6 +2,8 @@ import type { BuiltInAsync2RuleId, BuiltInAsync3RuleId, BuiltInArazzo1RuleId, Bu
|
|
|
2
2
|
import type { Oas3Rule, Oas3Decorator, Oas2Rule, Oas2Decorator, Async2Decorator, Async2Rule, Async3Decorator, Async3Rule, Arazzo1Decorator, Arazzo1Rule, Overlay1Decorator, Overlay1Rule, OpenRpc1Decorator, OpenRpc1Rule } from './visitors.js';
|
|
3
3
|
export declare const specVersions: readonly ["oas2", "oas3_0", "oas3_1", "oas3_2", "async2", "async3", "arazzo1", "overlay1", "openrpc1"];
|
|
4
4
|
export type SpecVersion = (typeof specVersions)[number];
|
|
5
|
+
/** Characters allowed in a Components Object key by the OpenAPI and AsyncAPI specs. */
|
|
6
|
+
export declare const COMPONENT_NAME_PATTERN = "^[a-zA-Z0-9\\.\\-_]+$";
|
|
5
7
|
export type SpecMajorVersion = 'oas2' | 'oas3' | 'async2' | 'async3' | 'arazzo1' | 'overlay1' | 'openrpc1';
|
|
6
8
|
export type RuleMap<Key extends string, RuleConfig, T> = Record<T extends 'built-in' ? Key : string, RuleConfig>;
|
|
7
9
|
export type Oas3RuleSet<T = undefined> = RuleMap<BuiltInOAS3RuleId | BuiltInCommonRuleId | 'assertions', Oas3Rule, T>;
|
package/lib/oas-types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oas-types.d.ts","sourceRoot":"","sources":["../src/oas-types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oas-types.d.ts","sourceRoot":"","sources":["../src/oas-types.ts"],"names":[],"mappings":"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"}
|
package/lib/oas-types.js
CHANGED
|
@@ -18,6 +18,8 @@ export const specVersions = [
|
|
|
18
18
|
'overlay1',
|
|
19
19
|
'openrpc1',
|
|
20
20
|
];
|
|
21
|
+
/** Characters allowed in a Components Object key by the OpenAPI and AsyncAPI specs. */
|
|
22
|
+
export const COMPONENT_NAME_PATTERN = '^[a-zA-Z0-9\\.\\-_]+$';
|
|
21
23
|
const typesMap = {
|
|
22
24
|
oas2: Oas2Types,
|
|
23
25
|
oas3_0: Oas3Types,
|
package/lib/oas-types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oas-types.js","sourceRoot":"","sources":["../src/oas-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA8BnD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;CACF,CAAC;
|
|
1
|
+
{"version":3,"file":"oas-types.js","sourceRoot":"","sources":["../src/oas-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA8BnD,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,MAAM;IACN,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;CACF,CAAC;AAGX,uFAAuF;AACvF,MAAM,CAAC,MAAM,sBAAsB,GAAG,uBAAuB,CAAC;AAW9D,MAAM,QAAQ,GAAG;IACf,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,WAAW;IACnB,MAAM,EAAE,cAAc;IACtB,MAAM,EAAE,cAAc;IACtB,OAAO,EAAE,YAAY;IACrB,QAAQ,EAAE,aAAa;IACvB,QAAQ,EAAE,YAAY;CACvB,CAAC;AA0DF,MAAM,UAAU,QAAQ,CAAC,IAAiB;IACxC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC"}
|
package/lib/rules/ajv.d.ts
CHANGED
|
@@ -3,22 +3,18 @@ import type { SpecVersion } from '../oas-types.js';
|
|
|
3
3
|
import { type Location } from '../ref-utils.js';
|
|
4
4
|
import type { Oas3Schema, Oas3_1Schema } from '../typings/openapi.js';
|
|
5
5
|
import type { ResolveFn } from '../walk.js';
|
|
6
|
-
export declare
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
};
|
|
21
|
-
private getAjv;
|
|
22
|
-
private getValidator;
|
|
23
|
-
}
|
|
6
|
+
export declare function releaseAjvInstance(): void;
|
|
7
|
+
export declare function validateJsonSchema(data: unknown, schema: Oas3Schema | Oas3_1Schema, options: {
|
|
8
|
+
schemaLoc: Location;
|
|
9
|
+
instancePath: string;
|
|
10
|
+
resolve: ResolveFn;
|
|
11
|
+
allowAdditionalProperties: boolean;
|
|
12
|
+
ajvContext?: AjvContext;
|
|
13
|
+
specVersion: SpecVersion;
|
|
14
|
+
}): {
|
|
15
|
+
valid: boolean;
|
|
16
|
+
errors: (ErrorObject & {
|
|
17
|
+
suggest?: string[];
|
|
18
|
+
})[];
|
|
19
|
+
};
|
|
24
20
|
//# sourceMappingURL=ajv.d.ts.map
|
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,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,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,MAAM,YAAY,CAAC;
|
|
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,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACnD,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,MAAM,YAAY,CAAC;AAM5C,wBAAgB,kBAAkB,SAGjC;AAwED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,OAAO,EACb,MAAM,EAAE,UAAU,GAAG,YAAY,EACjC,OAAO,EAAE;IACP,SAAS,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,yBAAyB,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;CAC1B,GACA;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,CAAC,WAAW,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC,EAAE,CAAA;CAAE,CAmDtE"}
|
package/lib/rules/ajv.js
CHANGED
|
@@ -2,6 +2,11 @@ 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
4
|
import { escapePointerFragment } from '../ref-utils.js';
|
|
5
|
+
const ajvInstances = {};
|
|
6
|
+
export function releaseAjvInstance() {
|
|
7
|
+
ajvInstances['2020'] = undefined;
|
|
8
|
+
ajvInstances['draft4'] = undefined;
|
|
9
|
+
}
|
|
5
10
|
function getSchemaIdKey(dialect) {
|
|
6
11
|
return dialect === 'draft4' ? 'id' : '$id';
|
|
7
12
|
}
|
|
@@ -10,96 +15,93 @@ function getDialectBySpecVersion(specVersion) {
|
|
|
10
15
|
return 'draft4';
|
|
11
16
|
return '2020';
|
|
12
17
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
18
|
+
function getAjv(resolve, dialect) {
|
|
19
|
+
if (!ajvInstances[dialect]) {
|
|
20
|
+
const schemaIdKey = getSchemaIdKey(dialect);
|
|
21
|
+
const options = {
|
|
22
|
+
schemaId: schemaIdKey,
|
|
23
|
+
meta: true,
|
|
24
|
+
allErrors: true,
|
|
25
|
+
strictSchema: false,
|
|
26
|
+
inlineRefs: false,
|
|
27
|
+
validateSchema: false,
|
|
28
|
+
discriminator: true,
|
|
29
|
+
allowUnionTypes: true,
|
|
30
|
+
validateFormats: true,
|
|
31
|
+
passContext: true,
|
|
32
|
+
loadSchemaSync(base, $ref, $id) {
|
|
33
|
+
const decodedBase = decodeURI(base.split('#')[0]);
|
|
34
|
+
const resolvedRef = resolve({ $ref }, decodedBase);
|
|
35
|
+
if (!resolvedRef || !resolvedRef.location)
|
|
36
|
+
return false;
|
|
37
|
+
return {
|
|
38
|
+
[schemaIdKey]: encodeURI(resolvedRef.location.source.absoluteRef) + '#' + $id,
|
|
39
|
+
...resolvedRef.node,
|
|
40
|
+
};
|
|
41
|
+
},
|
|
42
|
+
logger: false,
|
|
32
43
|
};
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
if (suggest) {
|
|
37
|
-
message += ` ${suggest.map((e) => `"${e}"`).join(', ')}`;
|
|
38
|
-
}
|
|
39
|
-
if (error.keyword === 'type') {
|
|
40
|
-
message = `type ${message}`;
|
|
41
|
-
}
|
|
42
|
-
const relativePath = error.instancePath.substring(instancePath.length + 1);
|
|
43
|
-
const propName = relativePath.substring(relativePath.lastIndexOf('/') + 1);
|
|
44
|
-
if (propName) {
|
|
45
|
-
message = `\`${propName}\` property ${message}`;
|
|
46
|
-
}
|
|
47
|
-
if (error.keyword === 'additionalProperties' || error.keyword === 'unevaluatedProperties') {
|
|
48
|
-
const property = error.params.additionalProperty || error.params.unevaluatedProperty;
|
|
49
|
-
message = `${message} \`${property}\``;
|
|
50
|
-
error.instancePath += '/' + escapePointerFragment(property);
|
|
51
|
-
}
|
|
52
|
-
return {
|
|
53
|
-
...error,
|
|
54
|
-
message,
|
|
55
|
-
suggest,
|
|
56
|
-
};
|
|
57
|
-
}
|
|
44
|
+
ajvInstances[dialect] =
|
|
45
|
+
dialect === '2020' ? new Ajv2020(options) : new AjvDraft4(options);
|
|
46
|
+
addFormats(ajvInstances[dialect]);
|
|
58
47
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
validateFormats: true,
|
|
72
|
-
passContext: true,
|
|
73
|
-
loadSchemaSync(base, $ref, $id) {
|
|
74
|
-
const decodedBase = decodeURI(base.split('#')[0]);
|
|
75
|
-
const resolvedRef = resolve({ $ref }, decodedBase);
|
|
76
|
-
if (!resolvedRef || !resolvedRef.location)
|
|
77
|
-
return false;
|
|
78
|
-
return {
|
|
79
|
-
[schemaIdKey]: encodeURI(resolvedRef.location.source.absoluteRef) + '#' + $id,
|
|
80
|
-
...resolvedRef.node,
|
|
81
|
-
};
|
|
82
|
-
},
|
|
83
|
-
logger: false,
|
|
84
|
-
};
|
|
85
|
-
this.instances[dialect] =
|
|
86
|
-
dialect === '2020' ? new Ajv2020(options) : new AjvDraft4(options);
|
|
87
|
-
addFormats(this.instances[dialect]);
|
|
88
|
-
}
|
|
89
|
-
return this.instances[dialect];
|
|
48
|
+
return ajvInstances[dialect];
|
|
49
|
+
}
|
|
50
|
+
function getAjvValidator(schema, loc, resolve, allowAdditionalProperties, dialect) {
|
|
51
|
+
const ajv = getAjv(resolve, dialect);
|
|
52
|
+
const $id = encodeURI(loc.absolutePointer);
|
|
53
|
+
const schemaIdKey = getSchemaIdKey(dialect);
|
|
54
|
+
if (!ajv.getSchema($id)) {
|
|
55
|
+
ajv.setDefaultUnevaluatedProperties(allowAdditionalProperties);
|
|
56
|
+
ajv.addSchema({
|
|
57
|
+
[schemaIdKey]: $id,
|
|
58
|
+
...schema,
|
|
59
|
+
}, $id);
|
|
90
60
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
61
|
+
return ajv.getSchema($id);
|
|
62
|
+
}
|
|
63
|
+
export function validateJsonSchema(data, schema, options) {
|
|
64
|
+
const { schemaLoc, instancePath, resolve, allowAdditionalProperties, ajvContext, specVersion } = options;
|
|
65
|
+
const dialect = getDialectBySpecVersion(specVersion);
|
|
66
|
+
const validate = getAjvValidator(schema, schemaLoc, resolve, allowAdditionalProperties, dialect);
|
|
67
|
+
if (!validate)
|
|
68
|
+
return { valid: true, errors: [] }; // unresolved refs are reported
|
|
69
|
+
const dataCxt = {
|
|
70
|
+
instancePath,
|
|
71
|
+
parentData: { fake: {} },
|
|
72
|
+
parentDataProperty: 'fake',
|
|
73
|
+
rootData: {},
|
|
74
|
+
dynamicAnchors: {},
|
|
75
|
+
};
|
|
76
|
+
const valid = validate.call(ajvContext ?? {}, data, dataCxt);
|
|
77
|
+
return {
|
|
78
|
+
valid: !!valid,
|
|
79
|
+
errors: (validate.errors || []).map(beatifyErrorMessage),
|
|
80
|
+
};
|
|
81
|
+
function beatifyErrorMessage(error) {
|
|
82
|
+
let message = error.message;
|
|
83
|
+
const suggest = error.keyword === 'enum' ? error.params.allowedValues : undefined;
|
|
84
|
+
if (suggest) {
|
|
85
|
+
message += ` ${suggest.map((e) => `"${e}"`).join(', ')}`;
|
|
86
|
+
}
|
|
87
|
+
if (error.keyword === 'type') {
|
|
88
|
+
message = `type ${message}`;
|
|
89
|
+
}
|
|
90
|
+
const relativePath = error.instancePath.substring(instancePath.length + 1);
|
|
91
|
+
const propName = relativePath.substring(relativePath.lastIndexOf('/') + 1);
|
|
92
|
+
if (propName) {
|
|
93
|
+
message = `\`${propName}\` property ${message}`;
|
|
101
94
|
}
|
|
102
|
-
|
|
95
|
+
if (error.keyword === 'additionalProperties' || error.keyword === 'unevaluatedProperties') {
|
|
96
|
+
const property = error.params.additionalProperty || error.params.unevaluatedProperty;
|
|
97
|
+
message = `${message} \`${property}\``;
|
|
98
|
+
error.instancePath += '/' + escapePointerFragment(property);
|
|
99
|
+
}
|
|
100
|
+
return {
|
|
101
|
+
...error,
|
|
102
|
+
message,
|
|
103
|
+
suggest,
|
|
104
|
+
};
|
|
103
105
|
}
|
|
104
106
|
}
|
|
105
107
|
//# 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;AAGrC,OAAO,EAAE,qBAAqB,EAAiB,MAAM,iBAAiB,CAAC;AAMvE,SAAS,cAAc,CAAC,OAAmB;IACzC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7C,CAAC;AAED,SAAS,uBAAuB,CAAC,WAAwB;IACvD,IAAI,WAAW,KAAK,MAAM,IAAI,WAAW,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IACxE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"ajv.js","sourceRoot":"","sources":["../../src/rules/ajv.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-parameter-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-parameter-examples.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"no-invalid-parameter-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-parameter-examples.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI5D,eAAO,MAAM,0BAA0B,EAAE,QAAQ,GAAG,QAsCnD,CAAC"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { isDefined } from '../../utils/is-defined.js';
|
|
2
2
|
import { isPlainObject } from '../../utils/is-plain-object.js';
|
|
3
|
-
import { AjvValidator } from '../ajv.js';
|
|
4
3
|
import { validateExample } from '../utils.js';
|
|
5
4
|
export const NoInvalidParameterExamples = (opts) => {
|
|
6
|
-
const validator = new AjvValidator();
|
|
7
5
|
return {
|
|
8
6
|
Parameter: {
|
|
9
7
|
leave(parameter, ctx) {
|
|
@@ -14,7 +12,6 @@ export const NoInvalidParameterExamples = (opts) => {
|
|
|
14
12
|
options: {
|
|
15
13
|
location: ctx.location.child('example'),
|
|
16
14
|
ctx,
|
|
17
|
-
validator,
|
|
18
15
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
19
16
|
ajvContext: { apiContext: 'request' },
|
|
20
17
|
},
|
|
@@ -30,7 +27,6 @@ export const NoInvalidParameterExamples = (opts) => {
|
|
|
30
27
|
options: {
|
|
31
28
|
location: ctx.location.child(['examples', key]),
|
|
32
29
|
ctx,
|
|
33
|
-
validator,
|
|
34
30
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
35
31
|
ajvContext: { apiContext: 'request' },
|
|
36
32
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-parameter-examples.js","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-parameter-examples.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"no-invalid-parameter-examples.js","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-parameter-examples.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,0BAA0B,GAAwB,CAAC,IAAI,EAAE,EAAE;IACtE,OAAO;QACL,SAAS,EAAE;YACT,KAAK,CAAC,SAAwB,EAAE,GAAgB;gBAC9C,IAAI,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;oBACjC,eAAe,CAAC;wBACd,OAAO,EAAE,SAAS,CAAC,OAAO;wBAC1B,MAAM,EAAE,SAAS,CAAC,MAAO;wBACzB,OAAO,EAAE;4BACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;4BACvC,GAAG;4BACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;4BAC3D,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE;yBACtC;wBACD,SAAS,EAAE,sEAAsE;qBAClF,CAAC,CAAC;gBACL,CAAC;gBAED,IAAI,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACtC,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAChE,IAAI,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;4BACjD,eAAe,CAAC;gCACd,OAAO,EAAE,OAAO,CAAC,KAAK;gCACtB,MAAM,EAAE,SAAS,CAAC,MAAO;gCACzB,OAAO,EAAE;oCACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;oCAC/C,GAAG;oCACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;oCAC3D,UAAU,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE;iCACtC;gCACD,SAAS,EAAE,sEAAsE;6BAClF,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-schema-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-schema-examples.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"no-invalid-schema-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-schema-examples.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAI5D,eAAO,MAAM,uBAAuB,EAAE,QAAQ,GAAG,QA6ChD,CAAC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { isDefined } from '../../utils/is-defined.js';
|
|
2
|
-
import { AjvValidator } from '../ajv.js';
|
|
3
2
|
import { validateExample } from '../utils.js';
|
|
4
3
|
export const NoInvalidSchemaExamples = (opts) => {
|
|
5
|
-
const validator = new AjvValidator();
|
|
6
4
|
return {
|
|
7
5
|
Schema: {
|
|
8
6
|
leave(schema, ctx) {
|
|
@@ -15,7 +13,6 @@ export const NoInvalidSchemaExamples = (opts) => {
|
|
|
15
13
|
options: {
|
|
16
14
|
location: ctx.location.child(['examples', examples.indexOf(example)]),
|
|
17
15
|
ctx,
|
|
18
|
-
validator,
|
|
19
16
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
20
17
|
},
|
|
21
18
|
reference: 'https://redocly.com/docs/cli/rules/oas/no-invalid-schema-examples',
|
|
@@ -35,7 +32,6 @@ export const NoInvalidSchemaExamples = (opts) => {
|
|
|
35
32
|
options: {
|
|
36
33
|
location: ctx.location.child('example'),
|
|
37
34
|
ctx,
|
|
38
|
-
validator,
|
|
39
35
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
40
36
|
},
|
|
41
37
|
reference: 'https://redocly.com/docs/cli/rules/oas/no-invalid-schema-examples',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-schema-examples.js","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-schema-examples.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"no-invalid-schema-examples.js","sourceRoot":"","sources":["../../../src/rules/common/no-invalid-schema-examples.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,uBAAuB,GAAwB,CAAC,IAAI,EAAE,EAAE;IACnE,OAAO;QACL,MAAM,EAAE;YACN,KAAK,CAAC,MAAiC,EAAE,GAAgB;gBACvD,MAAM,QAAQ,GAAI,MAAuB,CAAC,QAAQ,CAAC;gBAEnD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;wBAC/B,eAAe,CAAC;4BACd,OAAO;4BACP,MAAM;4BACN,OAAO,EAAE;gCACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;gCACrE,GAAG;gCACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;6BAC5D;4BACD,SAAS,EAAE,mEAAmE;yBAC/E,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBAED,IAAI,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC9B,mCAAmC;oBACnC,IACG,MAAqB,CAAC,QAAQ,KAAK,IAAI;wBACxC,MAAM,CAAC,OAAO,KAAK,IAAI;wBACvB,MAAM,CAAC,IAAI,KAAK,SAAS,EACzB,CAAC;wBACD,OAAO;oBACT,CAAC;oBAED,eAAe,CAAC;wBACd,OAAO,EAAE,MAAM,CAAC,OAAO;wBACvB,MAAM;wBACN,OAAO,EAAE;4BACP,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;4BACvC,GAAG;4BACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;yBAC5D;wBACD,SAAS,EAAE,mEAAmE;qBAC/E,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-media-type-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/oas3/no-invalid-media-type-examples.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"no-invalid-media-type-examples.d.ts","sourceRoot":"","sources":["../../../src/rules/oas3/no-invalid-media-type-examples.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAIlD,eAAO,MAAM,oBAAoB,EAAE,QAoElC,CAAC"}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { isRef } from '../../ref-utils.js';
|
|
2
2
|
import { isDefined } from '../../utils/is-defined.js';
|
|
3
3
|
import { isPlainObject } from '../../utils/is-plain-object.js';
|
|
4
|
-
import { AjvValidator } from '../ajv.js';
|
|
5
4
|
import { validateExample } from '../utils.js';
|
|
6
5
|
export const ValidContentExamples = (opts) => {
|
|
7
|
-
const validator = new AjvValidator();
|
|
8
6
|
const skip = (mediaType) => {
|
|
9
7
|
return mediaType.schema === undefined;
|
|
10
8
|
};
|
|
@@ -35,7 +33,6 @@ export const ValidContentExamples = (opts) => {
|
|
|
35
33
|
options: {
|
|
36
34
|
location,
|
|
37
35
|
ctx,
|
|
38
|
-
validator,
|
|
39
36
|
allowAdditionalProperties: !!opts.allowAdditionalProperties,
|
|
40
37
|
ajvContext: context,
|
|
41
38
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"no-invalid-media-type-examples.js","sourceRoot":"","sources":["../../../src/rules/oas3/no-invalid-media-type-examples.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"no-invalid-media-type-examples.js","sourceRoot":"","sources":["../../../src/rules/oas3/no-invalid-media-type-examples.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAiB,MAAM,oBAAoB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,CAAC,MAAM,oBAAoB,GAAa,CAAC,IAAI,EAAE,EAAE;IACrD,MAAM,IAAI,GAAG,CAAC,SAAwB,EAAE,EAAE;QACxC,OAAO,SAAS,CAAC,MAAM,KAAK,SAAS,CAAC;IACxC,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,CAAC,OAAmB,EAAE,EAAE,CAAC,CAAC,SAAwB,EAAE,GAAgB,EAAE,EAAE;QACpF,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QAElC,IAAI,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,yBAAyB,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,CAAC;aAAM,IAAI,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7C,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC1D,yBAAyB,CACvB,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAC/B,QAAQ,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,EAClD,IAAI,CACL,CAAC;YACJ,CAAC;QACH,CAAC;QAED,SAAS,yBAAyB,CAChC,OAA0B,EAC1B,QAAkB,EAClB,UAAoB;YAEpB,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnB,MAAM,QAAQ,GAAG,OAAO,CAAc,OAAO,CAAC,CAAC;gBAC/C,IAAI,CAAC,QAAQ,CAAC,QAAQ;oBAAE,OAAO;gBAC/B,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC7E,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC;YAC1B,CAAC;YACD,IAAI,UAAU,IAAI,OAAO,OAAO,EAAE,KAAK,KAAK,WAAW,EAAE,CAAC;gBACxD,OAAO;YACT,CAAC;YACD,eAAe,CAAC;gBACd,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO;gBAC7C,MAAM,EAAE,SAAS,CAAC,MAAO;gBACzB,OAAO,EAAE;oBACP,QAAQ;oBACR,GAAG;oBACH,yBAAyB,EAAE,CAAC,CAAC,IAAI,CAAC,yBAAyB;oBAC3D,UAAU,EAAE,OAAO;iBACpB;gBACD,SAAS,EAAE,uEAAuE;aACnF,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,OAAO;QACL,SAAS,EAAE;YACT,SAAS,EAAE;gBACT,IAAI;gBACJ,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;aACxC;SACF;QACD,WAAW,EAAE;YACX,SAAS,EAAE;gBACT,IAAI;gBACJ,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;aACxC;SACF;QACD,QAAQ,EAAE;YACR,SAAS,EAAE;gBACT,IAAI;gBACJ,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;aACzC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spec-components-invalid-map-name.d.ts","sourceRoot":"","sources":["../../../src/rules/oas3/spec-components-invalid-map-name.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spec-components-invalid-map-name.d.ts","sourceRoot":"","sources":["../../../src/rules/oas3/spec-components-invalid-map-name.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGlD,eAAO,MAAM,4BAA4B,EAAE,QA+D1C,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { COMPONENT_NAME_PATTERN } from '../../oas-types.js';
|
|
1
2
|
export const SpecComponentsInvalidMapName = () => {
|
|
2
|
-
const KEYS_REGEX = '^[a-zA-Z0-9\\.\\-_]+$';
|
|
3
3
|
function validateKey(key, report, location, component) {
|
|
4
|
-
if (!new RegExp(
|
|
4
|
+
if (!new RegExp(COMPONENT_NAME_PATTERN).test(key)) {
|
|
5
5
|
report({
|
|
6
|
-
message: `The map key in ${component} "${key}" does not match the regular expression "${
|
|
6
|
+
message: `The map key in ${component} "${key}" does not match the regular expression "${COMPONENT_NAME_PATTERN}"`,
|
|
7
7
|
location: location.key(),
|
|
8
8
|
reference: 'https://redocly.com/docs/cli/rules/oas/spec-components-invalid-map-name',
|
|
9
9
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spec-components-invalid-map-name.js","sourceRoot":"","sources":["../../../src/rules/oas3/spec-components-invalid-map-name.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"spec-components-invalid-map-name.js","sourceRoot":"","sources":["../../../src/rules/oas3/spec-components-invalid-map-name.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAK5D,MAAM,CAAC,MAAM,4BAA4B,GAAa,GAAG,EAAE;IACzD,SAAS,WAAW,CAClB,GAAoB,EACpB,MAAkC,EAClC,QAAkB,EAClB,SAAiB;QAEjB,IAAI,CAAC,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,GAAa,CAAC,EAAE,CAAC;YAC5D,MAAM,CAAC;gBACL,OAAO,EAAE,kBAAkB,SAAS,KAAK,GAAG,4CAA4C,sBAAsB,GAAG;gBACjH,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE;gBACxB,SAAS,EAAE,yEAAyE;aACrF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO;QACL,YAAY,EAAE;YACZ,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBAClD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAChD,CAAC;SACF;QACD,eAAe,EAAE;YACf,SAAS,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBACrD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;YACnD,CAAC;SACF;QACD,cAAc,EAAE;YACd,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBACpD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;YAClD,CAAC;SACF;QACD,aAAa,EAAE;YACb,OAAO,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBACnD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;YACjD,CAAC;SACF;QACD,kBAAkB,EAAE;YAClB,WAAW,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBACvD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;YACtD,CAAC;SACF;QACD,YAAY,EAAE;YACZ,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBAClD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;YAChD,CAAC;SACF;QACD,oBAAoB,EAAE;YACpB,cAAc,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBAC1D,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YACxD,CAAC;SACF;QACD,UAAU,EAAE;YACV,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBAChD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC9C,CAAC;SACF;QACD,cAAc,EAAE;YACd,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAe;gBACpD,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;YAClD,CAAC;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
|
package/lib/rules/utils.d.ts
CHANGED
|
@@ -3,7 +3,6 @@ import { Location } from '../ref-utils.js';
|
|
|
3
3
|
import type { Oas3Schema, Oas3Tag, Oas3_2Tag, Oas3_1Schema, Referenced } from '../typings/openapi.js';
|
|
4
4
|
import type { Oas2Tag } from '../typings/swagger.js';
|
|
5
5
|
import type { NonUndefined, UserContext } from '../walk.js';
|
|
6
|
-
import type { AjvValidator } from './ajv.js';
|
|
7
6
|
export declare const resolveSchema: <T extends NonUndefined>(schemaOrRef: Referenced<T> | undefined, ctx: UserContext, resolveFrom?: string) => {
|
|
8
7
|
schema: T | undefined;
|
|
9
8
|
location: string | undefined;
|
|
@@ -39,7 +38,6 @@ export declare function validateExample({ example, schema, options, reference, }
|
|
|
39
38
|
options: {
|
|
40
39
|
location: Location;
|
|
41
40
|
ctx: UserContext;
|
|
42
|
-
validator: AjvValidator;
|
|
43
41
|
allowAdditionalProperties: boolean;
|
|
44
42
|
ajvContext?: AjvContext;
|
|
45
43
|
};
|
package/lib/rules/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvE,OAAO,EAAS,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EACV,UAAU,EACV,OAAO,EACP,SAAS,EACT,YAAY,EACZ,UAAU,EACX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/rules/utils.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { default as levenshtein } from 'js-levenshtein';
|
|
2
2
|
import { isRef, Location } from '../ref-utils.js';
|
|
3
3
|
import { isPlainObject } from '../utils/is-plain-object.js';
|
|
4
|
+
import { validateJsonSchema } from './ajv.js';
|
|
4
5
|
export const resolveSchema = (schemaOrRef, ctx, resolveFrom) => {
|
|
5
6
|
if (isRef(schemaOrRef)) {
|
|
6
7
|
const resolved = ctx.resolve(schemaOrRef, resolveFrom);
|
|
@@ -116,10 +117,10 @@ export function getSuggest(given, variants) {
|
|
|
116
117
|
return distances.map((d) => d.variant);
|
|
117
118
|
}
|
|
118
119
|
export function validateExample({ example, schema, options, reference, }) {
|
|
119
|
-
const { location, ctx,
|
|
120
|
+
const { location, ctx, allowAdditionalProperties, ajvContext } = options;
|
|
120
121
|
const { resolve, location: parentLocation, report, specVersion } = ctx;
|
|
121
122
|
try {
|
|
122
|
-
const { valid, errors } =
|
|
123
|
+
const { valid, errors } = validateJsonSchema(example, schema, {
|
|
123
124
|
schemaLoc: parentLocation.child('schema'),
|
|
124
125
|
instancePath: location.pointer,
|
|
125
126
|
resolve,
|
package/lib/rules/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAExD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AASlD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/rules/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"to-pascal-case.d.ts","sourceRoot":"","sources":["../../src/utils/to-pascal-case.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAMlD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"to-pascal-case.js","sourceRoot":"","sources":["../../src/utils/to-pascal-case.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,OAAO,KAAK;SACT,IAAI,EAAE;SACN,KAAK,CAAC,KAAK,CAAC;SACZ,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;SACnE,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC"}
|