@asyncapi/cli 2.6.0 → 2.7.2

package/lib/commands/config/versions.js

@@ -6,6 +6,7 @@ const global_flags_1 = require("../../core/flags/global.flags");
 class Versions extends base_1.default {
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
             const dependencies = [];
             let dependency = '';
             // Preparation of the array with all dependencies '@asyncapi/*' along with
@@ -19,7 +20,7 @@ class Versions extends base_1.default {
                     try {
                         // Goofy name `importedPJSON` is chosen to distinguish from name `pjson`
                         // used in `@oclif` source code.
-                        const importedPJSON = yield Promise.resolve().then(() => tslib_1.__importStar(require(`${key}/package.json`)));
+                        const importedPJSON = yield (_a = `${key}/package.json`, Promise.resolve().then(() => tslib_1.__importStar(require(_a))));
                         dependencies.push(`${key}/${importedPJSON.default.version}`);
                     }
                     catch (e) {

package/lib/commands/diff.d.ts

@@ -5,7 +5,7 @@ export default class Diff extends Command {
     static flags: {
         '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<"info" | "error" | "warn" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", 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/generate/models.d.ts

@@ -2,36 +2,7 @@ import Command from '../../core/base';
 export default class Models extends Command {
     static description: string;
     static readonly args: any;
-    static flags: {
-        '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<"info" | "error" | "warn" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
-        'no-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        pyDantic: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        javaIncludeComments: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        javaJackson: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        javaConstraints: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        javaArrayType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        csharpAutoImplement: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        csharpNewtonsoft: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        csharpArrayType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        csharpHashcode: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        csharpEqual: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        csharpSystemJson: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        tsModelType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        tsEnumType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        tsModuleSystem: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        tsIncludeComments: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        tsExportType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        tsJsonBinPack: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        tsMarshalling: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        tsExampleInstance: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        tsRawPropertyNames: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-        output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        packageName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        namespace: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-    };
+    static flags: Record<string, any>;
     run(): Promise<void>;
     private parseArgs;
 }

package/lib/commands/start/index.js

@@ -12,4 +12,4 @@ class Start extends base_1.default {
     }
 }
 exports.default = Start;
-Start.description = '';
+Start.description = 'Starts AsyncAPI-related services. Currently, it supports launching the AsyncAPI Studio';

package/lib/commands/validate.d.ts

@@ -5,7 +5,7 @@ export default class Validate extends Command {
         score: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         '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<"info" | "error" | "warn" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", 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/errors/specification-file.d.ts

@@ -7,7 +7,7 @@ export declare class SpecificationFileNotFound extends SpecificationFileError {
 export declare class SpecificationURLNotFound extends SpecificationFileError {
     constructor(URL: string);
 }
-declare type From = 'file' | 'url' | 'context' | 'invalid file';
+type From = 'file' | 'url' | 'context' | 'invalid file';
 export declare class ErrorLoadingSpec extends Error {
     private readonly errorMessages;
     constructor(from?: From, param?: string);

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

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

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

@@ -1,7 +1,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<"info" | "error" | "warn" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", 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/generate/models.flags.d.ts

@@ -1,30 +1 @@
-export declare const modelsFlags: () => {
-    '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<"info" | "error" | "warn" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
-    'no-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    pyDantic: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    javaIncludeComments: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    javaJackson: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    javaConstraints: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    javaArrayType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-    csharpAutoImplement: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    csharpNewtonsoft: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    csharpArrayType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-    csharpHashcode: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    csharpEqual: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    csharpSystemJson: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    tsModelType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-    tsEnumType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-    tsModuleSystem: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-    tsIncludeComments: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    tsExportType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-    tsJsonBinPack: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    tsMarshalling: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    tsExampleInstance: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    tsRawPropertyNames: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-    help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
-    output: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-    packageName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-    namespace: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-};
+export declare const modelsFlags: () => Record<string, any>;

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

@@ -1,4 +1,4 @@
-export declare const watchFlag: (description?: string | undefined) => import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+export declare const watchFlag: (description?: string) => import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
 export declare const helpFlag: () => {
     help: import("@oclif/core/lib/interfaces").BooleanFlag<void>;
 };

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

@@ -2,7 +2,7 @@ export declare const validateFlags: () => {
     score: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     '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<"info" | "error" | "warn" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", 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/globals.d.ts

@@ -1,6 +1,6 @@
 import Command from './base';
 import { Specification } from './models/SpecificationFile';
-export declare type SpecWatcherParams = {
+export type SpecWatcherParams = {
     spec: Specification;
     handler: Command;
     handlerName: string;

package/lib/core/hooks/command_not_found/myhook.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.closest = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
+const prompts_1 = require("@clack/prompts");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fast_levenshtein_1 = tslib_1.__importDefault(require("fast-levenshtein"));
 const closest = (target, possibilities) => {
@@ -41,18 +42,18 @@ const hook = function (opts) {
         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 = '';
+        let response;
         try {
             if (opts.id === 'help') {
                 readableSuggestion = '--help';
             }
-            response = yield core_1.ux.prompt(`Did you mean ${chalk_1.default.blueBright(readableSuggestion)}? [y/n]`, { timeout: 10000 });
+            response = yield (0, prompts_1.confirm)({ message: `Did you mean ${chalk_1.default.blueBright(readableSuggestion)}? [y/n]` });
         }
         catch (error) {
             this.log('');
             this.debug(error);
         }
-        if (response === 'y') {
+        if (response === true) {
             // 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);

package/lib/core/parser.d.ts

@@ -3,7 +3,7 @@ import { OutputFormat } from '@stoplight/spectral-cli/dist/services/config';
 import type { Diagnostic } from '@asyncapi/parser/cjs';
 import type Command from './base';
 import type { Specification } from './models/SpecificationFile';
-export declare type SeverityKind = 'error' | 'warn' | 'info' | 'hint';
+export type SeverityKind = 'error' | 'warn' | 'info' | 'hint';
 export { convertToOldAPI };
 export interface ValidationFlagsOptions {
     logDiagnostics?: boolean;
@@ -15,7 +15,7 @@ export declare enum ValidationStatus {
 export declare function validationFlags({ logDiagnostics }?: ValidationFlagsOptions): {
     '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<"info" | "error" | "warn" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
 };
 export interface ValidateOptions {
     'log-diagnostics'?: boolean;

package/oclif.manifest.json

@@ -1287,7 +1287,7 @@
     "start": {
       "aliases": [],
       "args": {},
-      "description": "",
+      "description": "Starts AsyncAPI-related services. Currently, it supports launching the AsyncAPI Studio",
       "flags": {},
       "hasDynamicHelp": false,
       "hiddenAliases": [],
@@ -1622,5 +1622,5 @@
       ]
     }
   },
-  "version": "2.6.0"
+  "version": "2.7.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "2.6.0",
+  "version": "2.7.2",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -13,7 +13,6 @@
     "@asyncapi/converter": "^1.6.2",
     "@asyncapi/diff": "^0.4.1",
     "@asyncapi/generator": "^1.17.25",
-    "@asyncapi/modelina": "^3.7.0",
     "@asyncapi/modelina-cli": "^4.0.0-next.48",
     "@asyncapi/openapi-schema-parser": "^3.0.24",
     "@asyncapi/optimizer": "^1.0.3",
@@ -22,19 +21,14 @@
     "@asyncapi/raml-dt-schema-parser": "^4.0.24",
     "@asyncapi/studio": "^0.20.0",
     "@clack/prompts": "^0.7.0",
-    "@oclif/core": "^3",
-    "@oclif/errors": "^1.3.6",
-    "@oclif/plugin-not-found": "^2.3.22",
+    "@oclif/core": "^4.0.28",
     "@smoya/asyncapi-adoption-metrics": "^2.4.9",
-    "@smoya/multi-parser": "^5.0.9",
     "@stoplight/spectral-cli": "6.9.0",
-    "ajv": "^8.12.0",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.2",
     "fast-levenshtein": "^3.0.0",
     "fs-extra": "^11.1.0",
     "generator-v2": "npm:@asyncapi/generator@^2.4.1",
-    "indent-string": "^4.0.0",
     "inquirer": "^8.2.0",
     "js-yaml": "^4.1.0",
     "lodash.template": "^4.4.0",
@@ -43,12 +37,10 @@
     "open": "^8.4.0",
     "picocolors": "^1.0.0",
     "reflect-metadata": "^0.1.13",
-    "request": "^2.88.2",
     "serve-handler": "^6.1.3",
     "strip-ansi": "^6.0.0",
     "unzipper": "^0.10.11",
     "uuid": "^9.0.1",
-    "wrap-ansi": "^9.0.0",
     "ws": "^8.2.3"
   },
   "devDependencies": {
@@ -170,12 +162,15 @@
     "pretest:coverage": "npm run build",
     "posttest": "rimraf ./test.asyncapi-cli",
     "release": "semantic-release",
-    "test": "npm run test:unit",
+    "test": "npm run test:unit && npm run action:test",
     "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\"",
     "test:one": "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",
     "get-version": "echo $npm_package_version",
     "createhook": "oclif generate hook myhook --event=command_not_found",
-    "createhookinit": "oclif generate hook inithook --event=init"
+    "createhookinit": "oclif generate hook inithook --event=init",
+    "action:docker:build": "docker build -f github-action/Dockerfile -t asyncapi/github-action-for-cli:latest .",
+    "action:bump:version": "npm --no-git-tag-version --allow-same-version version $VERSION",
+    "action:test": "cd github-action && make test"
   },
   "types": "lib/index.d.ts"
 }