@redocly/cli 1.34.3 → 2.0.0-next.0

package/lib/wrapper.js

@@ -1,22 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.commandWrapper = commandWrapper;
-const openapi_core_1 = require("@redocly/openapi-core");
-const utils_1 = require("@redocly/openapi-core/lib/utils");
-const update_version_notifier_1 = require("./utils/update-version-notifier");
-const miscellaneous_1 = require("./utils/miscellaneous");
-const lint_1 = require("./commands/lint");
-function commandWrapper(commandHandler) {
+import { detectSpec, doesYamlFileExist, isPlainObject, logger, HandledError, } from '@redocly/openapi-core';
+import { version } from './utils/package.js';
+import { loadConfigAndHandleErrors } from './utils/miscellaneous.js';
+import { sendTelemetry, collectXSecurityAuthTypes } from './utils/telemetry.js';
+import { AbortFlowError, exitWithError } from './utils/error.js';
+export function commandWrapper(commandHandler) {
     return async (argv) => {
         let code = 2;
-        let hasConfig;
         let telemetry;
         let specVersion;
         let specKeyword;
         let specFullVersion;
+        let config;
+        const respectXSecurityAuthTypes = [];
         const collectSpecData = (document) => {
-            specVersion = (0, openapi_core_1.detectSpec)(document);
-            if (!(0, utils_1.isPlainObject)(document))
+            specVersion = detectSpec(document);
+            if (!isPlainObject(document))
                 return;
             specKeyword = document?.openapi
                 ? 'openapi'
@@ -32,32 +30,46 @@ function commandWrapper(commandHandler) {
             if (specKeyword) {
                 specFullVersion = document[specKeyword];
             }
+            if (specVersion === 'arazzo1') {
+                collectXSecurityAuthTypes(document, respectXSecurityAuthTypes);
+            }
         };
         try {
-            if (argv.config && !(0, openapi_core_1.doesYamlFileExist)(argv.config)) {
-                (0, miscellaneous_1.exitWithError)('Please provide a valid path to the configuration file.');
+            if (argv.config && !doesYamlFileExist(argv.config)) {
+                exitWithError('Please provide a valid path to the configuration file.');
             }
-            const config = (await (0, miscellaneous_1.loadConfigAndHandleErrors)({
-                configPath: argv.config,
-                customExtends: argv.extends,
-                region: argv.region,
-                files: argv.files,
-                processRawConfig: (0, lint_1.lintConfigCallback)(argv, update_version_notifier_1.version),
-            }));
-            telemetry = config.telemetry;
-            hasConfig = !config.styleguide.recommendedFallback;
+            config = await loadConfigAndHandleErrors(argv, version);
+            telemetry = config.resolvedConfig.telemetry;
             code = 1;
             if (typeof commandHandler === 'function') {
-                await commandHandler({ argv, config, version: update_version_notifier_1.version, collectSpecData });
+                await commandHandler({ argv, config, version, collectSpecData });
             }
             code = 0;
         }
         catch (err) {
-            // Do nothing
+            if (err instanceof AbortFlowError) {
+                // do nothing
+            }
+            else if (err instanceof HandledError) {
+                logger.error(err.message + '\n\n');
+            }
+            else {
+                logger.error('An unexpected error occurred. This is likely a bug that should be reported.\n');
+                logger.error(err instanceof Error ? err.stack || err.message : String(err));
+                logger.error('\n');
+            }
         }
         finally {
             if (process.env.REDOCLY_TELEMETRY !== 'off' && telemetry !== 'off') {
-                await (0, miscellaneous_1.sendTelemetry)(argv, code, hasConfig, specVersion, specKeyword, specFullVersion);
+                await sendTelemetry({
+                    config,
+                    argv,
+                    exit_code: code,
+                    spec_version: specVersion,
+                    spec_keyword: specKeyword,
+                    spec_full_version: specFullVersion,
+                    respect_x_security_auth_types: respectXSecurityAuthTypes,
+                });
             }
             process.once('beforeExit', () => {
                 process.exit(code);
@@ -65,3 +77,4 @@ function commandWrapper(commandHandler) {
         }
     };
 }
+//# sourceMappingURL=wrapper.js.map

package/lib/wrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../src/wrapper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "@redocly/cli",
-  "version": "1.34.3",
+  "version": "2.0.0-next.0",
   "description": "",
   "license": "MIT",
   "bin": {
     "redocly": "bin/cli.js",
     "openapi": "bin/cli.js"
   },
+  "type": "module",
   "engines": {
-    "node": ">=18.17.0",
-    "npm": ">=9.5.0"
+    "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+    "npm": ">=10"
   },
   "engineStrict": true,
   "scripts": {
     "compile": "tsc",
-    "copy-assets": "cp src/commands/preview-docs/preview-server/default.hbs lib/commands/preview-docs/preview-server/default.hbs && cp src/commands/preview-docs/preview-server/hot.js lib/commands/preview-docs/preview-server/hot.js && cp src/commands/preview-docs/preview-server/oauth2-redirect.html lib/commands/preview-docs/preview-server/oauth2-redirect.html && cp src/commands/build-docs/template.hbs lib/commands/build-docs/template.hbs ",
+    "copy-assets": "cp src/commands/build-docs/template.hbs lib/commands/build-docs/template.hbs ",
     "prepack": "npm run copy-assets",
     "prepublishOnly": "npm run copy-assets && cp ../../README.md ."
   },
@@ -37,24 +38,23 @@
     "Roman Hotsiy <roman@redocly.com> (https://redocly.com/)"
   ],
   "dependencies": {
-    "@redocly/config": "^0.22.0",
-    "@redocly/openapi-core": "1.34.3",
-    "@redocly/respect-core": "1.34.3",
+    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.202.0",
+    "@opentelemetry/resources": "2.0.1",
+    "@opentelemetry/sdk-trace-node": "2.0.1",
+    "@opentelemetry/semantic-conventions": "1.34.0",
+    "@redocly/config": "^0.26.2",
+    "@redocly/openapi-core": "2.0.0-next.0",
+    "@redocly/respect-core": "2.0.0-next.0",
     "abort-controller": "^3.0.0",
     "chokidar": "^3.5.1",
     "colorette": "^1.2.0",
-    "core-js": "^3.32.1",
     "dotenv": "^16.4.7",
     "form-data": "^4.0.0",
-    "get-port-please": "^3.0.1",
-    "glob": "^7.1.6",
+    "glob": "^11.0.1",
     "handlebars": "^4.7.6",
+    "https-proxy-agent": "^7.0.5",
     "mobx": "^6.0.4",
-    "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
-    "@opentelemetry/resources": "1.26.0",
-    "@opentelemetry/sdk-trace-node": "1.26.0",
-    "@opentelemetry/semantic-conventions": "1.27.0",
     "pluralize": "^8.0.0",
     "react": "^17.0.0 || ^18.2.0 || ^19.0.0",
     "react-dom": "^17.0.0 || ^18.2.0 || ^19.0.0",
@@ -66,7 +66,6 @@
   },
   "devDependencies": {
     "@types/configstore": "^5.0.1",
-    "@types/glob": "^8.1.0",
     "@types/pluralize": "^0.0.29",
     "@types/react": "^17.0.0 || ^18.2.21 || ^19.0.0",
     "@types/react-dom": "^17.0.0 || ^18.2.7 || ^19.0.0",