@redocly/openapi-core 0.0.0-snapshot.1781166677 → 0.0.0-snapshot.1781184257
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 +0 -2
- package/lib/bundle/bundle-document.d.ts.map +1 -1
- package/lib/bundle/bundle-document.js +1 -2
- package/lib/bundle/bundle-document.js.map +1 -1
- package/lib/bundle/bundle-visitor.d.ts +1 -2
- package/lib/bundle/bundle-visitor.d.ts.map +1 -1
- package/lib/bundle/bundle-visitor.js +11 -71
- package/lib/bundle/bundle-visitor.js.map +1 -1
- package/lib/oas-types.d.ts +0 -2
- package/lib/oas-types.d.ts.map +1 -1
- package/lib/oas-types.js +0 -2
- package/lib/oas-types.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/package.json +5 -5
- package/lib/utils/to-pascal-case.d.ts +0 -2
- package/lib/utils/to-pascal-case.d.ts.map +0 -1
- package/lib/utils/to-pascal-case.js +0 -8
- package/lib/utils/to-pascal-case.js.map +0 -1
|
@@ -11,7 +11,6 @@ export type CoreBundleOptions = {
|
|
|
11
11
|
removeUnusedComponents?: boolean;
|
|
12
12
|
keepUrlRefs?: boolean;
|
|
13
13
|
componentRenamingConflicts?: RuleSeverity;
|
|
14
|
-
useTitlesForComponentNames?: boolean;
|
|
15
14
|
};
|
|
16
15
|
export type BundleResult = {
|
|
17
16
|
bundle: Document;
|
|
@@ -30,6 +29,5 @@ export declare function bundleDocument(opts: {
|
|
|
30
29
|
removeUnusedComponents?: boolean;
|
|
31
30
|
keepUrlRefs?: boolean;
|
|
32
31
|
componentRenamingConflicts?: RuleSeverity;
|
|
33
|
-
useTitlesForComponentNames?: boolean;
|
|
34
32
|
}): Promise<BundleResult>;
|
|
35
33
|
//# 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;CAC3C,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;CAC3C,GAAG,OAAO,CAAC,YAAY,CAAC,CAoHxB"}
|
|
@@ -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,
|
|
11
|
+
const { document, config, types, externalRefResolver, dereference = false, removeUnusedComponents = false, keepUrlRefs = false, componentRenamingConflicts, } = opts;
|
|
12
12
|
const specVersion = detectSpec(document.parsed);
|
|
13
13
|
const specMajorVersion = getMajorSpecVersion(specVersion);
|
|
14
14
|
const rules = config.getRulesForSpecVersion(specMajorVersion);
|
|
@@ -53,7 +53,6 @@ export async function bundleDocument(opts) {
|
|
|
53
53
|
resolvedRefMap,
|
|
54
54
|
keepUrlRefs,
|
|
55
55
|
componentRenamingConflicts,
|
|
56
|
-
useTitlesForComponentNames,
|
|
57
56
|
}),
|
|
58
57
|
},
|
|
59
58
|
...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":"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"}
|
|
@@ -3,13 +3,12 @@ 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, }: {
|
|
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;
|
|
14
13
|
}): Oas3Visitor | Oas2Visitor;
|
|
15
14
|
//# 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,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAWxD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAKnE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGpE,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,GACpC,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;CAC3C,6BAoMA"}
|
|
@@ -1,11 +1,7 @@
|
|
|
1
|
-
import { COMPONENT_NAME_PATTERN } from '../oas-types.js';
|
|
2
1
|
import { isAbsoluteUrl, replaceRef, isExternalValue, isRef, pointerBaseName, refBaseName, isMappingRef, } from '../ref-utils.js';
|
|
3
2
|
import { reportUnresolvedRef } from '../rules/common/no-unresolved-refs.js';
|
|
4
3
|
import { dequal } from '../utils/dequal.js';
|
|
5
|
-
import { isPlainObject } from '../utils/is-plain-object.js';
|
|
6
|
-
import { isString } from '../utils/is-string.js';
|
|
7
4
|
import { makeRefId } from '../utils/make-ref-id.js';
|
|
8
|
-
import { toPascalCase } from '../utils/to-pascal-case.js';
|
|
9
5
|
export function mapTypeToComponent(typeName, version) {
|
|
10
6
|
switch (version) {
|
|
11
7
|
case 'oas3':
|
|
@@ -96,12 +92,9 @@ export function mapTypeToComponent(typeName, version) {
|
|
|
96
92
|
}
|
|
97
93
|
}
|
|
98
94
|
}
|
|
99
|
-
export function makeBundleVisitor({ version, dereference, rootDocument, resolvedRefMap, keepUrlRefs, componentRenamingConflicts = 'warn',
|
|
95
|
+
export function makeBundleVisitor({ version, dereference, rootDocument, resolvedRefMap, keepUrlRefs, componentRenamingConflicts = 'warn', }) {
|
|
100
96
|
let components;
|
|
101
97
|
let rootLocation;
|
|
102
|
-
// Component name -> location of the schema that first claimed it; powers a title collision's `from`.
|
|
103
|
-
const firstClaimByName = new Map();
|
|
104
|
-
const schemaComponentType = mapTypeToComponent('Schema', version);
|
|
105
98
|
const visitor = {
|
|
106
99
|
ref: {
|
|
107
100
|
leave(node, ctx, resolved) {
|
|
@@ -179,6 +172,7 @@ export function makeBundleVisitor({ version, dereference, rootDocument, resolved
|
|
|
179
172
|
},
|
|
180
173
|
};
|
|
181
174
|
if (version === 'oas3') {
|
|
175
|
+
const componentType = mapTypeToComponent('Schema', version);
|
|
182
176
|
visitor.Discriminator = {
|
|
183
177
|
leave(discriminator, ctx) {
|
|
184
178
|
if (typeof discriminator.defaultMapping !== 'string' ||
|
|
@@ -190,7 +184,7 @@ export function makeBundleVisitor({ version, dereference, rootDocument, resolved
|
|
|
190
184
|
reportUnresolvedRef(resolved, ctx.report, ctx.location.child('defaultMapping'));
|
|
191
185
|
return;
|
|
192
186
|
}
|
|
193
|
-
discriminator.defaultMapping = saveComponent(
|
|
187
|
+
discriminator.defaultMapping = saveComponent(componentType, resolved, ctx);
|
|
194
188
|
},
|
|
195
189
|
DiscriminatorMapping: {
|
|
196
190
|
leave(mapping, ctx) {
|
|
@@ -204,7 +198,7 @@ export function makeBundleVisitor({ version, dereference, rootDocument, resolved
|
|
|
204
198
|
reportUnresolvedRef(resolved, ctx.report, ctx.location.child(name));
|
|
205
199
|
return;
|
|
206
200
|
}
|
|
207
|
-
mapping[name] = saveComponent(
|
|
201
|
+
mapping[name] = saveComponent(componentType, resolved, ctx);
|
|
208
202
|
}
|
|
209
203
|
},
|
|
210
204
|
},
|
|
@@ -242,70 +236,16 @@ export function makeBundleVisitor({ version, dereference, rootDocument, resolved
|
|
|
242
236
|
}
|
|
243
237
|
return dequal(node, target.node);
|
|
244
238
|
}
|
|
245
|
-
function componentNameFromTitle(target, componentsGroup, ctx) {
|
|
246
|
-
const { node } = target;
|
|
247
|
-
const title = isPlainObject(node) && isString(node.title) ? node.title.trim() : '';
|
|
248
|
-
const key = toPascalCase(title);
|
|
249
|
-
const titleLocation = target.location.child('title');
|
|
250
|
-
if (title === '') {
|
|
251
|
-
return {
|
|
252
|
-
key,
|
|
253
|
-
problem: {
|
|
254
|
-
message: 'Schema must define a `title` to build a component name.',
|
|
255
|
-
location: target.location,
|
|
256
|
-
forceSeverity: 'error',
|
|
257
|
-
},
|
|
258
|
-
};
|
|
259
|
-
}
|
|
260
|
-
if (!new RegExp(COMPONENT_NAME_PATTERN).test(key)) {
|
|
261
|
-
return {
|
|
262
|
-
key,
|
|
263
|
-
problem: {
|
|
264
|
-
message: `Title "${title}" can't be turned into a component name. ` +
|
|
265
|
-
`Use only letters, digits, \`.\`, \`-\`, \`_\`, and spaces.`,
|
|
266
|
-
location: titleLocation,
|
|
267
|
-
forceSeverity: 'error',
|
|
268
|
-
},
|
|
269
|
-
};
|
|
270
|
-
}
|
|
271
|
-
if (componentsGroup[key] && !isEqualOrEqualRef(componentsGroup[key], target, ctx)) {
|
|
272
|
-
return {
|
|
273
|
-
key,
|
|
274
|
-
problem: {
|
|
275
|
-
message: `Title "${title}" maps to component name \`${key}\`, ` +
|
|
276
|
-
`already used by another schema. Rename one of the titles.`,
|
|
277
|
-
location: titleLocation,
|
|
278
|
-
from: firstClaimByName.get(key),
|
|
279
|
-
forceSeverity: componentRenamingConflicts,
|
|
280
|
-
},
|
|
281
|
-
};
|
|
282
|
-
}
|
|
283
|
-
return { key };
|
|
284
|
-
}
|
|
285
|
-
function componentNameFromBasename(target, componentsGroup, ctx) {
|
|
286
|
-
const prevName = pointerBaseName(target.location.pointer) || refBaseName(target.location.source.absoluteRef);
|
|
287
|
-
let name = prevName;
|
|
288
|
-
for (let serialId = 2; componentsGroup[name] && !isEqualOrEqualRef(componentsGroup[name], target, ctx); serialId++) {
|
|
289
|
-
name = `${prevName}-${serialId}`;
|
|
290
|
-
}
|
|
291
|
-
return { name, prevName };
|
|
292
|
-
}
|
|
293
239
|
function getComponentName(target, componentType, ctx) {
|
|
294
240
|
const componentsGroup = components[componentType];
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
}
|
|
301
|
-
|
|
302
|
-
if (!componentsGroup[name]) {
|
|
303
|
-
ctx.report(problem);
|
|
304
|
-
firstClaimByName.set(name, target.location);
|
|
305
|
-
}
|
|
306
|
-
return name;
|
|
241
|
+
const [fileRef, pointer] = [target.location.source.absoluteRef, target.location.pointer];
|
|
242
|
+
let name = pointerBaseName(pointer) || refBaseName(fileRef);
|
|
243
|
+
const prevName = name;
|
|
244
|
+
let serialId = 2;
|
|
245
|
+
while (componentsGroup[name] && !isEqualOrEqualRef(componentsGroup[name], target, ctx)) {
|
|
246
|
+
name = `${prevName}-${serialId}`;
|
|
247
|
+
serialId++;
|
|
307
248
|
}
|
|
308
|
-
const { name, prevName } = componentNameFromBasename(target, componentsGroup, ctx);
|
|
309
249
|
if (!componentsGroup[name] && prevName !== name) {
|
|
310
250
|
ctx.report({
|
|
311
251
|
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/oas-types.d.ts
CHANGED
|
@@ -2,8 +2,6 @@ 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\\.\\-_]+$";
|
|
7
5
|
export type SpecMajorVersion = 'oas2' | 'oas3' | 'async2' | 'async3' | 'arazzo1' | 'overlay1' | 'openrpc1';
|
|
8
6
|
export type RuleMap<Key extends string, RuleConfig, T> = Record<T extends 'built-in' ? Key : string, RuleConfig>;
|
|
9
7
|
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":"AASA,OAAO,KAAK,EACV,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EACV,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,aAAa,EACb,eAAe,EACf,UAAU,EACV,eAAe,EACf,UAAU,EACV,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACb,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,YAAY,wGAUf,CAAC;AACX,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,
|
|
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,8 +18,6 @@ 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\\.\\-_]+$';
|
|
23
21
|
const typesMap = {
|
|
24
22
|
oas2: Oas2Types,
|
|
25
23
|
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;AAYX,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"}
|
|
@@ -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":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGlD,eAAO,MAAM,4BAA4B,EAAE,QAiE1C,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { COMPONENT_NAME_PATTERN } from '../../oas-types.js';
|
|
2
1
|
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(KEYS_REGEX).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 "${KEYS_REGEX}"`,
|
|
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":"AAIA,MAAM,CAAC,MAAM,4BAA4B,GAAa,GAAG,EAAE;IACzD,MAAM,UAAU,GAAG,uBAAuB,CAAC;IAE3C,SAAS,WAAW,CAClB,GAAoB,EACpB,MAAkC,EAClC,QAAkB,EAClB,SAAiB;QAEjB,IAAI,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAa,CAAC,EAAE,CAAC;YAChD,MAAM,CAAC;gBACL,OAAO,EAAE,kBAAkB,SAAS,KAAK,GAAG,4CAA4C,UAAU,GAAG;gBACrG,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/package.json
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/openapi-core",
|
|
3
|
-
"version": "0.0.0-snapshot.
|
|
3
|
+
"version": "0.0.0-snapshot.1781184257",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
7
7
|
"exports": {
|
|
8
8
|
".": {
|
|
9
|
+
"types": "./lib/index.d.ts",
|
|
9
10
|
"import": "./lib/index.js",
|
|
10
|
-
"require": "./lib/index.js"
|
|
11
|
-
"types": "./lib/index.d.ts"
|
|
11
|
+
"require": "./lib/index.js"
|
|
12
12
|
},
|
|
13
13
|
"./lib/bundle-oas": {
|
|
14
|
+
"types": "./lib/bundle/bundle-oas.d.ts",
|
|
14
15
|
"import": "./lib/bundle/bundle-oas.js",
|
|
15
|
-
"require": "./lib/bundle/bundle-oas.js"
|
|
16
|
-
"types": "./lib/bundle/bundle-oas.d.ts"
|
|
16
|
+
"require": "./lib/bundle/bundle-oas.js"
|
|
17
17
|
}
|
|
18
18
|
},
|
|
19
19
|
"engines": {
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|
|
@@ -1 +0,0 @@
|
|
|
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"}
|