@redocly/cli 2.28.0 → 2.28.1
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/commands/bundle.d.ts.map +1 -1
- package/lib/commands/bundle.js +3 -3
- package/lib/commands/bundle.js.map +1 -1
- package/lib/commands/join/index.js +2 -2
- package/lib/commands/join/index.js.map +1 -1
- package/lib/utils/miscellaneous.d.ts +2 -2
- package/lib/utils/miscellaneous.d.ts.map +1 -1
- package/lib/utils/miscellaneous.js +62 -44
- package/lib/utils/miscellaneous.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,YAAY,
|
|
1
|
+
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,YAAY,EAGlB,MAAM,uBAAuB,CAAC;AAK/B,OAAO,EAAE,KAAK,eAAe,EAAe,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAa1F,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,eAAe,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,uCAAuC,CAAC,EAAE,YAAY,CAAC;IACvD,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC,GAAG,mBAAmB,CAAC;AAExB,wBAAsB,YAAY,CAAC,EACjC,IAAI,EACJ,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE,WAAW,CAAC,UAAU,CAAC,iBAyHzB"}
|
package/lib/commands/bundle.js
CHANGED
|
@@ -3,7 +3,7 @@ import { blue, gray, green, yellow } from 'colorette';
|
|
|
3
3
|
import { writeFileSync } from 'fs';
|
|
4
4
|
import { performance } from 'perf_hooks';
|
|
5
5
|
import { AbortFlowError } from '../utils/error.js';
|
|
6
|
-
import { dumpBundle, getExecutionTime, getFallbackApisOrExit, getOutputFileName, handleError, printUnusedWarnings, saveBundle,
|
|
6
|
+
import { dumpBundle, getExecutionTime, getFallbackApisOrExit, getOutputFileName, handleError, printUnusedWarnings, saveBundle, sortTopLevelKeys, formatPath, } from '../utils/miscellaneous.js';
|
|
7
7
|
export async function handleBundle({ argv, config, version, collectSpecData, }) {
|
|
8
8
|
const apis = await getFallbackApisOrExit(argv.apis, config);
|
|
9
9
|
const totals = { errors: 0, warnings: 0, ignored: 0 };
|
|
@@ -38,11 +38,11 @@ export async function handleBundle({ argv, config, version, collectSpecData, })
|
|
|
38
38
|
});
|
|
39
39
|
if (fileTotals.errors === 0 || argv.force) {
|
|
40
40
|
if (!outputFile) {
|
|
41
|
-
const bundled = dumpBundle(
|
|
41
|
+
const bundled = dumpBundle(sortTopLevelKeys(result.parsed), argv.ext || 'yaml', argv.dereferenced);
|
|
42
42
|
logger.output(bundled);
|
|
43
43
|
}
|
|
44
44
|
else {
|
|
45
|
-
const bundled = dumpBundle(
|
|
45
|
+
const bundled = dumpBundle(sortTopLevelKeys(result.parsed), ext, argv.dereferenced);
|
|
46
46
|
saveBundle(outputFile, bundled);
|
|
47
47
|
}
|
|
48
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,SAAS,EACT,MAAM,EACN,MAAM,
|
|
1
|
+
{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { blue, yellow } from 'colorette';
|
|
|
3
3
|
import * as path from 'node:path';
|
|
4
4
|
import { performance } from 'node:perf_hooks';
|
|
5
5
|
import { exitWithError } from '../../utils/error.js';
|
|
6
|
-
import { getFallbackApisOrExit, printExecutionTime,
|
|
6
|
+
import { getFallbackApisOrExit, printExecutionTime, sortTopLevelKeys, getAndValidateFileExtension, writeToFileByExtension, } from '../../utils/miscellaneous.js';
|
|
7
7
|
import { COMPONENTS } from '../split/constants.js';
|
|
8
8
|
import { replace$Refs, getInfoPrefix, getApiFilename, iteratePotentialConflicts, populateTags, collectExternalDocs, collectPaths, collectComponents, collectWebhooks, addInfoSectionAndSpecVersion, } from './utils/index.js';
|
|
9
9
|
export async function handleJoin({ argv, config, version: packageVersion, collectSpecData, }) {
|
|
@@ -135,7 +135,7 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
|
|
|
135
135
|
if (potentialConflictsTotal) {
|
|
136
136
|
return exitWithError(`Please fix conflicts before running ${yellow('join')}.`);
|
|
137
137
|
}
|
|
138
|
-
writeToFileByExtension(
|
|
138
|
+
writeToFileByExtension(sortTopLevelKeys(joinedDef), specFilename, noRefs);
|
|
139
139
|
printExecutionTime('join', startedAt, specFilename);
|
|
140
140
|
}
|
|
141
141
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/join/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,SAAS,EACT,UAAU,EACV,cAAc,EACd,MAAM,EACN,aAAa,EACb,aAAa,EACb,QAAQ,GAKT,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/join/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Config, type Oas3Definition, type Oas2Definition, type Exact } from '@redocly/openapi-core';
|
|
1
|
+
import { type Config, type Oas3Definition, type Oas2Definition, type Exact, type Async3Definition, type Async2Definition } from '@redocly/openapi-core';
|
|
2
2
|
import { type Totals, type Entrypoint, type OutputExtension, type CommandArgv } from '../types.js';
|
|
3
3
|
export type ExitCode = 0 | 1 | 2;
|
|
4
4
|
export declare function getFallbackApisOrExit(argsApis: string[] | undefined, config: Config): Promise<Entrypoint[]>;
|
|
@@ -38,7 +38,7 @@ export declare function getOutputFileName({ entrypoint, output, argvOutput, ext,
|
|
|
38
38
|
};
|
|
39
39
|
export declare function printUnusedWarnings(config: Config): void;
|
|
40
40
|
export declare function loadConfigAndHandleErrors(argv: Exact<CommandArgv>, version: string): Promise<Config>;
|
|
41
|
-
export declare function
|
|
41
|
+
export declare function sortTopLevelKeys(document: Oas3Definition | Oas2Definition | Async2Definition | Async3Definition): Oas3Definition | Oas2Definition | Async2Definition | Async3Definition;
|
|
42
42
|
export declare function checkIfRulesetExist(rules: typeof Config.prototype.rules): void;
|
|
43
43
|
export declare function cleanColors(input: string): string;
|
|
44
44
|
export declare function formatPath(path: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miscellaneous.d.ts","sourceRoot":"","sources":["../../src/utils/miscellaneous.ts"],"names":[],"mappings":"AAAA,OAAO,EAcL,KAAK,MAAM,EACX,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"miscellaneous.d.ts","sourceRoot":"","sources":["../../src/utils/miscellaneous.ts"],"names":[],"mappings":"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"}
|
|
@@ -331,53 +331,71 @@ export async function loadConfigAndHandleErrors(argv, version) {
|
|
|
331
331
|
handleError(e, '');
|
|
332
332
|
}
|
|
333
333
|
}
|
|
334
|
-
|
|
334
|
+
function isAsync2Definition(doc) {
|
|
335
|
+
return doc.asyncapi?.startsWith('2');
|
|
336
|
+
}
|
|
337
|
+
const oas2OrderedKeys = [
|
|
338
|
+
'swagger',
|
|
339
|
+
'info',
|
|
340
|
+
'host',
|
|
341
|
+
'basePath',
|
|
342
|
+
'schemes',
|
|
343
|
+
'consumes',
|
|
344
|
+
'produces',
|
|
345
|
+
'security',
|
|
346
|
+
'tags',
|
|
347
|
+
'externalDocs',
|
|
348
|
+
'paths',
|
|
349
|
+
'definitions',
|
|
350
|
+
'parameters',
|
|
351
|
+
'responses',
|
|
352
|
+
'securityDefinitions',
|
|
353
|
+
];
|
|
354
|
+
const oas3OrderedKeys = [
|
|
355
|
+
'openapi',
|
|
356
|
+
'info',
|
|
357
|
+
'jsonSchemaDialect',
|
|
358
|
+
'servers',
|
|
359
|
+
'security',
|
|
360
|
+
'tags',
|
|
361
|
+
'externalDocs',
|
|
362
|
+
'paths',
|
|
363
|
+
'webhooks',
|
|
364
|
+
'x-webhooks',
|
|
365
|
+
'components',
|
|
366
|
+
];
|
|
367
|
+
const asyncApi2OrderedKeys = [
|
|
368
|
+
'asyncapi',
|
|
369
|
+
'id',
|
|
370
|
+
'info',
|
|
371
|
+
'externalDocs',
|
|
372
|
+
'tags',
|
|
373
|
+
'defaultContentType',
|
|
374
|
+
'servers',
|
|
375
|
+
'channels',
|
|
376
|
+
'components',
|
|
377
|
+
];
|
|
378
|
+
const asyncApi3OrderedKeys = [
|
|
379
|
+
'asyncapi',
|
|
380
|
+
'info',
|
|
381
|
+
'defaultContentType',
|
|
382
|
+
'servers',
|
|
383
|
+
'channels',
|
|
384
|
+
'operations',
|
|
385
|
+
'components',
|
|
386
|
+
];
|
|
387
|
+
export function sortTopLevelKeys(document) {
|
|
388
|
+
if ('asyncapi' in document) {
|
|
389
|
+
return isAsync2Definition(document)
|
|
390
|
+
? sortDocumentKeys(document, asyncApi2OrderedKeys)
|
|
391
|
+
: sortDocumentKeys(document, asyncApi3OrderedKeys);
|
|
392
|
+
}
|
|
335
393
|
if ('swagger' in document) {
|
|
336
|
-
return
|
|
337
|
-
}
|
|
338
|
-
return sortOas3Keys(document);
|
|
339
|
-
}
|
|
340
|
-
function sortOas2Keys(document) {
|
|
341
|
-
const orderedKeys = [
|
|
342
|
-
'swagger',
|
|
343
|
-
'info',
|
|
344
|
-
'host',
|
|
345
|
-
'basePath',
|
|
346
|
-
'schemes',
|
|
347
|
-
'consumes',
|
|
348
|
-
'produces',
|
|
349
|
-
'security',
|
|
350
|
-
'tags',
|
|
351
|
-
'externalDocs',
|
|
352
|
-
'paths',
|
|
353
|
-
'definitions',
|
|
354
|
-
'parameters',
|
|
355
|
-
'responses',
|
|
356
|
-
'securityDefinitions',
|
|
357
|
-
];
|
|
358
|
-
const result = {};
|
|
359
|
-
for (const key of orderedKeys) {
|
|
360
|
-
if (document.hasOwnProperty(key)) {
|
|
361
|
-
result[key] = document[key];
|
|
362
|
-
}
|
|
394
|
+
return sortDocumentKeys(document, oas2OrderedKeys);
|
|
363
395
|
}
|
|
364
|
-
|
|
365
|
-
return Object.assign(result, document);
|
|
396
|
+
return sortDocumentKeys(document, oas3OrderedKeys);
|
|
366
397
|
}
|
|
367
|
-
function
|
|
368
|
-
const orderedKeys = [
|
|
369
|
-
'openapi',
|
|
370
|
-
'info',
|
|
371
|
-
'jsonSchemaDialect',
|
|
372
|
-
'servers',
|
|
373
|
-
'security',
|
|
374
|
-
'tags',
|
|
375
|
-
'externalDocs',
|
|
376
|
-
'paths',
|
|
377
|
-
'webhooks',
|
|
378
|
-
'x-webhooks',
|
|
379
|
-
'components',
|
|
380
|
-
];
|
|
398
|
+
function sortDocumentKeys(document, orderedKeys) {
|
|
381
399
|
const result = {};
|
|
382
400
|
for (const key of orderedKeys) {
|
|
383
401
|
if (document.hasOwnProperty(key)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miscellaneous.js","sourceRoot":"","sources":["../../src/utils/miscellaneous.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,SAAS,EACT,aAAa,EACb,aAAa,EACb,UAAU,EACV,aAAa,EACb,eAAe,EACf,gBAAgB,EAChB,SAAS,EACT,qBAAqB,EACrB,MAAM,EACN,YAAY,GAKb,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACL,gBAAgB,GAKjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAI3C,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,QAA8B,EAC9B,MAAc;IAEd,MAAM,8BAA8B,GAClC,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC7E,MAAM,GAAG,GAAG,8BAA8B;QACxC,CAAC,CAAC,wBAAwB,CAAC,MAAM,CAAC;QAClC,CAAC,CAAC,MAAM,wBAAwB,CAAC,QAAS,EAAE,MAAM,CAAC,CAAC;IAEtD,MAAM,0BAA0B,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IACnF,IAAI,eAAe,CAAC,0BAA0B,CAAC,EAAE,CAAC;QAChD,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,0BAA0B,EAAE,CAAC;YAClD,MAAM,CAAC,IAAI,CAAC,KAAK,UAAU,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,mCAAmC,CAAC,EAAE,CAAC,CAAC;QACnF,CAAC;QACD,aAAa,CAAC,8BAA8B,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAc;IACxC,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;AACxE,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;QACpB,aAAa,CAAC,uBAAuB,CAAC,CAAC;QACvC,OAAO;IACT,CAAC;IACD,OAAO,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAChF,CAAC;AAED,SAAS,wBAAwB,CAAC,MAAc;IAC9C,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1F,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC;QAC5E,KAAK;QACL,MAAM,EAAE,MAAM,IAAI,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;KAC9D,CAAC,CAAC,CAAC;AACN,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAc,EAAE,WAAmB;IAChE,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,WAAW,CAAC,CAAC;IAC3D,OAAO,QAAQ;QACb,CAAC,CAAC;YACE,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC;YACtF,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC;SAC/D;QACH,CAAC,CAAC;YACE,IAAI,EAAE,WAAW;YACjB,2CAA2C;YAC3C,KAAK,EACH,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE;gBACtE,OAAO,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;YAC/D,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS;SACvB,CAAC;AACR,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,OAAiB,EAAE,MAAc;IACvE,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;QAChC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAE/E,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE;gBACnC,GAAG,EAAE,kBAAkB,CAAC,MAAM,CAAC;aAChC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC7C,CAAC,CAAC,CACH,CACF,CAAC,IAAI,EAAE,CAAC;AACX,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;QACpC,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,WAAmB,EAAE,SAAiB,EAAE,GAAW;IACpF,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,WAAW,iBAAiB,OAAO,MAAM,CAAC,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,aAAqB;IAChE,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;QACjB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,OAAO,IAAI;SACR,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC;SACrB,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC;SACrB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;SAClB,UAAU,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC5E,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,MAAM,OAAO,GAA2B;QACtC,GAAG,EAAE,MAAM;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,KAAK;QACZ,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,KAAK;QACjB,EAAE,EAAE,KAAK;QACT,MAAM,EAAE,KAAK;QACb,CAAC,EAAE,IAAI;QACP,KAAK,EAAE,MAAM;QACb,YAAY,EAAE,YAAY;QAC1B,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,KAAK;QACb,EAAE,EAAE,KAAK;QACT,MAAM,EAAE,SAAS;QACjB,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,KAAK;QACb,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,MAAM;QAClB,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,QAAQ;QACf,UAAU,EAAE,KAAK;QACjB,GAAG,EAAE,MAAM;QACX,cAAc,EAAE,KAAK;QACrB,MAAM,EAAE,KAAK;KACd,CAAC;IACF,OAAO,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,OAAO,6BAA8B,SAAQ,KAAK;IACtD,YAAmB,aAAoB;QACrC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QADZ,kBAAa,GAAb,aAAa,CAAO;QAErC,gCAAgC;QAChC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,6BAA6B,CAAC,SAAS,CAAC,CAAC;IACvE,CAAC;CACF;AAED,MAAM,UAAU,UAAU,CAAC,GAAQ,EAAE,MAAuB,EAAE,WAAqB;IACjF,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBACvC,MAAM,IAAI,6BAA6B,CAAC,CAAC,CAAC,CAAC;YAC7C,CAAC;YACD,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,aAAa,CAAC,GAAG,EAAE;YACxB,MAAM,EAAE,CAAC,WAAW;YACpB,SAAS,EAAE,CAAC,CAAC;SACd,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,QAAgB,EAAE,MAAc;IACzD,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,KAAa,EAAE,aAAa,GAAG,KAAK;IACnE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,MAAM,GAAa,OAAO,CAAC,MAAM,CAAC;QACtC,IAAI,aAAa,GAAG,KAAK,CAAC;QAE1B,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,GAAG,IAAI,QAAQ,CAAC;gBACpB,KAAK,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE;oBACnC,IAAI,CAAC,aAAa,EAAE,CAAC;wBACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;oBACxC,CAAC;oBACD,QAAQ,EAAE,CAAC;gBACb,CAAC;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,EAAE,GAAG,QAAQ,CAAC,eAAe,CAAC;YAClC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM;YACN,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;SACpC,CAAC,CAAC;QAEH,EAAE,CAAC,QAAQ,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;YACxC,EAAE,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,CAAC,MAAM,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,aAAa,GAAG,aAAa,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,QAAgB;IACvC,OAAO,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,IAAa,EAAE,QAAgB,EAAE,MAAgB;IACtF,MAAM,GAAG,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC;IAElD,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;QACnB,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC1B,OAAO;IACT,CAAC;IAED,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAS,EAAE,QAAgB,EAAE,MAAM,GAAG,KAAK;IACnE,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEhD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IACD,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAa,EAAE,QAAgB;IACvD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAE9C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IACD,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,QAAgB;IAC1D,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACtC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,GAAsB,CAAC,EAAE,CAAC;QACtD,OAAO,GAAsB,CAAC;IAChC,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,+BAA+B,GAAG,iBAAiB,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,CAAQ,EAAE,GAAW;IAC/C,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QACtB,KAAK,YAAY,CAAC,CAAC,CAAC;YAClB,MAAM,CAAC,CAAC;QACV,CAAC;QACD,KAAK,YAAY;YACf,aAAa,CAAC,wCAAwC,GAAG,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAClF,MAAM;QACR,KAAK,cAAc;YACjB,aAAa,CAAC,sCAAsC,GAAG,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAChF,MAAM;QACR,KAAK,6BAA6B,CAAC,CAAC,CAAC;YACnC,aAAa,CACX,iEAAiE;gBAC/D,cAAc,IAAI,CAAC,MAAM,CAAC,qBAAqB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAC3E,CAAC;YACF,MAAM;QACR,CAAC;QACD,KAAK,WAAW;YACd,aAAa,CAAC,iBAAiB,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC3E,MAAM;QACR,KAAK,qBAAqB;YACxB,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACzB,MAAM;QACR,OAAO,CAAC,CAAC,CAAC;YACR,aAAa,CAAC,wCAAwC,GAAG,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAc,EAAE,gBAAwB;IACtE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO;QAC5B,CAAC,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,IAAI,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC;QAChG,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,KAAK,CACV,4BAA4B,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,GAC5E,MAAM,CAAC,QAAQ,GAAG,CAAC;YACjB,CAAC,CAAC,QAAQ,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE;YACpE,CAAC,CAAC,EACN,MAAM,OAAO,EAAE,CAChB,CAAC;IACJ,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CACT,KAAK,CAAC,oBAAoB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,cAAc,CAAC,CACvF,CAAC;QACF,MAAM,CAAC,IAAI,CACT,YAAY,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,OAAO,EAAE,CACpF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,IAAI,CACT,KAAK,CACH,oBAAoB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,eAAe,OAAO,EAAE,CAC1F,CACF,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,CACT,IAAI,CAAC,uFAAuF,CAAC,CAC9F,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAc,EAAE,OAAyB;IAC7E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,CAAC,KAAK,CAAC,qBAAqB,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7F,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CACT,sBAAsB,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CACpF,CAAC;IACJ,CAAC;SAAM,IAAI,OAAO,KAAK,cAAc,EAAE,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,EAChC,UAAU,EACV,MAAM,EACN,UAAU,EACV,GAAG,EACH,OAAO,GAOR;IACC,IAAI,UAAU,GAAG,MAAM,IAAI,UAAU,CAAC;IACtC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,MAAM,EAAE,CAAC;IAChC,CAAC;IAED,IAAI,OAAO,GAAG,CAAC,IAAI,UAAU,EAAE,CAAC;QAC9B,GAAG,GAAG,GAAG,IAAK,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,CAAqB,CAAC;QACnE,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,GAAG,CAAC,CAAC;QACrD,CAAC;QACD,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC;IACvF,CAAC;SAAM,CAAC;QACN,GAAG;YACD,GAAG;gBACF,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,CAAqB;gBACpD,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,CAAqB,CAAC;QACxD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,GAAG,CAAC,CAAC;QACrD,CAAC;QACD,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC;IAChG,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,cAAc,EAAE,CAAC;IACrE,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,CAAC,IAAI,CACT,mCAAmC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAC3F,CAAC;IACJ,CAAC;IACD,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QACzB,MAAM,CAAC,IAAI,CACT,2CAA2C,IAAI,CAC7C,MAAM,CAAC,UAAU,IAAI,EAAE,CACxB,KAAK,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CACpC,CAAC;IACJ,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,CAAC,IAAI,CACT,wCAAwC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,KAAK,UAAU,CAAC,IAAI,CACvF,IAAI,CACL,KAAK,CACP,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;IAC1E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,IAAwB,EACxB,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;YAC9B,UAAU,EAAE,IAAI,CAAC,MAAM;YACvB,aAAa,EAAE,IAAI,CAAC,OAA+B;SACpD,CAAC,CAAC;QACH,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAC9C,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,WAAW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,QAAyC;IAEzC,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;QAC1B,OAAO,YAAY,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,YAAY,CAAC,QAA0B,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,YAAY,CAAC,QAAwB;IAC5C,MAAM,WAAW,GAAG;QAClB,SAAS;QACT,MAAM;QACN,MAAM;QACN,UAAU;QACV,SAAS;QACT,UAAU;QACV,UAAU;QACV,UAAU;QACV,MAAM;QACN,cAAc;QACd,OAAO;QACP,aAAa;QACb,YAAY;QACZ,WAAW;QACX,qBAAqB;KACtB,CAAC;IACF,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,KAAK,MAAM,GAAG,IAAI,WAAuC,EAAE,CAAC;QAC1D,IAAI,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,0DAA0D;IAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AACD,SAAS,YAAY,CAAC,QAAwB;IAC5C,MAAM,WAAW,GAAG;QAClB,SAAS;QACT,MAAM;QACN,mBAAmB;QACnB,SAAS;QACT,UAAU;QACV,MAAM;QACN,cAAc;QACd,OAAO;QACP,UAAU;QACV,YAAY;QACZ,YAAY;KACb,CAAC;IACF,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,KAAK,MAAM,GAAG,IAAI,WAAuC,EAAE,CAAC;QAC1D,IAAI,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,0DAA0D;IAC1D,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAoC;IACtE,MAAM,OAAO,GAAG;QACd,GAAG,KAAK,CAAC,IAAI;QACb,GAAG,KAAK,CAAC,MAAM;QACf,GAAG,KAAK,CAAC,MAAM;QACf,GAAG,KAAK,CAAC,MAAM;QACf,GAAG,KAAK,CAAC,MAAM;QACf,GAAG,KAAK,CAAC,MAAM;QACf,GAAG,KAAK,CAAC,OAAO;QAChB,GAAG,KAAK,CAAC,QAAQ;KAClB,CAAC;IAEF,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAC3B,aAAa,CACX,gGAAgG,CACjG,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,4CAA4C;IAC5C,OAAO,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,IAAY;IACrC,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,CAAS;IAClC,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;QAClB,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
1
|
+
{"version":3,"file":"miscellaneous.js","sourceRoot":"","sources":["../../src/utils/miscellaneous.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/cli",
|
|
3
|
-
"version": "2.28.
|
|
3
|
+
"version": "2.28.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"bin": {
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
"@opentelemetry/sdk-trace-node": "2.0.1",
|
|
44
44
|
"@opentelemetry/semantic-conventions": "1.34.0",
|
|
45
45
|
"@redocly/cli-otel": "0.1.2",
|
|
46
|
-
"@redocly/openapi-core": "2.28.
|
|
47
|
-
"@redocly/respect-core": "2.28.
|
|
46
|
+
"@redocly/openapi-core": "2.28.1",
|
|
47
|
+
"@redocly/respect-core": "2.28.1",
|
|
48
48
|
"abort-controller": "^3.0.0",
|
|
49
49
|
"ajv": "npm:@redocly/ajv@8.18.0",
|
|
50
50
|
"ajv-formats": "^3.0.1",
|