@redocly/cli 2.0.4 → 2.0.6

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.
Files changed (20) hide show
  1. package/lib/commands/build-docs/index.d.ts.map +1 -1
  2. package/lib/commands/build-docs/index.js +1 -1
  3. package/lib/commands/build-docs/index.js.map +1 -1
  4. package/lib/commands/build-docs/utils.d.ts +1 -1
  5. package/lib/commands/build-docs/utils.d.ts.map +1 -1
  6. package/lib/commands/build-docs/utils.js +2 -3
  7. package/lib/commands/build-docs/utils.js.map +1 -1
  8. package/lib/commands/bundle.d.ts.map +1 -1
  9. package/lib/commands/bundle.js +7 -2
  10. package/lib/commands/bundle.js.map +1 -1
  11. package/lib/commands/join.d.ts.map +1 -1
  12. package/lib/commands/join.js +28 -26
  13. package/lib/commands/join.js.map +1 -1
  14. package/lib/commands/lint.d.ts.map +1 -1
  15. package/lib/commands/lint.js +6 -1
  16. package/lib/commands/lint.js.map +1 -1
  17. package/lib/commands/stats.d.ts.map +1 -1
  18. package/lib/commands/stats.js +2 -1
  19. package/lib/commands/stats.js.map +1 -1
  20. package/package.json +3 -3
package/lib/commands/build-docs/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/build-docs/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIpD,eAAO,MAAM,mBAAmB,uCAI7B,WAAW,CAAC,aAAa,CAAC,kBAwC5B,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/build-docs/index.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAIpD,eAAO,MAAM,mBAAmB,uCAI7B,WAAW,CAAC,aAAa,CAAC,kBAuC5B,CAAC"}
package/lib/commands/build-docs/index.js CHANGED
@@ -18,7 +18,7 @@ export const handlerBuildCommand = async ({ argv, config, collectSpecData, }) =>
18
18
  disableGoogleFont: argv.disableGoogleFont,
19
19
  templateFileName: argv.template,
20
20
  templateOptions: argv.templateOptions || {},
21
- redocOptions: getObjectOrJSON(argv.theme?.openapi, config, alias),
21
+ redocOptions: getObjectOrJSON(argv.theme?.openapi, config.forAlias(alias)),
22
22
  };
23
23
  const redocCurrentVersion = packageJson.dependencies.redoc;
24
24
  try {
package/lib/commands/build-docs/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/build-docs/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAKrD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,SAAS,CAAC,CAAC,uBAAuB,CAAC,CAAC;AAEzF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,IAAI,EACJ,MAAM,EACN,eAAe,GACY,EAAE,EAAE;IAC/B,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAEpC,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7E,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAE3C,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,IAAI,CAAC,CAAC;QACd,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,gBAAgB,EAAE,IAAI,CAAC,QAAQ;QAC/B,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,EAAE;QAC3C,YAAY,EAAE,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC;KAClE,CAAC;IAEF,MAAM,mBAAmB,GAAG,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC;IAE3D,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,iBAAiB,CACvC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAC1D,CAAC;QACF,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,GAAG,EACH,SAAS,EACT,EAAE,GAAG,OAAO,EAAE,mBAAmB,EAAE,EACnC,IAAI,CAAC,MAAM,CACZ,CAAC;QAEF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QAChE,MAAM,CAAC,IAAI,CACT,iCAAiC,OAAO,CAAC,MAAM,KAAK,SAAS,YAAY,OAAO,MAAM,CACvF,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,aAAa,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/build-docs/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAKrD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,SAAS,CAAC,CAAC,uBAAuB,CAAC,CAAC;AAEzF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,IAAI,EACJ,MAAM,EACN,eAAe,GACY,EAAE,EAAE;IAC/B,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAEpC,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC7E,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,IAAI,CAAC,CAAC;QACd,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;QACzC,gBAAgB,EAAE,IAAI,CAAC,QAAQ;QAC/B,eAAe,EAAE,IAAI,CAAC,eAAe,IAAI,EAAE;QAC3C,YAAY,EAAE,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC3E,CAAC;IAEF,MAAM,mBAAmB,GAAG,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC;IAE3D,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,iBAAiB,CACvC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAC1D,CAAC;QACF,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC;QACvB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,GAAG,EACH,SAAS,EACT,EAAE,GAAG,OAAO,EAAE,mBAAmB,EAAE,EACnC,IAAI,CAAC,MAAM,CACZ,CAAC;QAEF,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;QAChE,MAAM,CAAC,IAAI,CACT,iCAAiC,OAAO,CAAC,MAAM,KAAK,SAAS,YAAY,OAAO,MAAM,CACvF,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,aAAa,CAAC,CAAC,CAAC,CAAC;IACnB,CAAC;AACH,CAAC,CAAC"}
package/lib/commands/build-docs/utils.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import type { Config } from '@redocly/openapi-core';
2
2
  import type { BuildDocsOptions } from './types.js';
3
- export declare function getObjectOrJSON(openapiOptions: string | Record<string, unknown>, config: Config, alias?: string): JSON | Record<string, unknown> | Config;
3
+ export declare function getObjectOrJSON(openapiOptions: string | Record<string, unknown>, config: Config): JSON | Record<string, unknown> | Config;
4
4
  export declare function getPageHTML(api: any, pathToApi: string, { title, disableGoogleFont, templateFileName, templateOptions, redocOptions, redocCurrentVersion, }: BuildDocsOptions, configPath?: string): Promise<string>;
5
5
  export declare function sanitizeJSONString(str: string): string;
6
6
  export declare function escapeClosingScriptTag(str: string): string;
package/lib/commands/build-docs/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/commands/build-docs/utils.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAMnD,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChD,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,GACb,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CA4BzC;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,EACjB,EACE,KAAK,EACL,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,YAAiB,EACjB,mBAAmB,GACpB,EAAE,gBAAgB,EACnB,UAAU,CAAC,EAAE,MAAM,mBAmCpB;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAGD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1D;AAGD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/commands/build-docs/utils.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAMnD,wBAAgB,eAAe,CAC7B,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChD,MAAM,EAAE,MAAM,GACb,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CA2BzC;AAED,wBAAsB,WAAW,CAC/B,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,MAAM,EACjB,EACE,KAAK,EACL,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,YAAiB,EACjB,mBAAmB,GACpB,EAAE,gBAAgB,EACnB,UAAU,CAAC,EAAE,MAAM,mBAmCpB;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAGD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE1D;AAGD,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEjD"}
package/lib/commands/build-docs/utils.js CHANGED
@@ -11,7 +11,7 @@ import { exitWithError } from '../../utils/error.js';
11
11
  const __internalDirname = import.meta.url
12
12
  ? path.dirname(url.fileURLToPath(import.meta.url))
13
13
  : __dirname;
14
- export function getObjectOrJSON(openapiOptions, config, alias) {
14
+ export function getObjectOrJSON(openapiOptions, config) {
15
15
  switch (typeof openapiOptions) {
16
16
  case 'object':
17
17
  return openapiOptions;
@@ -32,8 +32,7 @@ export function getObjectOrJSON(openapiOptions, config, alias) {
32
32
  default: {
33
33
  if (config?.configPath) {
34
34
  logger.info(`Found ${config.configPath} and using 'openapi' options\n`);
35
- const apiConfig = alias ? config.resolvedConfig.apis?.[alias] : config.resolvedConfig;
36
- return apiConfig?.openapi ?? {};
35
+ return config.resolvedConfig?.openapi ?? {};
37
36
  }
38
37
  return {};
39
38
  }
package/lib/commands/build-docs/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/build-docs/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACtC,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,GAAG,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAKrD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG;IACvC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC,CAAC,SAAS,CAAC;AAEd,MAAM,UAAU,eAAe,CAC7B,cAAgD,EAChD,MAAc,EACd,KAAc;IAEd,QAAQ,OAAO,cAAc,EAAE,CAAC;QAC9B,KAAK,QAAQ;YACX,OAAO,cAAc,CAAC;QACxB,KAAK,QAAQ;YACX,IAAI,CAAC;gBACH,IAAI,UAAU,CAAC,cAAc,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;oBACrE,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC3D,CAAC;qBAAM,CAAC;oBACN,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CACV,yBAAyB,cAAc,mFAAmF,CAC3H,CAAC;gBACF,aAAa,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC;YACD,MAAM;QACR,OAAO,CAAC,CAAC,CAAC;YACR,IAAI,MAAM,EAAE,UAAU,EAAE,CAAC;gBACvB,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,UAAU,gCAAgC,CAAC,CAAC;gBACxE,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;gBACtF,OAAO,SAAS,EAAE,OAAO,IAAI,EAAE,CAAC;YAClC,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAQ,EACR,SAAiB,EACjB,EACE,KAAK,EACL,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,YAAY,GAAG,EAAE,EACjB,mBAAmB,GACF,EACnB,UAAmB;IAEnB,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAEnC,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC1F,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,IAAI,gBAAgB,EAAE,CAAC;IAErC,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IACxF,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;IACjC,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,EAAE,CAAC;IAEjC,gBAAgB,GAAG,gBAAgB;QACjC,CAAC,CAAC,gBAAgB;QAClB,CAAC,CAAC,YAAY,EAAE,YAAY;YAC5B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,YAAY,CAAC,YAAY,CAAC;YACrF,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/E,OAAO,QAAQ,CAAC;QACd,SAAS,EAAE;wBACS,IAAI,IAAI,EAAE;;QAE1B,yBAAyB,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,EAAE;;;cAGrE,mCAAmC;;gBAEjC;QACZ,SAAS,EACP,+CAA+C,mBAAmB,yCAAyC;YAC3G,GAAG;QACL,KAAK,EAAE,KAAK,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,qBAAqB;QACvD,iBAAiB;QACjB,eAAe;KAChB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAW;IAC5C,OAAO,sBAAsB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAChD,OAAO,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AACnD,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,OAAO,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,GAAG,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACvF,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/build-docs/utils.ts"],"names":[],"mappings":"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"}
package/lib/commands/bundle.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,eAAe,EAAU,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EAAE,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,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,iBA4GzB"}
1
+ {"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,eAAe,EAAU,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EAAE,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,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,iBAsHzB"}
package/lib/commands/bundle.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { performance } from 'perf_hooks';
2
2
  import { blue, gray, green, yellow } from 'colorette';
3
3
  import { writeFileSync } from 'fs';
4
- import { formatProblems, getTotals, bundle, logger } from '@redocly/openapi-core';
4
+ import { formatProblems, getTotals, bundle, logger, } from '@redocly/openapi-core';
5
5
  import { dumpBundle, getExecutionTime, getFallbackApisOrExit, getOutputFileName, handleError, printUnusedWarnings, saveBundle, sortTopLevelKeysForOas, formatPath, } from '../utils/miscellaneous.js';
6
6
  import { AbortFlowError } from '../utils/error.js';
7
7
  export async function handleBundle({ argv, config, version, collectSpecData, }) {
@@ -15,7 +15,12 @@ export async function handleBundle({ argv, config, version, collectSpecData, })
15
15
  const aliasConfig = config.forAlias(alias);
16
16
  aliasConfig.skipPreprocessors(argv['skip-preprocessor']);
17
17
  aliasConfig.skipDecorators(argv['skip-decorator']);
18
- logger.info(gray(`bundling ${formatPath(path)}...\n`));
18
+ if (alias === undefined) {
19
+ logger.info(gray(`bundling ${formatPath(path)}...\n`));
20
+ }
21
+ else {
22
+ logger.info(gray(`bundling ${formatPath(path)} using configuration for api '${alias}'...\n`));
23
+ }
19
24
  const { bundle: result, problems, ...meta } = await bundle({
20
25
  ref: path,
21
26
  config: aliasConfig,
package/lib/commands/bundle.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,qBAAqB,EACrB,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EACnB,UAAU,EACV,sBAAsB,EACtB,UAAU,GACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAmBnD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EACjC,IAAI,EACJ,MAAM,EACN,OAAO,EACP,eAAe,GACS;IACxB,MAAM,sBAAsB,GAC1B,IAAI,CAAC,0BAA0B,CAAC;QAChC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,cAAc,CAAC,0BAA0B,CAAC,CAAC,CAAC,8BAA8B;IAC9G,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAW,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;IAE9D,KAAK,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;YACpC,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC3C,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;YACzD,WAAW,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAEnD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YAEvD,MAAM,EACJ,MAAM,EAAE,MAAM,EACd,QAAQ,EACR,GAAG,IAAI,EACR,GAAG,MAAM,MAAM,CAAC;gBACf,GAAG,EAAE,IAAI;gBACT,MAAM,EAAE,WAAW;gBACnB,WAAW,EAAE,IAAI,CAAC,YAAY;gBAC9B,sBAAsB;gBACtB,WAAW,EAAE,IAAI,CAAC,qBAAqB,CAAC;gBACxC,eAAe;aAChB,CAAC,CAAC;YAEH,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,GAAG,iBAAiB,CAAC;gBAC5C,UAAU,EAAE,IAAI;gBAChB,MAAM;gBACN,UAAU,EAAE,IAAI,CAAC,MAAM;gBACvB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;aACjC,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC1C,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,OAAO,GAAG,UAAU,CACxB,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EACrC,IAAI,CAAC,GAAG,IAAI,MAAM,EAClB,IAAI,CAAC,YAAY,CAClB,CAAC;oBACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBACzB,CAAC;qBAAM,CAAC;oBACN,MAAM,OAAO,GAAG,UAAU,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;oBAC1F,UAAU,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC;YAED,MAAM,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC;YACnC,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC;YACvC,MAAM,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC;YAErC,cAAc,CAAC,QAAQ,EAAE;gBACvB,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,UAAU;gBAClB,OAAO;aACR,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpB,MAAM,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC;gBACvF,CAAC;gBACD,CAAC;oBACC,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC;YAED,MAAM,OAAO,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAC5C,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CACT,0BAA0B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,CACzD,UAAU,IAAI,QAAQ,CACvB,gBAAgB,KAAK,CAAC,OAAO,CAAC,MAAM,MAAM,CAAC,mCAAmC,CAAC,KAAK,CACtF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,CACT,uCAAuC,IAAI,CACzC,UAAU,CAAC,IAAI,CAAC,CACjB,wDAAwD,CAC1D,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CACT,2BAA2B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,CAC1D,UAAU,IAAI,QAAQ,CACvB,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CACzB,CAAC;YACJ,CAAC;YAED,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,0BAA0B,CAAC,EAAE,YAAY,CAAC;YACnF,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,YAAY,uBAAuB,CAAC,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,WAAW,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE5B,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAC7C,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../src/commands/bundle.ts"],"names":[],"mappings":"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"}
package/lib/commands/join.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../src/commands/join.ts"],"names":[],"mappings":"AAwCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAgBvD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,kCAAkC,CAAC,EAAE,MAAM,CAAC;IAC5C,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,mBAAmB,CAAC;AAExB,wBAAsB,UAAU,CAAC,EAC/B,IAAI,EACJ,MAAM,EACN,OAAO,EAAE,cAAc,EACvB,eAAe,GAChB,EAAE,WAAW,CAAC,QAAQ,CAAC,sBA4jBvB"}
1
+ {"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../src/commands/join.ts"],"names":[],"mappings":"AAyCA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAgBvD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,kCAAkC,CAAC,EAAE,MAAM,CAAC;IAC5C,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,mBAAmB,CAAC;AAExB,wBAAsB,UAAU,CAAC,EAC/B,IAAI,EACJ,MAAM,EACN,OAAO,EAAE,cAAc,EACvB,eAAe,GAChB,EAAE,WAAW,CAAC,QAAQ,CAAC,sBAkkBvB"}
package/lib/commands/join.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import * as path from 'node:path';
2
2
  import { red, blue, yellow, green } from 'colorette';
3
3
  import { performance } from 'node:perf_hooks';
4
- import { BaseResolver, formatProblems, getTotals, detectSpec, bundleDocument, isRef, dequal, logger, isString, isPlainObject, keysOf, } from '@redocly/openapi-core';
4
+ import { BaseResolver, formatProblems, getTotals, detectSpec, bundleDocument, isRef, dequal, logger, isString, isPlainObject, keysOf, isEmptyObject, } from '@redocly/openapi-core';
5
5
  import { getFallbackApisOrExit, printExecutionTime, sortTopLevelKeysForOas, getAndValidateFileExtension, writeToFileByExtension, } from '../utils/miscellaneous.js';
6
6
  import { exitWithError } from '../utils/error.js';
7
7
  import { COMPONENTS, OPENAPI3_METHOD_NAMES } from './split/types.js';
@@ -74,6 +74,14 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
74
74
  return exitWithError(`${e.message}: ${blue(document.source.absoluteRef)}.`);
75
75
  }
76
76
  }
77
+ const [first, ...others] = (documents ?? []);
78
+ const serversAreTheSame = others.every(({ parsed: { paths, servers } }) => {
79
+ // include only documents with paths
80
+ if (!paths || isEmptyObject(paths || {})) {
81
+ return true;
82
+ }
83
+ return servers?.every((server) => first.parsed.servers?.find(({ url }) => url === server.url));
84
+ });
77
85
  const joinedDef = {};
78
86
  const potentialConflicts = {
79
87
  tags: {},
@@ -82,8 +90,13 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
82
90
  webhooks: {},
83
91
  };
84
92
  addInfoSectionAndSpecVersion(documents, prefixComponentsWithInfoProp);
93
+ if (serversAreTheSame && first.parsed.servers) {
94
+ joinedDef.servers = first.parsed.servers;
95
+ }
85
96
  for (const document of documents) {
86
- const openapi = document.parsed;
97
+ const openapi = isPlainObject(document.parsed)
98
+ ? document.parsed
99
+ : {};
87
100
  const { tags, info } = openapi;
88
101
  const api = path.relative(process.cwd(), document.source.absoluteRef);
89
102
  const apiFilename = getApiFilename(api);
@@ -106,9 +119,8 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
106
119
  if (tags) {
107
120
  populateTags(context);
108
121
  }
109
- collectServers(openapi);
110
122
  collectExternalDocs(openapi, context);
111
- collectPaths(openapi, context);
123
+ collectPaths(openapi, context, serversAreTheSame);
112
124
  collectComponents(openapi, context);
113
125
  collectWebhooks(oasVersion, openapi, context);
114
126
  if (componentsPrefix) {
@@ -132,7 +144,7 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
132
144
  if (withoutXTagGroups && !potentialConflicts.tags.hasOwnProperty('description')) {
133
145
  potentialConflicts.tags['description'] = {};
134
146
  }
135
- for (const tag of tags) {
147
+ for (const tag of tags || []) {
136
148
  const entrypointTagName = addPrefix(tag.name, tagsPrefix);
137
149
  if (tag.description) {
138
150
  tag.description = addComponentsPrefix(tag.description, componentsPrefix);
@@ -189,19 +201,6 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
189
201
  joinedDef[xTagGroups][indexGroup][Tags].push(entrypointTagName);
190
202
  }
191
203
  }
192
- function collectServers(openapi) {
193
- const { servers } = openapi;
194
- if (servers) {
195
- if (!joinedDef.hasOwnProperty('servers')) {
196
- joinedDef['servers'] = [];
197
- }
198
- for (const server of servers) {
199
- if (!joinedDef.servers.some((s) => s.url === server.url)) {
200
- joinedDef.servers.push(server);
201
- }
202
- }
203
- }
204
- }
205
204
  function collectExternalDocs(openapi, { api }) {
206
205
  const { externalDocs } = openapi;
207
206
  if (externalDocs) {
@@ -212,8 +211,8 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
212
211
  joinedDef['externalDocs'] = externalDocs;
213
212
  }
214
213
  }
215
- function collectPaths(openapi, { apiFilename, apiTitle, api, potentialConflicts, tagsPrefix, componentsPrefix, }) {
216
- const { paths } = openapi;
214
+ function collectPaths(openapi, { apiFilename, apiTitle, api, potentialConflicts, tagsPrefix, componentsPrefix, }, serversAreTheSame) {
215
+ const { paths, servers: rootServers } = openapi;
217
216
  const operationsSet = new Set(OPENAPI3_METHOD_NAMES);
218
217
  if (paths) {
219
218
  if (!joinedDef.hasOwnProperty('paths')) {
@@ -227,13 +226,16 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
227
226
  potentialConflicts.paths[path] = {};
228
227
  }
229
228
  const pathItem = paths[path];
229
+ const servers = serversAreTheSame
230
+ ? pathItem.servers
231
+ : pathItem.servers || rootServers || [];
232
+ if (servers) {
233
+ collectPathServers(servers, path);
234
+ }
230
235
  for (const field of keysOf(pathItem)) {
231
236
  if (operationsSet.has(field)) {
232
237
  collectPathOperation(pathItem, path, field);
233
238
  }
234
- if (field === 'servers') {
235
- collectPathServers(pathItem, path);
236
- }
237
239
  if (field === 'parameters') {
238
240
  collectPathParameters(pathItem, path);
239
241
  }
@@ -252,14 +254,14 @@ export async function handleJoin({ argv, config, version: packageVersion, collec
252
254
  }
253
255
  joinedDef.paths[path][field] = fieldValue;
254
256
  }
255
- function collectPathServers(pathItem, path) {
256
- if (!pathItem.servers) {
257
+ function collectPathServers(servers, path) {
258
+ if (!servers) {
257
259
  return;
258
260
  }
259
261
  if (!joinedDef.paths[path].hasOwnProperty('servers')) {
260
262
  joinedDef.paths[path].servers = [];
261
263
  }
262
- for (const server of pathItem.servers) {
264
+ for (const server of servers) {
263
265
  let isFoundServer = false;
264
266
  for (const pathServer of joinedDef.paths[path].servers) {
265
267
  if (pathServer.url === server.url) {
package/lib/commands/join.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"join.js","sourceRoot":"","sources":["../../src/commands/join.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"join.js","sourceRoot":"","sources":["../../src/commands/join.ts"],"names":[],"mappings":"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"}
package/lib/commands/lint.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAU,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC,GAAG,mBAAmB,CAAC;AAExB,wBAAsB,UAAU,CAAC,EAC/B,IAAI,EACJ,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE,WAAW,CAAC,QAAQ,CAAC,iBA8EvB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBA+B/F"}
1
+ {"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAU,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC,GAAG,mBAAmB,CAAC;AAExB,wBAAsB,UAAU,CAAC,EAC/B,IAAI,EACJ,MAAM,EACN,OAAO,EACP,eAAe,GAChB,EAAE,WAAW,CAAC,QAAQ,CAAC,iBAqFvB;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBA+B/F"}
package/lib/commands/lint.js CHANGED
@@ -25,7 +25,12 @@ export async function handleLint({ argv, config, version, collectSpecData, }) {
25
25
  if (typeof config.document?.parsed === 'undefined') {
26
26
  logger.info(`No configurations were provided -- using built in ${blue('recommended')} configuration by default.\n\n`);
27
27
  }
28
- logger.info(gray(`validating ${formatPath(path)}...\n`));
28
+ if (alias === undefined) {
29
+ logger.info(gray(`validating ${formatPath(path)}...\n`));
30
+ }
31
+ else {
32
+ logger.info(gray(`validating ${formatPath(path)} using lint rules for api '${alias}'...\n`));
33
+ }
29
34
  const results = await lint({
30
35
  ref: path,
31
36
  config: aliasConfig,
package/lib/commands/lint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lint.js","sourceRoot":"","sources":["../../src/commands/lint.ts"],"names":[],"mappings":"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"}
package/lib/commands/stats.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../src/commands/stats.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAA4C,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACpG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAuEvD,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;CACtB,GAAG,mBAAmB,CAAC;AAExB,wBAAsB,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,iBAyC1F"}
1
+ {"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../src/commands/stats.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAA4C,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACpG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAuEvD,MAAM,MAAM,SAAS,GAAG;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,YAAY,CAAC;CACtB,GAAG,mBAAmB,CAAC;AAExB,wBAAsB,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,EAAE,WAAW,CAAC,SAAS,CAAC,iBA0C1F"}
package/lib/commands/stats.js CHANGED
@@ -66,7 +66,8 @@ export async function handleStats({ argv, config, collectSpecData }) {
66
66
  const startedAt = performance.now();
67
67
  const ctx = {
68
68
  problems: [],
69
- oasVersion: specVersion,
69
+ specVersion,
70
+ config,
70
71
  visitorsData: {},
71
72
  };
72
73
  const resolvedRefMap = await resolveDocument({
package/lib/commands/stats.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stats.js","sourceRoot":"","sources":["../../src/commands/stats.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"stats.js","sourceRoot":"","sources":["../../src/commands/stats.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.0.4",
3
+ "version": "2.0.6",
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.0.4",
46
- "@redocly/respect-core": "2.0.4",
45
+ "@redocly/openapi-core": "2.0.6",
46
+ "@redocly/respect-core": "2.0.6",
47
47
  "abort-controller": "^3.0.0",
48
48
  "chokidar": "^3.5.1",
49
49
  "colorette": "^1.2.0",