@redocly/cli 2.22.1 → 2.23.0
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/scorecard-classic/index.d.ts.map +1 -1
- package/lib/commands/scorecard-classic/index.js +40 -13
- package/lib/commands/scorecard-classic/index.js.map +1 -1
- package/lib/commands/scorecard-classic/targets-handler/targets-handler.d.ts +13 -0
- package/lib/commands/scorecard-classic/targets-handler/targets-handler.d.ts.map +1 -0
- package/lib/commands/scorecard-classic/targets-handler/targets-handler.js +55 -0
- package/lib/commands/scorecard-classic/targets-handler/targets-handler.js.map +1 -0
- package/lib/commands/scorecard-classic/types.d.ts +3 -2
- package/lib/commands/scorecard-classic/types.d.ts.map +1 -1
- package/lib/commands/scorecard-classic/validation/validate-scorecard.d.ts +4 -2
- package/lib/commands/scorecard-classic/validation/validate-scorecard.d.ts.map +1 -1
- package/lib/commands/scorecard-classic/validation/validate-scorecard.js +30 -9
- package/lib/commands/scorecard-classic/validation/validate-scorecard.js.map +1 -1
- package/lib/utils/miscellaneous.d.ts +1 -0
- package/lib/utils/miscellaneous.d.ts.map +1 -1
- package/lib/utils/miscellaneous.js +1 -1
- package/lib/utils/miscellaneous.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/scorecard-classic/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/scorecard-classic/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAOpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAUvD,wBAAsB,sBAAsB,CAAC,EAC3C,IAAI,EACJ,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE,WAAW,CAAC,oBAAoB,CAAC,iBAgJnC"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { BaseResolver, logger } from '@redocly/openapi-core';
|
|
2
2
|
import { blue, bold, cyan, gray, green, white } from 'colorette';
|
|
3
3
|
import { AbortFlowError, exitWithError } from '../../utils/error.js';
|
|
4
|
-
import { formatPath, getExecutionTime, getFallbackApisOrExit } from '../../utils/miscellaneous.js';
|
|
4
|
+
import { formatPath, getExecutionTime, getFallbackApisOrExit, getAliasOrPath, } from '../../utils/miscellaneous.js';
|
|
5
5
|
import { handleLoginAndFetchToken } from './auth/login-handler.js';
|
|
6
6
|
import { printScorecardResultsAsCheckstyle } from './formatters/checkstyle-formatter.js';
|
|
7
7
|
import { printScorecardResultsAsJson } from './formatters/json-formatter.js';
|
|
8
8
|
import { printScorecardResults } from './formatters/stylish-formatter.js';
|
|
9
9
|
import { fetchRemoteScorecardAndPlugins } from './remote/fetch-scorecard.js';
|
|
10
|
+
import { getTarget } from './targets-handler/targets-handler.js';
|
|
10
11
|
import { isAllowedScorecardProjectUrl } from './validation/project-url.js';
|
|
11
12
|
import { validateScorecard } from './validation/validate-scorecard.js';
|
|
12
13
|
export async function handleScorecardClassic({ argv, config, version, collectSpecData, }) {
|
|
@@ -15,24 +16,16 @@ export async function handleScorecardClassic({ argv, config, version, collectSpe
|
|
|
15
16
|
if (!apis.length) {
|
|
16
17
|
exitWithError('No APIs were provided.');
|
|
17
18
|
}
|
|
18
|
-
const path = apis[0].path;
|
|
19
|
-
const externalRefResolver = new BaseResolver(config.resolve);
|
|
20
|
-
const document = (await externalRefResolver.resolveDocument(null, path, true));
|
|
21
|
-
const targetLevel = argv['target-level'];
|
|
22
|
-
collectSpecData?.(document.parsed);
|
|
23
19
|
const projectUrl = argv['project-url'] ||
|
|
24
20
|
config.resolvedConfig.scorecardClassic?.fromProjectUrl ||
|
|
25
21
|
config.resolvedConfig.scorecard?.fromProjectUrl;
|
|
26
|
-
const apiKey = process.env.REDOCLY_AUTHORIZATION;
|
|
27
|
-
if (argv.verbose) {
|
|
28
|
-
logger.info(`Project URL: ${projectUrl || 'not configured'}\n`);
|
|
29
|
-
}
|
|
30
22
|
if (!projectUrl) {
|
|
31
23
|
exitWithError('Scorecard is not configured. Please provide it via --project-url flag or configure it in redocly.yaml. Learn more: https://redocly.com/docs/realm/config/scorecard#fromprojecturl-example');
|
|
32
24
|
}
|
|
33
25
|
if (!isAllowedScorecardProjectUrl(projectUrl)) {
|
|
34
26
|
exitWithError(`Project URL must be from the .redocly.com domain. Received: ${projectUrl}`);
|
|
35
27
|
}
|
|
28
|
+
const apiKey = process.env.REDOCLY_AUTHORIZATION;
|
|
36
29
|
if (isNonInteractiveEnvironment() && !apiKey) {
|
|
37
30
|
exitWithError('Please provide an API key using the REDOCLY_AUTHORIZATION environment variable.\n');
|
|
38
31
|
}
|
|
@@ -40,20 +33,54 @@ export async function handleScorecardClassic({ argv, config, version, collectSpe
|
|
|
40
33
|
if (!auth) {
|
|
41
34
|
exitWithError('Failed to obtain access token or API key.');
|
|
42
35
|
}
|
|
43
|
-
const
|
|
36
|
+
const { scorecard, plugins } = await fetchRemoteScorecardAndPlugins({
|
|
44
37
|
projectUrl,
|
|
45
38
|
auth,
|
|
46
39
|
isApiKey: !!apiKey,
|
|
47
40
|
verbose: argv.verbose,
|
|
48
41
|
});
|
|
42
|
+
const { path, alias } = apis[0];
|
|
43
|
+
const matchedEntry = getAliasOrPath(config, path);
|
|
44
|
+
const matchedAlias = matchedEntry.alias || alias;
|
|
45
|
+
const apiConfigMetadata = matchedAlias
|
|
46
|
+
? config.resolvedConfig.apis?.[matchedAlias]?.metadata
|
|
47
|
+
: undefined;
|
|
48
|
+
if (argv.verbose && matchedAlias && apiConfigMetadata) {
|
|
49
|
+
logger.info(`\n✓ Matched API "${cyan(matchedAlias)}" from config\n`);
|
|
50
|
+
}
|
|
51
|
+
if (argv.verbose) {
|
|
52
|
+
logger.info(`Processing API: ${cyan(matchedAlias || 'default')}\n`);
|
|
53
|
+
logger.info(`Path: ${formatPath(path)}\n`);
|
|
54
|
+
if (apiConfigMetadata) {
|
|
55
|
+
logger.info(`Config Metadata: ${JSON.stringify(apiConfigMetadata, null, 2)}\n`);
|
|
56
|
+
}
|
|
57
|
+
logger.info(`Project URL: ${projectUrl}\n`);
|
|
58
|
+
}
|
|
59
|
+
const externalRefResolver = new BaseResolver(config.resolve);
|
|
60
|
+
const document = (await externalRefResolver.resolveDocument(null, path, true));
|
|
61
|
+
collectSpecData?.(document.parsed);
|
|
62
|
+
const documentInfo = document.parsed?.info;
|
|
63
|
+
const builtInMetadata = documentInfo?.['x-metadata'] || {};
|
|
64
|
+
const metadata = {
|
|
65
|
+
title: documentInfo?.title,
|
|
66
|
+
version: documentInfo?.version,
|
|
67
|
+
...builtInMetadata,
|
|
68
|
+
...apiConfigMetadata,
|
|
69
|
+
};
|
|
70
|
+
if (argv.verbose) {
|
|
71
|
+
logger.info(`Combined Metadata for target matching: ${JSON.stringify(metadata, null, 2)}\n`);
|
|
72
|
+
}
|
|
73
|
+
const targetLevel = argv['target-level'] || getTarget(scorecard?.targets, metadata)?.minimumLevel;
|
|
49
74
|
logger.info(gray(`\nRunning scorecard for ${formatPath(path)}...\n`));
|
|
50
75
|
const { problems: result, achievedLevel, targetLevelAchieved, } = await validateScorecard({
|
|
76
|
+
apiPath: path,
|
|
51
77
|
document,
|
|
52
78
|
externalRefResolver,
|
|
53
|
-
scorecardConfig:
|
|
79
|
+
scorecardConfig: scorecard,
|
|
54
80
|
configPath: config.configPath,
|
|
55
|
-
pluginsCodeOrPlugins:
|
|
81
|
+
pluginsCodeOrPlugins: plugins,
|
|
56
82
|
targetLevel,
|
|
83
|
+
metadata,
|
|
57
84
|
verbose: argv.verbose,
|
|
58
85
|
});
|
|
59
86
|
if (result.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/scorecard-classic/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/scorecard-classic/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type ScorecardConfig } from '@redocly/config';
|
|
2
|
+
import { type Config, type Plugin } from '@redocly/openapi-core';
|
|
3
|
+
export declare function resolveConfigForTarget(apiPath: string, targetRules: Record<string, unknown> | undefined, scorecardLevels: ScorecardConfig['levels'], plugins: Array<string | Plugin> | undefined, configPath: string): Promise<Record<string, Config>>;
|
|
4
|
+
export declare function getTarget<T extends object>(targets: Array<{
|
|
5
|
+
where: {
|
|
6
|
+
metadata: Record<string, string>;
|
|
7
|
+
};
|
|
8
|
+
} & T> | undefined, metadata: Record<string, unknown>): ({
|
|
9
|
+
where: {
|
|
10
|
+
metadata: Record<string, string>;
|
|
11
|
+
};
|
|
12
|
+
} & T) | undefined;
|
|
13
|
+
//# sourceMappingURL=targets-handler.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"targets-handler.d.ts","sourceRoot":"","sources":["../../../../src/commands/scorecard-classic/targets-handler/targets-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,MAAM,EAEX,KAAK,MAAM,EAIZ,MAAM,uBAAuB,CAAC;AAE/B,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAChD,eAAe,EAAE,eAAe,CAAC,QAAQ,CAAM,EAC/C,OAAO,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,YAAK,EACpC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAkBjC;AAED,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,EACxC,OAAO,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAA;CAAE,GAAG,CAAC,CAAC,GAAG,SAAS,EAC/E,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;WADT;QAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE;mBAkB7D"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { createConfig, logger, regexFromString, } from '@redocly/openapi-core';
|
|
2
|
+
export async function resolveConfigForTarget(apiPath, targetRules, scorecardLevels = [], plugins = [], configPath) {
|
|
3
|
+
const result = {};
|
|
4
|
+
for (const level of scorecardLevels) {
|
|
5
|
+
const apis = {
|
|
6
|
+
[level.name]: {
|
|
7
|
+
root: apiPath,
|
|
8
|
+
rules: targetRules,
|
|
9
|
+
},
|
|
10
|
+
};
|
|
11
|
+
const config = await createConfig({ apis, ...level, plugins }, {
|
|
12
|
+
configPath,
|
|
13
|
+
});
|
|
14
|
+
result[level.name] = config.forAlias(level.name);
|
|
15
|
+
}
|
|
16
|
+
return result;
|
|
17
|
+
}
|
|
18
|
+
export function getTarget(targets, metadata) {
|
|
19
|
+
if (!targets) {
|
|
20
|
+
return undefined;
|
|
21
|
+
}
|
|
22
|
+
for (const target of targets) {
|
|
23
|
+
const matches = Object.entries(target.where?.metadata || {}).every(([key, value]) => isTargetMatch(key, value, metadata));
|
|
24
|
+
if (matches) {
|
|
25
|
+
return target;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
function isTargetMatch(key, value, metadata) {
|
|
31
|
+
// support for ISO 8601 date ranges
|
|
32
|
+
if (value.match(/^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2}Z)?\/(\d{4}-\d{2}-\d{2})?$/)) {
|
|
33
|
+
if (!metadata[key]) {
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
const [from, to] = value.split('/');
|
|
37
|
+
const date = new Date(metadata[key]);
|
|
38
|
+
return !(date < new Date(from) || (to && date > new Date(to)));
|
|
39
|
+
}
|
|
40
|
+
else if (value.match(/^\/.*\//)) {
|
|
41
|
+
if (!metadata[key]) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
try {
|
|
45
|
+
const regex = regexFromString(value);
|
|
46
|
+
return regex.test(metadata[key]);
|
|
47
|
+
}
|
|
48
|
+
catch (e) {
|
|
49
|
+
logger.error(`Invalid regex in scorecard target "${key}": ${value}`);
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return metadata[key] === value;
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=targets-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"targets-handler.js","sourceRoot":"","sources":["../../../../src/commands/scorecard-classic/targets-handler/targets-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,YAAY,EACZ,MAAM,EACN,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAAe,EACf,WAAgD,EAChD,kBAA6C,EAAE,EAC/C,UAAkC,EAAE,EACpC,UAAkB;IAElB,MAAM,MAAM,GAA2B,EAAE,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,eAAe,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG;YACX,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBACZ,IAAI,EAAE,OAAO;gBACb,KAAK,EAAE,WAAW;aACnB;SACF,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,OAAO,EAAwB,EAAE;YACnF,UAAU;SACX,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,OAA+E,EAC/E,QAAiC;IAEjC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC,KAAK,CAChE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAmB,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CACxE,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC;QAChB,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAa,EAAE,QAAiC;IAClF,mCAAmC;IACnC,IAAI,KAAK,CAAC,KAAK,CAAC,iEAAiE,CAAC,EAAE,CAAC;QACnF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAW,CAAC,CAAC;QAE/C,OAAO,CAAC,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC;SAAM,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAW,CAAC;YAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAW,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,MAAM,KAAK,EAAE,CAAC,CAAC;YACrE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC;AACjC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ScorecardConfig } from '@redocly/config';
|
|
1
2
|
import type { NormalizedProblem, OutputFormat, ResolvedConfig } from '@redocly/openapi-core';
|
|
2
3
|
export type ScorecardClassicArgv = {
|
|
3
4
|
api: string;
|
|
@@ -11,7 +12,7 @@ export type ScorecardProblem = NormalizedProblem & {
|
|
|
11
12
|
scorecardLevel?: string;
|
|
12
13
|
};
|
|
13
14
|
export type RemoteScorecardAndPlugins = {
|
|
14
|
-
scorecard:
|
|
15
|
+
scorecard: ScorecardConfig;
|
|
15
16
|
plugins: string | undefined;
|
|
16
17
|
};
|
|
17
18
|
export type Project = {
|
|
@@ -19,7 +20,7 @@ export type Project = {
|
|
|
19
20
|
slug: string;
|
|
20
21
|
config: ResolvedConfig & {
|
|
21
22
|
pluginsUrl?: string;
|
|
22
|
-
scorecardClassic?:
|
|
23
|
+
scorecardClassic?: ScorecardConfig;
|
|
23
24
|
};
|
|
24
25
|
};
|
|
25
26
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/commands/scorecard-classic/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE7F,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,YAAY,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/commands/scorecard-classic/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE7F,MAAM,MAAM,oBAAoB,GAAG;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,YAAY,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,GAAG;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,OAAO,MAAM,EAAE,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,cAAc,GAAG;QAAE,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,eAAe,CAAA;KAAE,CAAC;CACtF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ScorecardConfig } from '@redocly/config';
|
|
2
|
-
import type
|
|
2
|
+
import { type Document, type Plugin, type BaseResolver } from '@redocly/openapi-core';
|
|
3
3
|
import type { ScorecardProblem } from '../types.js';
|
|
4
4
|
export type ScorecardValidationResult = {
|
|
5
5
|
problems: ScorecardProblem[];
|
|
@@ -7,13 +7,15 @@ export type ScorecardValidationResult = {
|
|
|
7
7
|
targetLevelAchieved: boolean;
|
|
8
8
|
};
|
|
9
9
|
export type ValidateScorecardParams = {
|
|
10
|
+
apiPath: string;
|
|
10
11
|
document: Document;
|
|
11
12
|
externalRefResolver: BaseResolver;
|
|
12
13
|
scorecardConfig: ScorecardConfig;
|
|
13
14
|
configPath?: string;
|
|
14
15
|
pluginsCodeOrPlugins?: string | Plugin[];
|
|
15
16
|
targetLevel?: string;
|
|
17
|
+
metadata?: Record<string, unknown>;
|
|
16
18
|
verbose?: boolean;
|
|
17
19
|
};
|
|
18
|
-
export declare function validateScorecard({ document, externalRefResolver, scorecardConfig, configPath, pluginsCodeOrPlugins, targetLevel, verbose, }: ValidateScorecardParams): Promise<ScorecardValidationResult>;
|
|
20
|
+
export declare function validateScorecard({ apiPath, document, externalRefResolver, scorecardConfig, configPath, pluginsCodeOrPlugins, targetLevel, metadata, verbose, }: ValidateScorecardParams): Promise<ScorecardValidationResult>;
|
|
19
21
|
//# sourceMappingURL=validate-scorecard.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-scorecard.d.ts","sourceRoot":"","sources":["../../../../src/commands/scorecard-classic/validation/validate-scorecard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"validate-scorecard.d.ts","sourceRoot":"","sources":["../../../../src/commands/scorecard-classic/validation/validate-scorecard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAIL,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,YAAY,EAElB,MAAM,uBAAuB,CAAC;AAI/B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;IACnB,mBAAmB,EAAE,YAAY,CAAC;IAClC,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,QAAQ,EACR,mBAAmB,EACnB,eAAe,EACf,UAAU,EACV,oBAAoB,EACpB,WAAW,EACX,QAAa,EACb,OAAe,GAChB,EAAE,uBAAuB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAgH9D"}
|
|
@@ -1,25 +1,46 @@
|
|
|
1
|
-
import { logger,
|
|
1
|
+
import { logger, lintDocument, pluralize, } from '@redocly/openapi-core';
|
|
2
2
|
import { exitWithError } from '../../../utils/error.js';
|
|
3
|
+
import { getTarget, resolveConfigForTarget } from '../targets-handler/targets-handler.js';
|
|
3
4
|
import { evaluatePluginsFromCode } from './plugin-evaluator.js';
|
|
4
|
-
export async function validateScorecard({ document, externalRefResolver, scorecardConfig, configPath, pluginsCodeOrPlugins, targetLevel, verbose = false, }) {
|
|
5
|
+
export async function validateScorecard({ apiPath, document, externalRefResolver, scorecardConfig, configPath, pluginsCodeOrPlugins, targetLevel, metadata = {}, verbose = false, }) {
|
|
5
6
|
const problems = [];
|
|
6
7
|
const levelResults = new Map();
|
|
8
|
+
const targets = scorecardConfig.targets || [];
|
|
7
9
|
if (targetLevel && !scorecardConfig.levels?.some((level) => level.name === targetLevel)) {
|
|
8
10
|
exitWithError(`Target level "${targetLevel}" not found in the scorecard configuration levels.\n`);
|
|
9
11
|
}
|
|
10
|
-
|
|
12
|
+
const plugins = typeof pluginsCodeOrPlugins === 'string'
|
|
13
|
+
? await evaluatePluginsFromCode(pluginsCodeOrPlugins, verbose)
|
|
14
|
+
: pluginsCodeOrPlugins;
|
|
15
|
+
const pluginsList = Array.isArray(plugins) ? plugins : [];
|
|
16
|
+
let levelConfigs = {};
|
|
17
|
+
let targetRules;
|
|
18
|
+
if (targets.length > 0) {
|
|
19
|
+
if (verbose) {
|
|
20
|
+
logger.info(`Scorecard has ${targets.length} ${pluralize('target', targets.length)} defined. Resolving target configurations...\n`);
|
|
21
|
+
}
|
|
22
|
+
const matchedTarget = getTarget(targets, metadata);
|
|
23
|
+
if (matchedTarget) {
|
|
24
|
+
if (verbose) {
|
|
25
|
+
logger.info(`Found matching target for metadata. Resolving configurations for target "${JSON.stringify(matchedTarget.where)}"...\n`);
|
|
26
|
+
}
|
|
27
|
+
targetRules = matchedTarget.rules;
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
if (verbose) {
|
|
31
|
+
logger.info(`No matching target found for metadata. Proceeding with level configurations only.\n`);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
levelConfigs = await resolveConfigForTarget(apiPath, targetRules, scorecardConfig.levels || [], pluginsList, configPath || '');
|
|
36
|
+
for (const level of scorecardConfig.levels || []) {
|
|
11
37
|
if (verbose) {
|
|
12
38
|
logger.info(`\nValidating level: "${level.name}"\n`);
|
|
13
39
|
}
|
|
14
|
-
const plugins = typeof pluginsCodeOrPlugins === 'string'
|
|
15
|
-
? await evaluatePluginsFromCode(pluginsCodeOrPlugins, verbose)
|
|
16
|
-
: pluginsCodeOrPlugins;
|
|
17
40
|
if (verbose && plugins && plugins.length > 0) {
|
|
18
41
|
logger.info(`Using ${plugins.length} ${pluralize('plugin', plugins.length)} for this level.\n`);
|
|
19
42
|
}
|
|
20
|
-
const config =
|
|
21
|
-
configPath,
|
|
22
|
-
});
|
|
43
|
+
const config = levelConfigs[level.name];
|
|
23
44
|
if (verbose) {
|
|
24
45
|
logger.info(`Linting document against level rules...\n`);
|
|
25
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-scorecard.js","sourceRoot":"","sources":["../../../../src/commands/scorecard-classic/validation/validate-scorecard.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"validate-scorecard.js","sourceRoot":"","sources":["../../../../src/commands/scorecard-classic/validation/validate-scorecard.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { Config, Oas3Definition, Oas2Definition, Exact } from '@redocly/ope
|
|
|
2
2
|
import type { Totals, Entrypoint, OutputExtension, 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[]>;
|
|
5
|
+
export declare function getAliasOrPath(config: Config, aliasOrPath: string): Entrypoint;
|
|
5
6
|
export declare function getExecutionTime(startedAt: number): string;
|
|
6
7
|
export declare function printExecutionTime(commandName: string, startedAt: number, api: string): void;
|
|
7
8
|
export declare function pathToFilename(path: string, pathSeparator: string): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miscellaneous.d.ts","sourceRoot":"","sources":["../../src/utils/miscellaneous.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAY3F,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAGpF,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAEjC,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAAE,GAAG,SAAS,EAC9B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,EAAE,CAAC,CAevB;
|
|
1
|
+
{"version":3,"file":"miscellaneous.d.ts","sourceRoot":"","sources":["../../src/utils/miscellaneous.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ function fallbackToAllDefinitions(config) {
|
|
|
41
41
|
output: output && resolve(getConfigDirectory(config), output),
|
|
42
42
|
}));
|
|
43
43
|
}
|
|
44
|
-
function getAliasOrPath(config, aliasOrPath) {
|
|
44
|
+
export function getAliasOrPath(config, aliasOrPath) {
|
|
45
45
|
const configDir = getConfigDirectory(config);
|
|
46
46
|
const aliasApi = config.resolvedConfig.apis?.[aliasOrPath];
|
|
47
47
|
return aliasApi
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miscellaneous.js","sourceRoot":"","sources":["../../src/utils/miscellaneous.ts"],"names":[],"mappings":"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"}
|
|
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.
|
|
3
|
+
"version": "2.23.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"bin": {
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"@opentelemetry/resources": "2.0.1",
|
|
43
43
|
"@opentelemetry/sdk-trace-node": "2.0.1",
|
|
44
44
|
"@opentelemetry/semantic-conventions": "1.34.0",
|
|
45
|
-
"@redocly/openapi-core": "2.
|
|
46
|
-
"@redocly/respect-core": "2.
|
|
45
|
+
"@redocly/openapi-core": "2.23.0",
|
|
46
|
+
"@redocly/respect-core": "2.23.0",
|
|
47
47
|
"abort-controller": "^3.0.0",
|
|
48
48
|
"ajv": "npm:@redocly/ajv@8.18.0",
|
|
49
49
|
"ajv-formats": "^3.0.1",
|