@asyncapi/cli 0.58.10 → 0.58.12

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

@@ -2492,9 +2492,9 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
-      "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "dependencies": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.23.0",
@@ -14296,9 +14296,9 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.23.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
-      "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
+      "version": "7.23.2",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
+      "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
       "requires": {
         "@babel/code-frame": "^7.22.13",
         "@babel/generator": "^7.23.0",

package/bin/run

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

package/lib/hooks/command_not_found/myhook.d.ts

@@ -0,0 +1,4 @@
+import { Hook } from '@oclif/core';
+export declare const closest: (target: string, possibilities: string[]) => string;
+declare const hook: Hook.CommandNotFound;
+export default hook;

package/lib/hooks/command_not_found/myhook.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.closest = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const fast_levenshtein_1 = tslib_1.__importDefault(require("fast-levenshtein"));
+const core_2 = require("@oclif/core");
+const closest = (target, possibilities) => {
+    var _a, _b;
+    return (_b = (_a = possibilities
+        .map((id) => ({ distance: fast_levenshtein_1.default.get(target, id, { useCollator: true }), id }))
+        .sort((a, b) => a.distance - b.distance)[0]) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : '';
+};
+exports.closest = closest;
+const hook = function (opts) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (opts.id === '--help') {
+            const help = new core_2.Help(this.config);
+            help.showHelp(['--help']);
+            return;
+        }
+        const hiddenCommandIds = new Set(opts.config.commands.filter((c) => c.hidden).map((c) => c.id));
+        const commandIDs = [...opts.config.commandIDs, ...opts.config.commands.flatMap((c) => c.aliases)].filter((c) => !hiddenCommandIds.has(c));
+        if (commandIDs.length === 0) {
+            return;
+        }
+        // now we we return if the command id are not there.
+        let binHelp = `${opts.config.bin} help`;
+        const idSplit = opts.id.split(':');
+        if (opts.config.findTopic(idSplit[0])) {
+            // if valid topic, update binHelp with topic
+            binHelp = `${binHelp} ${idSplit[0]}`;
+        }
+        //if there is a topic in the opts we just upgrade the our commnad like 
+        // alter the suggestion in the help scenario so that help is the first command
+        // otherwise the user will be presented 'did you mean 'help'?' instead of 'did you mean "help <command>"?'
+        let suggestion = (/:?help:?/).test(opts.id)
+            ? ['help', ...opts.id.split(':').filter((cmd) => cmd !== 'help')].join(':')
+            : (0, exports.closest)(opts.id, commandIDs);
+        let readableSuggestion = (0, core_1.toConfiguredId)(suggestion, this.config);
+        const originalCmd = (0, core_1.toConfiguredId)(opts.id, this.config);
+        this.warn(`${chalk_1.default.yellow(originalCmd)} is not a ${opts.config.bin} command.`);
+        let response = '';
+        try {
+            if (opts.id === 'help') {
+                readableSuggestion = '--help';
+            }
+            response = yield core_1.CliUx.ux.prompt(`Did you mean ${chalk_1.default.blueBright(readableSuggestion)}? [y/n]`, { timeout: 10000 });
+        }
+        catch (error) {
+            this.log('');
+            this.debug(error);
+        }
+        if (response === 'y') {
+            // this will split the original command from the suggested replacement, and gather the remaining args as varargs to help with situations like:
+            // confit set foo-bar -> confit:set:foo-bar -> config:set:foo-bar -> config:set foo-bar
+            let argv = ((_a = opts.argv) === null || _a === void 0 ? void 0 : _a.length) ? opts.argv : opts.id.split(':').slice(suggestion.split(':').length);
+            if (suggestion.startsWith('help:')) {
+                // the args are the command/partial command you need help for (package:version)
+                // we created the suggestion variable to start with "help" so slice the first entry
+                argv = suggestion.split(':').slice(1);
+                // the command is just the word "help"
+                suggestion = 'help';
+            }
+            if (opts.id === 'help') {
+                return this.config.runCommand('--help');
+            }
+            return this.config.runCommand(suggestion, argv);
+        }
+        this.error(`Run ${chalk_1.default.bold.cyan(binHelp)} for a list of available commands.`, { exit: 127 });
+    });
+};
+exports.default = hook;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.58.10",
+  "version": "0.58.12",
   "commands": {
     "bundle": {
       "id": "bundle",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "0.58.10",
+  "version": "0.58.12",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run"
@@ -14,7 +14,7 @@
     "@asyncapi/diff": "^0.4.1",
     "@asyncapi/generator": "^1.13.1",
     "@asyncapi/modelina": "^1.9.1",
-    "@asyncapi/openapi-schema-parser": "^3.0.3",
+    "@asyncapi/openapi-schema-parser": "^3.0.5",
     "@asyncapi/optimizer": "^0.2.1",
     "@asyncapi/parser": "^3.0.0-next-major-spec.2",
     "@asyncapi/protobuf-schema-parser": "3.0.0",
@@ -28,6 +28,7 @@
     "ajv": "^8.12.0",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.2",
+    "fast-levenshtein": "^3.0.0",
     "fs-extra": "^11.1.0",
     "indent-string": "^4.0.0",
     "inquirer": "^8.2.0",
@@ -50,6 +51,7 @@
     "@oclif/test": "^2",
     "@swc/core": "^1.3.2",
     "@types/chai": "^4.3.6",
+    "@types/fast-levenshtein": "^0.0.2",
     "@types/fs-extra": "^11.0.1",
     "@types/inquirer": "^8.1.3",
     "@types/js-yaml": "^4.0.5",
@@ -104,9 +106,12 @@
   "oclif": {
     "commands": "./lib/commands",
     "bin": "asyncapi",
-    "plugins": [
-      "@oclif/plugin-not-found"
-    ],
+    "plugins": [],
+    "hooks": {
+      "command_not_found": [
+        "./lib/hooks/command_not_found/myhook"
+      ]
+    },
     "macos": {
       "identifier": "com.asyncapi.cli"
     },
@@ -152,7 +157,9 @@
     "release": "semantic-release",
     "test": "npm run test:unit",
     "test:unit": "cross-env NODE_ENV=development TEST=1 CUSTOM_CONTEXT_FILENAME=\"test.asyncapi-cli\" CUSTOM_CONTEXT_FILE_LOCATION=\"\" nyc --extension .ts mocha --require ts-node/register --require test/helpers/init.js --reporter spec --timeout 100000 \"test/**/*.test.ts\"",
-    "get-version": "echo $npm_package_version"
+    "get-version": "echo $npm_package_version",
+    "createhook": "oclif generate hook myhook --event=command_not_found",
+    "createhookinit": "oclif generate hook inithook --event=init"
   },
   "types": "lib/index.d.ts"
 }