@asyncapi/cli 2.4.0 → 2.5.0

package/lib/commands/config/versions.js

@@ -6,7 +6,6 @@ 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
@@ -20,7 +19,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 (_a = `${key}/package.json`, Promise.resolve().then(() => tslib_1.__importStar(require(_a))));
+                        const importedPJSON = yield Promise.resolve().then(() => tslib_1.__importStar(require(`${key}/package.json`)));
                         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<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+        'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"info" | "error" | "warn" | "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/fromTemplate.d.ts

@@ -18,6 +18,7 @@ export default class Template extends Command {
         'registry-url': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
         'registry-auth': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'registry-token': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'use-new-generator': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static args: {
         asyncapi: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
@@ -33,6 +34,7 @@ export default class Template extends Command {
     private disableHooksParser;
     private mapBaseURLParser;
     private generate;
+    private generateUsingNewGenerator;
     private runWatchMode;
     private watcherHandler;
     private getMapBaseUrlToFolderResolver;

package/lib/commands/generate/fromTemplate.js

@@ -6,6 +6,7 @@ const base_1 = tslib_1.__importDefault(require("../../core/base"));
 // eslint-disable-next-line
 // @ts-ignore
 const generator_1 = tslib_1.__importDefault(require("@asyncapi/generator"));
+const generator_v2_1 = tslib_1.__importDefault(require("generator-v2"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const os_1 = tslib_1.__importDefault(require("os"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
@@ -114,7 +115,12 @@ class Template extends base_1.default {
                     this.error(`${template} template does not support AsyncAPI v3 documents, please checkout ${v3IssueLink}`);
                 }
             }
-            yield this.generate(asyncapi, template, output, options, genOption, interactive);
+            if (flags['use-new-generator']) {
+                yield this.generateUsingNewGenerator(asyncapi, template, output, options, genOption, interactive);
+            }
+            else {
+                yield this.generate(asyncapi, template, output, options, genOption, interactive);
+            }
             if (watchTemplate) {
                 const watcherHandler = this.watcherHandler(asyncapi, template, output, options, genOption, interactive);
                 yield this.runWatchMode(asyncapi, template, output, watcherHandler);
@@ -281,6 +287,31 @@ class Template extends base_1.default {
             s.stop(`${(0, picocolors_1.yellow)('Check out your shiny new generated files at ') + (0, picocolors_1.magenta)(output) + (0, picocolors_1.yellow)('.')}\n`);
         });
     }
+    generateUsingNewGenerator(asyncapi, template, output, options, genOption, interactive = true) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            let specification;
+            try {
+                specification = yield (0, SpecificationFile_1.load)(asyncapi);
+            }
+            catch (err) {
+                return this.error(new validation_error_1.ValidationError({
+                    type: 'invalid-file',
+                    filepath: asyncapi,
+                }), { exit: 1 });
+            }
+            const generator = new generator_v2_1.default(template, output || path_1.default.resolve(os_1.default.tmpdir(), 'asyncapi-generator'), options);
+            const s = interactive ? (0, prompts_1.spinner)() : { start: () => null, stop: (string) => console.log(string) };
+            s.start('Generation in progress. Keep calm and wait a bit');
+            try {
+                yield generator.generateFromString(specification.text(), Object.assign(Object.assign({}, genOption), { path: asyncapi }));
+            }
+            catch (err) {
+                s.stop('Generation failed');
+                throw new generator_error_1.GeneratorError(err);
+            }
+            s.stop(`${(0, picocolors_1.yellow)('Check out your shiny new generated files at ') + (0, picocolors_1.magenta)(output) + (0, picocolors_1.yellow)('.')}\n`);
+        });
+    }
     runWatchMode(asyncapi, template, output, watchHandler) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const specification = yield (0, SpecificationFile_1.load)(asyncapi);

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

@@ -5,7 +5,7 @@ export default class Models 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<"error" | "warn" | "info" | "hint", 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>;

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

@@ -56,6 +56,7 @@ class default_1 extends core_1.Command {
                 try {
                     const { document } = yield this.parser.parse(rawDocument);
                     if (document !== undefined) {
+                        // @ts-ignore
                         metadata = (0, asyncapi_adoption_metrics_1.MetadataFromDocument)(document, metadata);
                     }
                 }

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);
 }
-type From = 'file' | 'url' | 'context' | 'invalid file';
+declare 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 @@
-type ErrorType = 'parser-error' | 'invalid-file' | 'no-spec-found';
+declare 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<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"info" | "error" | "warn" | "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/fromTemplate.flags.d.ts

@@ -13,4 +13,5 @@ export declare const fromTemplateFlags: () => {
     'registry-url': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
     'registry-auth': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     'registry-token': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    'use-new-generator': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
 };

package/lib/core/flags/generate/fromTemplate.flags.js

@@ -55,6 +55,10 @@ const fromTemplateFlags = () => {
         }),
         'registry-token': core_1.Flags.string({
             description: 'The npm registry authentication token, that can be passed instead of base64 encoded username and password'
+        }),
+        'use-new-generator': core_1.Flags.boolean({
+            default: false,
+            description: 'Use v2 generator, for generating from newer templates'
         })
     };
 };

package/lib/core/flags/generate/models.flags.d.ts

@@ -1,7 +1,7 @@
 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<"error" | "warn" | "info" | "hint", 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>;

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

@@ -1,4 +1,4 @@
-export declare const watchFlag: (description?: string) => import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+export declare const watchFlag: (description?: string | undefined) => 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<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"info" | "error" | "warn" | "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 type SpecWatcherParams = {
+export declare type SpecWatcherParams = {
     spec: Specification;
     handler: Command;
     handlerName: string;

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 type SeverityKind = 'error' | 'warn' | 'info' | 'hint';
+export declare 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<"error" | "warn" | "info" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
+    'fail-severity': import("@oclif/core/lib/interfaces").OptionFlag<"info" | "error" | "warn" | "hint", import("@oclif/core/lib/interfaces").CustomOptions>;
 };
 export interface ValidateOptions {
     'log-diagnostics'?: boolean;

package/oclif.manifest.json

@@ -673,6 +673,12 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "use-new-generator": {
+          "description": "Use v2 generator, for generating from newer templates",
+          "name": "use-new-generator",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -1614,5 +1620,5 @@
       ]
     }
   },
-  "version": "2.4.0"
+  "version": "2.5.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run_bin"
@@ -10,14 +10,14 @@
   "dependencies": {
     "@asyncapi/avro-schema-parser": "^3.0.23",
     "@asyncapi/bundler": "^0.6.3",
-    "@asyncapi/converter": "^1.6.1",
+    "@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",
-    "@asyncapi/parser": "^3.1.0",
+    "@asyncapi/parser": "^3.3.0",
     "@asyncapi/protobuf-schema-parser": "^3.2.13",
     "@asyncapi/raml-dt-schema-parser": "^4.0.24",
     "@asyncapi/studio": "^0.20.0",
@@ -33,6 +33,7 @@
     "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",
@@ -52,6 +53,7 @@
   },
   "devDependencies": {
     "@asyncapi/minimaltemplate": "./test/fixtures/minimaltemplate",
+    "@asyncapi/newtemplate": "./test/fixtures/newtemplate",
     "@babel/core": "^7.19.3",
     "@oclif/test": "^2",
     "@swc/core": "^1.3.2",
@@ -156,7 +158,7 @@
     "generate:assets": "npm run generate:readme:toc && npm run generate:commands",
     "generate:commands": "npm run generate:readme:create && npm run generate:readme:commands && node ./scripts/updateUsageDocs.js && rimraf ./scripts/README.md",
     "generate:readme:toc": "markdown-toc -i README.md",
-    "lint": "eslint --max-warnings 0 --config .eslintrc .",
+    "lint": "eslint --max-warnings 5 --config .eslintrc .",
     "lint:fix": "eslint --max-warnings 5 --config .eslintrc . --fix",
     "pack:macos": "oclif pack macos && npm run pack:rename",
     "pack:linux": "oclif pack deb && npm run pack:rename",