@asyncapi/cli 2.16.5 → 2.16.6

package/bin/run

@@ -7,6 +7,6 @@ const oclif = require('@oclif/core');
 oclif.run()
   .then(require('@oclif/core/flush'))
   .catch((err) => {
-    const oclifHandler = require('@oclif/core/handle');
-    return oclifHandler(err.message);
+    const { handle } = require('@oclif/core/handle');
+    return handle(err);
   });

package/bin/run_bin

@@ -8,6 +8,6 @@ const oclif = require('@oclif/core');
 oclif.run()
   .then(require('@oclif/core/flush'))
   .catch((err) => {
-    const oclifHandler = require('@oclif/core/handle');
-    return oclifHandler(err.message);
+    const { handle } = require('@oclif/core/handle');
+    return handle(err);
   });

package/lib/commands/generate/fromTemplate.d.ts

@@ -23,8 +23,8 @@ export default class Template extends Command {
         'use-new-generator': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
-        asyncapi: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
-        template: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        asyncapi: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+        template: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
     };
     parser: Parser;
     run(): Promise<void>;

package/lib/commands/generate/fromTemplate.js

@@ -75,10 +75,12 @@ class Template extends base_1.default {
         };
     }
     run() {
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const { args, flags } = yield this.parse(Template); // NOSONAR
             const interactive = !flags['no-interactive'];
-            let { asyncapi, template } = args;
+            let asyncapi = (_a = args['asyncapi']) !== null && _a !== void 0 ? _a : '';
+            let template = (_b = args['template']) !== null && _b !== void 0 ? _b : '';
             let output = flags.output;
             const { proxyPort, proxyHost } = flags;
             if (interactive) {
@@ -392,6 +394,6 @@ Template.examples = [
 ];
 Template.flags = Object.assign(Object.assign({}, (0, fromTemplate_flags_1.fromTemplateFlags)()), (0, proxy_flags_1.proxyFlags)());
 Template.args = {
-    asyncapi: core_1.Args.string({ description: '- Local path, url or context-name pointing to AsyncAPI file', required: true }),
-    template: core_1.Args.string({ description: '- Name of the generator template like for example @asyncapi/html-template or https://github.com/asyncapi/html-template', required: true }),
+    asyncapi: core_1.Args.string({ description: '- Local path, url or context-name pointing to AsyncAPI file', required: false }),
+    template: core_1.Args.string({ description: '- Name of the generator template like for example @asyncapi/html-template or https://github.com/asyncapi/html-template', required: false }),
 };

package/lib/commands/optimize.js

@@ -55,12 +55,17 @@ class Optimize extends base_1.default {
                 if (err.message.includes('Failed to download')) {
                     throw new Error('Proxy Connection Error: Unable to establish a connection to the proxy check hostName or PortNumber.');
                 }
-                else {
+                else if (filePath) {
                     this.error(new validation_error_1.ValidationError({
                         type: 'invalid-file',
                         filepath: filePath,
                     }));
                 }
+                else {
+                    this.error(new validation_error_1.ValidationError({
+                        type: 'no-spec-found'
+                    }));
+                }
             }
             let optimizer;
             let report;
@@ -70,8 +75,8 @@ class Optimize extends base_1.default {
             }
             catch (err) {
                 this.error(new validation_error_1.ValidationError({
-                    type: 'invalid-file',
-                    filepath: filePath,
+                    type: 'invalid-syntax-file',
+                    filepath: this.specFile.getFilePath(),
                 }));
             }
             this.isInteractive = !flags['no-tty'];

package/lib/core/errors/validation-error.d.ts

@@ -1,4 +1,4 @@
-type ErrorType = 'parser-error' | 'invalid-file' | 'no-spec-found';
+type ErrorType = 'parser-error' | 'invalid-file' | 'no-spec-found' | 'invalid-syntax-file';
 interface IValidationErrorInput {
     type: ErrorType;
     err?: any;

package/lib/core/errors/validation-error.js

@@ -10,6 +10,9 @@ class ValidationError extends Error {
         if (error.type === 'invalid-file') {
             this.message = `There is no file or context with name "${error.filepath}".`;
         }
+        if (error.type === 'invalid-syntax-file') {
+            this.message = `Syntax Error in "${error.filepath}".`;
+        }
         if (error.type === 'no-spec-found') {
             this.message = 'Unable to perform validation. Specify what AsyncAPI file should be validated.\n\nThese are your options to specify in the CLI what AsyncAPI file should be used:\n- You can provide a path to the AsyncAPI file: asyncapi validate path/to/file/asyncapi.yml\n- You can also pass a saved context that points to your AsyncAPI file: asyncapi validate mycontext\n- In case you did not specify a context that you want to use, the CLI checks if there is a default context and uses it. To set default context run: asyncapi context use mycontext\n- In case you did not provide any reference to AsyncAPI file and there is no default context, the CLI detects if in your current working directory you have files like asyncapi.json, asyncapi.yaml, asyncapi.yml. Just rename your file accordingly.';
         }

package/oclif.manifest.json

@@ -721,12 +721,12 @@
         "asyncapi": {
           "description": "- Local path, url or context-name pointing to AsyncAPI file",
           "name": "asyncapi",
-          "required": true
+          "required": false
         },
         "template": {
           "description": "- Name of the generator template like for example @asyncapi/html-template or https://github.com/asyncapi/html-template",
           "name": "template",
-          "required": true
+          "required": false
         }
       },
       "description": "Generates whatever you want using templates compatible with AsyncAPI Generator.",
@@ -1771,5 +1771,5 @@
       ]
     }
   },
-  "version": "2.16.5"
+  "version": "2.16.6"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "2.16.5",
+  "version": "2.16.6",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -17,12 +17,12 @@
     "@asyncapi/openapi-schema-parser": "^3.0.24",
     "@asyncapi/optimizer": "^1.0.4",
     "@asyncapi/parser": "^3.3.0",
-    "@asyncapi/protobuf-schema-parser": "^3.4.0",
+    "@asyncapi/protobuf-schema-parser": "^3.5.1",
     "@asyncapi/raml-dt-schema-parser": "^4.0.24",
     "@asyncapi/studio": "^0.20.0",
     "@changesets/changelog-git": "^0.2.0",
     "@clack/prompts": "^0.7.0",
-    "@oclif/core": "^4.0.28",
+    "@oclif/core": "^4.2.8",
     "@smoya/asyncapi-adoption-metrics": "^2.4.9",
     "@stoplight/spectral-cli": "6.9.0",
     "chalk": "^4.1.0",
@@ -111,7 +111,7 @@
     ],
     "hooks": {
       "command_not_found": [
-        "./lib/hooks/command_not_found/myhook"
+        "./lib/core/hooks/command_not_found/myhook"
       ]
     },
     "macos": {