@asyncapi/cli 2.10.0 → 2.11.1

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

@@ -5462,9 +5462,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",

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

@@ -5459,9 +5459,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
+      "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",

package/lib/commands/pretty.d.ts

@@ -0,0 +1,12 @@
+import Command from '../core/base';
+export default class Pretty extends Command {
+    static readonly description = "Format AsyncAPI specification file";
+    static readonly examples: string[];
+    static readonly flags: {
+        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
+    static readonly args: {
+        'spec-file': import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+    };
+    run(): Promise<void>;
+}

package/lib/commands/pretty.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const fs_1 = require("fs");
+const yaml = tslib_1.__importStar(require("yaml"));
+const base_1 = tslib_1.__importDefault(require("../core/base"));
+const SpecificationFile_1 = require("../core/models/SpecificationFile");
+const validation_error_1 = require("../core/errors/validation-error");
+const pretty_flags_1 = require("../core/flags/pretty.flags");
+class Pretty extends base_1.default {
+    run() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { args, flags } = yield this.parse(Pretty);
+            const filePath = args['spec-file'];
+            const outputPath = flags.output;
+            try {
+                this.specFile = yield (0, SpecificationFile_1.load)(filePath);
+            }
+            catch (err) {
+                this.error(new validation_error_1.ValidationError({
+                    type: 'invalid-file',
+                    filepath: filePath,
+                }));
+            }
+            const content = this.specFile.text();
+            let formatted;
+            try {
+                const fileFormat = (0, SpecificationFile_1.retrieveFileFormat)(this.specFile.text());
+                if (fileFormat === 'yaml' || fileFormat === 'yml') {
+                    const yamlDoc = yaml.parseDocument(content);
+                    formatted = yamlDoc.toString({
+                        lineWidth: 0,
+                    });
+                }
+                else if (fileFormat === 'json') {
+                    const jsonObj = JSON.parse(content);
+                    formatted = JSON.stringify(jsonObj, null, 2);
+                }
+                else {
+                    throw new Error('Unsupported file format');
+                }
+            }
+            catch (err) {
+                this.error(`Error formatting file: ${err}`);
+            }
+            if (outputPath) {
+                yield fs_1.promises.writeFile(outputPath, formatted, 'utf8');
+                this.log(`Asyncapi document has been beautified ${outputPath}`);
+            }
+            else {
+                yield fs_1.promises.writeFile(filePath, formatted, 'utf8');
+                this.log(`Asyncapi document ${filePath} has been beautified in-place.`);
+            }
+        });
+    }
+}
+exports.default = Pretty;
+Pretty.description = 'Format AsyncAPI specification file';
+Pretty.examples = [
+    'asyncapi pretty ./asyncapi.yaml',
+    'asyncapi pretty ./asyncapi.yaml --output formatted-asyncapi.yaml',
+];
+Pretty.flags = (0, pretty_flags_1.prettyFlags)();
+Pretty.args = {
+    'spec-file': core_1.Args.string({ description: 'spec path, url, or context-name', required: true }),
+};

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

@@ -0,0 +1,3 @@
+export declare const prettyFlags: () => {
+    output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+};

package/lib/core/flags/pretty.flags.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prettyFlags = void 0;
+const core_1 = require("@oclif/core");
+const prettyFlags = () => {
+    return {
+        output: core_1.Flags.string({
+            char: 'o',
+            description: 'Output file path',
+        }),
+    };
+};
+exports.prettyFlags = prettyFlags;

package/oclif.manifest.json

@@ -440,6 +440,44 @@
         "optimize.js"
       ]
     },
+    "pretty": {
+      "aliases": [],
+      "args": {
+        "spec-file": {
+          "description": "spec path, url, or context-name",
+          "name": "spec-file",
+          "required": true
+        }
+      },
+      "description": "Format AsyncAPI specification file",
+      "examples": [
+        "asyncapi pretty ./asyncapi.yaml",
+        "asyncapi pretty ./asyncapi.yaml --output formatted-asyncapi.yaml"
+      ],
+      "flags": {
+        "output": {
+          "char": "o",
+          "description": "Output file path",
+          "name": "output",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "pretty",
+      "pluginAlias": "@asyncapi/cli",
+      "pluginName": "@asyncapi/cli",
+      "pluginType": "core",
+      "strict": true,
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "pretty.js"
+      ]
+    },
     "validate": {
       "aliases": [],
       "args": {
@@ -1694,5 +1732,5 @@
       ]
     }
   },
-  "version": "2.10.0"
+  "version": "2.11.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "2.10.0",
+  "version": "2.11.1",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -17,7 +17,7 @@
     "@asyncapi/openapi-schema-parser": "^3.0.24",
     "@asyncapi/optimizer": "^1.0.4",
     "@asyncapi/parser": "^3.3.0",
-    "@asyncapi/protobuf-schema-parser": "^3.2.13",
+    "@asyncapi/protobuf-schema-parser": "^3.2.15",
     "@asyncapi/raml-dt-schema-parser": "^4.0.24",
     "@asyncapi/studio": "^0.20.0",
     "@clack/prompts": "^0.7.0",
@@ -41,7 +41,8 @@
     "strip-ansi": "^6.0.0",
     "unzipper": "^0.10.11",
     "uuid": "^9.0.1",
-    "ws": "^8.2.3"
+    "ws": "^8.2.3",
+    "yaml": "^2.6.1"
   },
   "devDependencies": {
     "@asyncapi/minimaltemplate": "./test/fixtures/minimaltemplate",