@asyncapi/cli 2.8.1 → 2.9.0

package/assets/create-glee-app/templates/default/package-lock.json

@@ -5369,9 +5369,9 @@
       "peer": true
     },
     "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -5908,16 +5908,16 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",
-      "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
+      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
       "dependencies": {
         "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
-        "cookie": "~0.4.1",
+        "cookie": "~0.7.2",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.2.1",
@@ -11794,15 +11794,15 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.5.tgz",
-      "integrity": "sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
+        "engine.io": "~6.6.0",
         "socket.io-adapter": "~2.5.2",
         "socket.io-parser": "~4.2.4"
       },

package/assets/create-glee-app/templates/tutorial/package-lock.json

@@ -5366,9 +5366,9 @@
       "peer": true
     },
     "node_modules/cookie": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
-      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -5905,16 +5905,16 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz",
-      "integrity": "sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==",
+      "version": "6.6.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
+      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
       "dependencies": {
         "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
-        "cookie": "~0.4.1",
+        "cookie": "~0.7.2",
         "cors": "~2.8.5",
         "debug": "~4.3.1",
         "engine.io-parser": "~5.2.1",
@@ -11791,15 +11791,15 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.7.5.tgz",
-      "integrity": "sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
+      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
       "dependencies": {
         "accepts": "~1.3.4",
         "base64id": "~2.0.0",
         "cors": "~2.8.5",
         "debug": "~4.3.2",
-        "engine.io": "~6.5.2",
+        "engine.io": "~6.6.0",
         "socket.io-adapter": "~2.5.2",
         "socket.io-parser": "~4.2.4"
       },

package/lib/commands/diff.d.ts

@@ -6,6 +6,7 @@ export default class Diff extends Command {
         'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
         'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         format: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         type: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;

package/lib/commands/validate.d.ts

@@ -6,6 +6,7 @@ export default class Validate extends Command {
         'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
         'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
         watch: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };

package/lib/core/flags/diff.flags.d.ts

@@ -2,6 +2,7 @@ export declare const diffFlags: () => {
     'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
     'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
     format: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     type: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;

package/lib/core/flags/validate.flags.d.ts

@@ -3,6 +3,7 @@ export declare const validateFlags: () => {
     'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<import("@stoplight/spectral-cli/dist/services/config").OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
     'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
     watch: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
 };

package/lib/core/parser.d.ts

@@ -16,11 +16,13 @@ export declare function validationFlags({ logDiagnostics }?: ValidationFlagsOpti
     'log-diagnostics': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     'diagnostics-format': import("@oclif/core/lib/interfaces").OptionFlag<OutputFormat, import("@oclif/core/lib/interfaces").CustomOptions>;
     'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
 };
 export interface ValidateOptions {
     'log-diagnostics'?: boolean;
     'diagnostics-format'?: `${OutputFormat}`;
     'fail-severity'?: SeverityKind;
+    'output'?: string;
 }
 export declare function validate(command: Command, specFile: Specification, options?: ValidateOptions): Promise<"valid" | "invalid">;
 export declare function parse(command: Command, specFile: Specification, options?: ValidateOptions): Promise<{

package/lib/core/parser.js

@@ -13,6 +13,19 @@ const spectral_core_1 = require("@stoplight/spectral-core");
 const config_1 = require("@stoplight/spectral-cli/dist/services/config");
 const spectral_formatters_1 = require("@stoplight/spectral-formatters");
 const chalk_1 = require("chalk");
+const fs_1 = require("fs");
+const path_1 = tslib_1.__importDefault(require("path"));
+const { writeFile } = fs_1.promises;
+const formatExtensions = {
+    stylish: '.txt',
+    json: '.json',
+    junit: '.xml',
+    html: '.html',
+    text: '.txt',
+    teamcity: '.txt',
+    pretty: '.txt',
+};
+const validFormats = ['stylish', 'json', 'junit', 'html', 'text', 'teamcity', 'pretty'];
 const parser = new cjs_1.Parser({
     __unstable: {
         resolver: {
@@ -46,6 +59,10 @@ function validationFlags({ logDiagnostics = true } = {}) {
             options: ['error', 'warn', 'info', 'hint'],
             default: 'error',
         })(),
+        output: core_1.Flags.string({
+            description: 'The output file name. Omitting this flag the result will be printed in the console.',
+            char: 'o'
+        })
     };
 }
 exports.validationFlags = validationFlags;
@@ -70,23 +87,33 @@ function logDiagnostics(diagnostics, command, specFile, options = {}) {
     const failSeverity = (_a = options['fail-severity']) !== null && _a !== void 0 ? _a : 'error';
     const diagnosticsFormat = (_b = options['diagnostics-format']) !== null && _b !== void 0 ? _b : 'stylish';
     const sourceString = specFile.toSourceString();
-    if (diagnostics.length) {
-        if (hasFailSeverity(diagnostics, failSeverity)) {
-            if (logDiagnostics) {
-                command.logToStderr(`\n${sourceString} and/or referenced documents have governance issues.`);
-                command.logToStderr(formatOutput(diagnostics, diagnosticsFormat, failSeverity));
-            }
-            return ValidationStatus.INVALID;
-        }
-        if (logDiagnostics) {
-            command.log(`\n${sourceString} is valid but has (itself and/or referenced documents) governance issues.`);
-            command.log(formatOutput(diagnostics, diagnosticsFormat, failSeverity));
-        }
+    const hasIssues = diagnostics.length > 0;
+    const isFailSeverity = hasIssues && hasFailSeverity(diagnostics, failSeverity);
+    if (logDiagnostics) {
+        logGovernanceMessage(command, sourceString, hasIssues, isFailSeverity);
+        outputDiagnostics(command, diagnostics, diagnosticsFormat, failSeverity, options);
     }
-    else if (logDiagnostics) {
+    return isFailSeverity ? ValidationStatus.INVALID : ValidationStatus.VALID;
+}
+function logGovernanceMessage(command, sourceString, hasIssues, isFailSeverity) {
+    if (!hasIssues) {
         command.log(`\n${sourceString} is valid! ${sourceString} and referenced documents don't have governance issues.`);
     }
-    return ValidationStatus.VALID;
+    else if (isFailSeverity) {
+        command.logToStderr(`\n${sourceString} and/or referenced documents have governance issues.`);
+    }
+    else {
+        command.log(`\n${sourceString} is valid but has (itself and/or referenced documents) governance issues.`);
+    }
+}
+function outputDiagnostics(command, diagnostics, diagnosticsFormat, failSeverity, options) {
+    const diagnosticsOutput = formatOutput(diagnostics, diagnosticsFormat, failSeverity);
+    if (options.output) {
+        writeValidationDiagnostic(options.output, command, diagnosticsFormat, diagnosticsOutput);
+    }
+    else {
+        command.log(diagnosticsOutput);
+    }
 }
 function formatOutput(diagnostics, format, failSeverity) {
     const diagnosticSeverity = (0, spectral_core_1.getDiagnosticSeverity)(failSeverity);
@@ -128,3 +155,22 @@ function hasFailSeverity(diagnostics, failSeverity) {
     const diagnosticSeverity = (0, spectral_core_1.getDiagnosticSeverity)(failSeverity);
     return diagnostics.some(diagnostic => diagnostic.severity <= diagnosticSeverity);
 }
+function writeValidationDiagnostic(outputPath, command, format, formatOutput) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (!validFormats.includes(format)) {
+            command.logToStderr(`Invalid diagnostics format: "${format}"`);
+            return;
+        }
+        const expectedExtension = formatExtensions[format];
+        const actualExtension = path_1.default.extname(outputPath);
+        // Validate file extension against diagnostics format
+        if (expectedExtension && (actualExtension !== expectedExtension)) {
+            command.logToStderr(`Invalid file extension for format "${format}". Expected extension: "${expectedExtension}"`);
+        }
+        else {
+            yield writeFile(path_1.default.resolve(process.cwd(), outputPath), formatOutput, {
+                encoding: 'utf-8',
+            }).catch(err => console.log(err));
+        }
+    });
+}

package/oclif.manifest.json

@@ -267,6 +267,14 @@
             "hint"
           ],
           "type": "option"
+        },
+        "output": {
+          "char": "o",
+          "description": "The output file name. Omitting this flag the result will be printed in the console.",
+          "name": "output",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -437,6 +445,14 @@
           ],
           "type": "option"
         },
+        "output": {
+          "char": "o",
+          "description": "The output file name. Omitting this flag the result will be printed in the console.",
+          "name": "output",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "score": {
           "description": "Compute the score of the AsyncAPI document. Scoring is based on whether the document has description, license, server and/or channels.",
           "name": "score",
@@ -757,9 +773,8 @@
         },
         "output": {
           "char": "o",
-          "description": "The output directory where the models should be written to. Omitting this flag will write the models to `stdout`.",
+          "description": "The output file name. Omitting this flag the result will be printed in the console.",
           "name": "output",
-          "required": false,
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -1622,5 +1637,5 @@
       ]
     }
   },
-  "version": "2.8.1"
+  "version": "2.9.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "2.8.1",
+  "version": "2.9.0",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"