@asyncapi/cli 3.1.1 → 3.3.0

package/lib/{commands → apps/cli/commands}/generate/fromTemplate.js

@@ -2,46 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const base_1 = tslib_1.__importDefault(require("../../core/base"));
+const base_1 = tslib_1.__importDefault(require("../../internal/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"));
-const SpecificationFile_1 = require("../../core/models/SpecificationFile");
-const generator_2 = require("../../core/utils/generator");
-const validation_error_1 = require("../../core/errors/validation-error");
-const generator_error_1 = require("../../core/errors/generator-error");
+const SpecificationFile_1 = require("../../../../domains/models/SpecificationFile");
+const fileWatcher_1 = require("../../../../utils/fileWatcher");
+const validation_error_1 = require("../../../../errors/validation-error");
+const generator_error_1 = require("../../../../errors/generator-error");
 const parser_1 = require("@asyncapi/parser");
 const prompts_1 = require("@clack/prompts");
 const picocolors_1 = require("picocolors");
-const fromTemplate_flags_1 = require("../../core/flags/generate/fromTemplate.flags");
-const proxy_flags_1 = require("../../core/flags/proxy.flags");
-const templatesNotSupportingV3 = {
-    '@asyncapi/minimaltemplate': 'some link', // For testing purpose
-    '@asyncapi/dotnet-nats-template': 'https://github.com/asyncapi/dotnet-nats-template/issues/384',
-    '@asyncapi/ts-nats-template': 'https://github.com/asyncapi/ts-nats-template/issues/545',
-    '@asyncapi/python-paho-template': 'https://github.com/asyncapi/python-paho-template/issues/189',
-    '@asyncapi/nodejs-ws-template': 'https://github.com/asyncapi/nodejs-ws-template/issues/294',
-    '@asyncapi/java-spring-cloud-stream-template': 'https://github.com/asyncapi/java-spring-cloud-stream-template/issues/336',
-    '@asyncapi/go-watermill-template': 'https://github.com/asyncapi/go-watermill-template/issues/243',
-    '@asyncapi/java-spring-template': 'https://github.com/asyncapi/java-spring-template/issues/308',
-    '@asyncapi/php-template': 'https://github.com/asyncapi/php-template/issues/191'
-};
-/**
- * Verify that a given template support v3, if not, return the link to the issue that needs to be solved.
- */
-function verifyTemplateSupportForV3(template) {
-    if (templatesNotSupportingV3[`${template}`] !== undefined) {
-        return templatesNotSupportingV3[`${template}`];
-    }
-    return undefined;
-}
+const fromTemplate_flags_1 = require("../../internal/flags/generate/fromTemplate.flags");
+const proxy_flags_1 = require("../../internal/flags/proxy.flags");
+const generator_service_1 = require("../../../../domains/services/generator.service");
 class Template extends base_1.default {
     constructor() {
         super(...arguments);
+        this.generatorService = new generator_service_1.GeneratorService(true);
         this.parser = new parser_1.Parser();
         this.getMapBaseUrlToFolderResolver = (urlToFolder) => {
             return {
@@ -52,7 +32,7 @@ class Template extends base_1.default {
                 read(file) {
                     const baseUrl = urlToFolder.url;
                     const baseDir = urlToFolder.folder;
-                    return new Promise(((resolve, reject) => {
+                    return new Promise((resolve, reject) => {
                         let localpath = file.url;
                         localpath = localpath.replace(baseUrl, baseDir);
                         try {
@@ -68,14 +48,14 @@ class Template extends base_1.default {
                         catch (err) {
                             reject(`Error opening file "${localpath}"`);
                         }
-                    }));
-                }
+                    });
+                },
             };
         };
     }
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c, _d;
             const { args, flags } = yield this.parse(Template); // NOSONAR
             const interactive = !flags['no-interactive'];
             let asyncapi = (_a = args['asyncapi']) !== null && _a !== void 0 ? _a : '';
@@ -101,8 +81,8 @@ class Template extends base_1.default {
                 registry: {
                     url: flags['registry-url'],
                     auth: flags['registry-auth'],
-                    token: flags['registry-token']
-                }
+                    token: flags['registry-token'],
+                },
             };
             if (proxyHost && proxyPort) {
                 const proxyUrl = `http://${proxyHost}:${proxyPort}`;
@@ -114,19 +94,35 @@ class Template extends base_1.default {
             const watchTemplate = flags['watch'];
             const genOption = {};
             if (flags['map-base-url']) {
-                genOption.resolve = { resolve: this.getMapBaseUrlToFolderResolver(parsedFlags.mapBaseUrlToFolder) };
+                genOption.resolve = {
+                    resolve: this.getMapBaseUrlToFolderResolver(parsedFlags.mapBaseUrlToFolder),
+                };
             }
-            if (asyncapiInput.isAsyncAPI3()) {
-                const v3IssueLink = verifyTemplateSupportForV3(template);
-                if (v3IssueLink !== undefined) {
-                    this.error(`${template} template does not support AsyncAPI v3 documents, please checkout ${v3IssueLink}`);
-                }
+            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 });
             }
             if (flags['use-new-generator']) {
-                yield this.generateUsingNewGenerator(asyncapi, template, output, options, genOption);
+                this.log('Generation in progress. Keep calm and wait a bit');
+                const result = yield this.generatorService.generateUsingNewGenerator(specification, template, output, options, genOption);
+                if (!result.success) {
+                    throw new generator_error_1.GeneratorError(new Error(result.error));
+                }
+                else {
+                    this.log((_d = (_c = result.data) === null || _c === void 0 ? void 0 : _c.logs) === null || _d === void 0 ? void 0 : _d.join('\n'));
+                }
             }
             else {
-                yield this.generate(asyncapi, template, output, options, genOption, interactive);
+                const result = yield this.generatorService.generate(specification, template, output, options, genOption, interactive);
+                if (!result.success) {
+                    throw new generator_error_1.GeneratorError(new Error(result.error));
+                }
             }
             if (watchTemplate) {
                 const watcherHandler = this.watcherHandler(asyncapi, template, output, options, genOption, interactive);
@@ -151,7 +147,7 @@ class Template extends base_1.default {
                         else if (!fs_1.default.existsSync(value)) {
                             return 'The file does not exist';
                         }
-                    }
+                    },
                 });
             }
             if ((0, prompts_1.isCancel)(asyncapi)) {
@@ -175,7 +171,7 @@ class Template extends base_1.default {
                         else if (typeof value !== 'string') {
                             return 'The output directory must be a string';
                         }
-                    }
+                    },
                 }));
             }
             if ((0, prompts_1.isCancel)(output) || (0, prompts_1.isCancel)(template)) {
@@ -184,13 +180,32 @@ class Template extends base_1.default {
             return { asyncapi, template, output };
         });
     }
+    disableHooksParser(inputs) {
+        if (!inputs) {
+            return {};
+        }
+        const disableHooks = {};
+        for (const input of inputs) {
+            const [hookType, hookNames] = input.split(/=/);
+            if (!hookType) {
+                throw new Error('Invalid --disable-hook flag. It must be in the format of: --disable-hook <hookType> or --disable-hook <hookType>=<hookName1>,<hookName2>,...');
+            }
+            if (hookNames) {
+                disableHooks[String(hookType)] = hookNames.split(',');
+            }
+            else {
+                disableHooks[String(hookType)] = true;
+            }
+        }
+        return disableHooks;
+    }
     parseFlags(disableHooks, params, mapBaseUrl, registryUrl, registryAuth, registryToken) {
         return {
             params: this.paramParser(params),
             disableHooks: this.disableHooksParser(disableHooks),
             mapBaseUrlToFolder: this.mapBaseURLParser(mapBaseUrl),
             registryURLValidation: this.registryURLParser(registryUrl),
-            registryAuthentication: this.registryValidation(registryUrl, registryAuth, registryToken)
+            registryAuthentication: this.registryValidation(registryUrl, registryAuth, registryToken),
         };
     }
     registryURLParser(input) {
@@ -232,25 +247,6 @@ class Template extends base_1.default {
         }
         return params;
     }
-    disableHooksParser(inputs) {
-        if (!inputs) {
-            return {};
-        }
-        const disableHooks = {};
-        for (const input of inputs) {
-            const [hookType, hookNames] = input.split(/=/);
-            if (!hookType) {
-                throw new Error('Invalid --disable-hook flag. It must be in the format of: --disable-hook <hookType> or --disable-hook <hookType>=<hookName1>,<hookName2>,...');
-            }
-            if (hookNames) {
-                disableHooks[String(hookType)] = hookNames.split(',');
-            }
-            else {
-                disableHooks[String(hookType)] = true;
-            }
-        }
-        return disableHooks;
-    }
     mapBaseURLParser(input) {
         if (!input) {
             return;
@@ -269,55 +265,6 @@ class Template extends base_1.default {
         }
         return mapBaseURLToFolder;
     }
-    generate(asyncapi_1, template_1, output_1, options_1, genOption_1) {
-        return tslib_1.__awaiter(this, arguments, void 0, function* (asyncapi, template, output, options, genOption, interactive = true) {
-            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_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`);
-        });
-    }
-    generateUsingNewGenerator(asyncapi, template, output, options, genOption) {
-        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);
-            this.log('Generation in progress. Keep calm and wait a bit');
-            try {
-                yield generator.generateFromString(specification.text(), Object.assign(Object.assign({}, genOption), { path: asyncapi }));
-            }
-            catch (err) {
-                this.log('Generation failed');
-                throw new generator_error_1.GeneratorError(err);
-            }
-            this.log(`${(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);
@@ -337,16 +284,17 @@ class Template extends base_1.default {
                 // intentional
             }
             let watcher;
-            if (specificationFile) { // is local AsyncAPI file
+            if (specificationFile) {
+                // is local AsyncAPI file
                 this.log(`[WATCHER] Watching for changes in the template directory ${(0, picocolors_1.magenta)(watchDir)} and in the AsyncAPI file ${(0, picocolors_1.magenta)(specificationFile)}`);
-                watcher = new generator_2.Watcher([specificationFile, watchDir], ignorePaths);
+                watcher = new fileWatcher_1.Watcher([specificationFile, watchDir], ignorePaths);
             }
             else {
                 this.log(`[WATCHER] Watching for changes in the template directory ${(0, picocolors_1.magenta)(watchDir)}`);
-                watcher = new generator_2.Watcher(watchDir, ignorePaths);
+                watcher = new fileWatcher_1.Watcher(watchDir, ignorePaths);
             }
             // Must check template in its installation path in generator to use isLocalTemplate function
-            if (!(yield (0, generator_2.isLocalTemplate)(path_1.default.resolve(generator_1.default.DEFAULT_TEMPLATES_DIR, templateName)))) {
+            if (!(yield (0, fileWatcher_1.isLocalTemplate)(path_1.default.resolve(generator_1.default.DEFAULT_TEMPLATES_DIR, templateName)))) {
                 this.warn(`WARNING: ${template} is a remote template. Changes may be lost on subsequent installations.`);
             }
             yield watcher.watch(watchHandler, (paths) => {
@@ -377,8 +325,21 @@ class Template extends base_1.default {
                 }
                 this.log(`\t${(0, picocolors_1.magenta)(value.path)} was ${eventText}`);
             }
+            let specification;
             try {
-                yield this.generate(asyncapi, template, output, options, genOption, interactive);
+                specification = yield (0, SpecificationFile_1.load)(asyncapi);
+            }
+            catch (err) {
+                return this.error(new validation_error_1.ValidationError({
+                    type: 'invalid-file',
+                    filepath: asyncapi,
+                }), { exit: 1 });
+            }
+            try {
+                const result = yield this.generatorService.generate(specification, template, output, options, genOption, interactive);
+                if (!result.success) {
+                    throw new generator_error_1.GeneratorError(new Error(result.error));
+                }
             }
             catch (err) {
                 throw new generator_error_1.GeneratorError(err);
@@ -388,11 +349,17 @@ class Template extends base_1.default {
 }
 Template.description = 'Generates whatever you want using templates compatible with AsyncAPI Generator.';
 Template.examples = [
-    'asyncapi generate fromTemplate asyncapi.yaml @asyncapi/html-template --param version=1.0.0 singleFile=true --output ./docs --force-write'
+    'asyncapi generate fromTemplate asyncapi.yaml @asyncapi/html-template --param version=1.0.0 singleFile=true --output ./docs --force-write',
 ];
 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: 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 }),
+    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,
+    }),
 };
 exports.default = Template;

package/lib/{commands → apps/cli/commands}/generate/index.d.ts

@@ -1,4 +1,4 @@
-import Command from '../../core/base';
+import Command from '../../internal/base';
 export default class Generate extends Command {
     static description: string;
     run(): Promise<void>;

package/lib/{commands → apps/cli/commands}/generate/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const base_1 = tslib_1.__importDefault(require("../../core/base"));
+const base_1 = tslib_1.__importDefault(require("../../internal/base"));
 const core_1 = require("@oclif/core");
 class Generate extends base_1.default {
     run() {

package/lib/{commands → apps/cli/commands}/generate/models.d.ts

@@ -1,6 +1,10 @@
-import Command from '../../core/base';
+import Command from '../../internal/base';
+import { Specification } from '../../../../domains/models/SpecificationFile';
+import { ValidationStatus } from '../../../../domains/services/validation.service';
+import { Diagnostic } from '@asyncapi/parser/cjs';
 export default class Models extends Command {
     static description: string;
+    private validationService;
     static readonly args: any;
     static readonly flags: {
         proxyHost: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
@@ -8,4 +12,5 @@ export default class Models extends Command {
     };
     run(): Promise<void>;
     private parseArgs;
+    handleGovernanceMessage(document: Specification, diagnostics: Diagnostic[], status: ValidationStatus): Promise<void>;
 }

package/lib/{commands → apps/cli/commands}/generate/models.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const base_1 = tslib_1.__importDefault(require("../../core/base"));
-const SpecificationFile_1 = require("../../core/models/SpecificationFile");
-const parser_1 = require("../../core/parser");
+const base_1 = tslib_1.__importDefault(require("../../internal/base"));
+const SpecificationFile_1 = require("../../../../domains/models/SpecificationFile");
 const prompts_1 = require("@clack/prompts");
 const picocolors_1 = require("picocolors");
 const modelina_cli_1 = require("@asyncapi/modelina-cli");
-const models_flags_1 = require("../../core/flags/generate/models.flags");
-const proxy_flags_1 = require("../../core/flags/proxy.flags");
+const models_flags_1 = require("../../internal/flags/generate/models.flags");
+const proxy_flags_1 = require("../../internal/flags/proxy.flags");
+const validation_service_1 = require("../../../../domains/services/validation.service");
 class Models extends base_1.default {
+    constructor() {
+        super(...arguments);
+        this.validationService = new validation_service_1.ValidationService();
+    }
     run() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const { args, flags } = yield this.parse(Models);
@@ -29,12 +33,27 @@ class Models extends base_1.default {
                 file = `${file}+${proxyUrl}`;
             }
             const inputFile = (yield (0, SpecificationFile_1.load)(file)) || (yield (0, SpecificationFile_1.load)());
-            const { document, diagnostics, status } = yield (0, parser_1.parse)(this, inputFile, flags);
+            const result = yield this.validationService.parseDocument(inputFile, {}, flags);
+            if (!result.success) {
+                this.error(`Failed to parse the AsyncAPI document: ${result.error}`, {
+                    exit: 1,
+                });
+            }
+            else if (!result.data) {
+                this.error('No data returned from parsing the AsyncAPI document.', {
+                    exit: 1,
+                });
+            }
+            const { document, diagnostics, status } = result.data;
             if (!document || status === 'invalid') {
                 const severityErrors = diagnostics.filter((obj) => obj.severity === 0);
-                this.log(`Input is not a correct AsyncAPI document so it cannot be processed.${(0, parser_1.formatOutput)(severityErrors, 'stylish', 'error')}`);
+                this.log(`Input is not a correct AsyncAPI document so it cannot be processed.${this.validationService.formatDiagnosticsOutput(severityErrors, 'stylish', 'error')}`);
                 return;
             }
+            if (flags['log-diagnostics'] && inputFile) {
+                this.handleGovernanceMessage(inputFile, diagnostics, status);
+                this.log(this.validationService.formatDiagnosticsOutput(diagnostics, flags['diagnostics-format'], flags['fail-severity']));
+            }
             const logger = {
                 info: (message) => {
                     this.log(message);
@@ -54,7 +73,9 @@ class Models extends base_1.default {
             try {
                 const generatedModels = yield (0, modelina_cli_1.generateModels)(Object.assign(Object.assign({}, flags), { output }), document, logger, language);
                 if (output && output !== 'stdout') {
-                    const generatedModelStrings = generatedModels.map((model) => { return model.modelName; });
+                    const generatedModelStrings = generatedModels.map((model) => {
+                        return model.modelName;
+                    });
                     s.stop((0, picocolors_1.green)(`Successfully generated the following models: ${generatedModelStrings.join(', ')}`));
                     return;
                 }
@@ -85,7 +106,11 @@ class Models extends base_1.default {
             if (!language) {
                 language = yield (0, prompts_1.select)({
                     message: 'Select the language you want to generate models for',
-                    options: Object.keys(modelina_cli_1.Languages).map((key) => ({ value: key, label: key, hint: modelina_cli_1.Languages[key] })),
+                    options: Object.keys(modelina_cli_1.Languages).map((key) => ({
+                        value: key,
+                        label: key,
+                        hint: modelina_cli_1.Languages[key],
+                    })),
                 });
                 askForOutput = true;
             }
@@ -119,6 +144,20 @@ class Models extends base_1.default {
             return { language, file, output: output !== null && output !== void 0 ? output : 'stdout' };
         });
     }
+    handleGovernanceMessage(document, diagnostics, status) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const sourceString = document.toSourceString();
+            const hasIssues = diagnostics && diagnostics.length > 0;
+            const isFailSeverity = status === validation_service_1.ValidationStatus.INVALID;
+            const governanceMessage = this.validationService.generateGovernanceMessage(sourceString, hasIssues, isFailSeverity);
+            if (isFailSeverity) {
+                this.logToStderr(governanceMessage);
+            }
+            else {
+                this.log(governanceMessage);
+            }
+        });
+    }
 }
 Models.description = 'Generates typed models';
 Models.args = modelina_cli_1.ModelinaArgs;

package/lib/{commands → apps/cli/commands}/new/file.d.ts

@@ -1,4 +1,4 @@
-import Command from '../../core/base';
+import Command from '../../internal/base';
 export default class NewFile extends Command {
     static description: string;
     static flags: {

package/lib/{commands → apps/cli/commands}/new/file.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
-const base_1 = tslib_1.__importDefault(require("../../core/base"));
+const base_1 = tslib_1.__importDefault(require("../../internal/base"));
 const inquirer = tslib_1.__importStar(require("inquirer"));
-const Studio_1 = require("../../core/models/Studio");
+const Studio_1 = require("../../../../domains/models/Studio");
 const path_1 = require("path");
-const SpecificationFile_1 = require("../../core/models/SpecificationFile");
+const SpecificationFile_1 = require("../../../../domains/models/SpecificationFile");
 const picocolors_1 = require("picocolors");
-const file_flags_1 = require("../../core/flags/new/file.flags");
+const file_flags_1 = require("../../internal/flags/new/file.flags");
 const { writeFile, readFile } = fs_1.promises;
 const DEFAULT_ASYNCAPI_FILE_NAME = 'asyncapi.yaml';
 const DEFAULT_ASYNCAPI_YAML_TEMPLATE = 'default-example.yaml';
 const DEFAULT_ASYNCAPI_JSON_TEMPLATE = 'default-example.json';
 function loadExampleFile() {
-    const exampleFiles = (0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../../assets/examples/examples.json'), { encoding: 'utf8' });
+    const exampleFiles = (0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../../../../assets/examples/examples.json'), { encoding: 'utf8' });
     return JSON.parse(exampleFiles);
 }
 function getExamplesFlagDescription() {
@@ -57,6 +57,7 @@ class NewFile extends base_1.default {
     /* eslint-disable sonarjs/cognitive-complexity */
     runInteractive() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // NOSONAR
             const { flags } = yield this.parse(NewFile); // NOSONAR
             let fileName = flags['file-name'];
             let selectedTemplate = flags['example'];
@@ -134,7 +135,7 @@ class NewFile extends base_1.default {
     }
     createAsyncapiFile(fileName, selectedTemplate) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const asyncApiFile = yield readFile((0, path_1.resolve)(__dirname, '../../../assets/examples/', selectedTemplate), { encoding: 'utf8' });
+            const asyncApiFile = yield readFile((0, path_1.resolve)(__dirname, '../../../../../assets/examples/', selectedTemplate), { encoding: 'utf8' });
             let fileNameToWriteToDisk;
             if (!fileName.includes('.')) {
                 fileNameToWriteToDisk = `${fileName}.yaml`;
@@ -150,7 +151,9 @@ class NewFile extends base_1.default {
                 }
             }
             try {
-                const content = yield readFile(fileNameToWriteToDisk, { encoding: 'utf8' });
+                const content = yield readFile(fileNameToWriteToDisk, {
+                    encoding: 'utf8',
+                });
                 if (content !== undefined) {
                     console.log(`A file named ${fileNameToWriteToDisk} already exists. Please choose a different name.`);
                     return;
@@ -172,6 +175,6 @@ NewFile.description = 'Creates a new asyncapi file';
 NewFile.flags = (0, file_flags_1.fileFlags)(getExamplesFlagDescription());
 NewFile.examples = [
     'asyncapi new\t - start creation of a file in interactive mode',
-    'asyncapi new --file-name=my-asyncapi.yaml --example=default-example.yaml --no-tty\t - create a new file with a specific name, using one of the examples and without interactive mode'
+    'asyncapi new --file-name=my-asyncapi.yaml --example=default-example.yaml --no-tty\t - create a new file with a specific name, using one of the examples and without interactive mode',
 ];
 exports.default = NewFile;

package/lib/{commands → apps/cli/commands}/new/glee.d.ts

@@ -1,5 +1,5 @@
-import Command from '../../core/base';
-import { Specification } from '../../core/models/SpecificationFile';
+import Command from '../../internal/base';
+import { Specification } from '../../../../domains/models/SpecificationFile';
 export declare const successMessage: (projectName: string) => string;
 export default class NewGlee extends Command {
     static description: string;

package/lib/{commands → apps/cli/commands}/new/glee.js

@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.successMessage = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
-const base_1 = tslib_1.__importDefault(require("../../core/base"));
+const base_1 = tslib_1.__importDefault(require("../../internal/base"));
 const path_1 = tslib_1.__importStar(require("path"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const SpecificationFile_1 = require("../../core/models/SpecificationFile");
+const SpecificationFile_1 = require("../../../../domains/models/SpecificationFile");
 const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
 const inquirer_1 = require("inquirer");
 // eslint-disable-next-line
 // @ts-ignore
 const generator_1 = tslib_1.__importDefault(require("@asyncapi/generator"));
 const picocolors_1 = require("picocolors");
-const glee_flags_1 = require("../../core/flags/new/glee.flags");
+const glee_flags_1 = require("../../internal/flags/new/glee.flags");
 const successMessage = (projectName) => `🎉 Your Glee project has been successfully created!
 ⏩ Next steps: follow the instructions ${(0, picocolors_1.cyan)('below')} to manage your project:
 
@@ -124,7 +124,7 @@ class NewGlee extends base_1.default {
             const { flags } = yield this.parse(NewGlee); // NOSONAR
             const { name: projectName, template: templateName, file, 'force-write': forceWrite, } = flags;
             const PROJECT_DIRECTORY = (0, path_1.join)(process.cwd(), projectName);
-            const GLEE_TEMPLATES_DIRECTORY = (0, path_1.resolve)(__dirname, '../../../assets/create-glee-app/templates/', templateName);
+            const GLEE_TEMPLATES_DIRECTORY = (0, path_1.resolve)(__dirname, '../../../../../assets/create-glee-app/templates/', templateName);
             const CURRENT_GLEE_TEMPLATE = 'https://github.com/KhudaDad414/glee-generator-template';
             if (file && templateName && templateName !== 'default') {
                 this.error('You cannot use both --t and --f in the same command.');

package/lib/{commands → apps/cli/commands}/new/index.d.ts

@@ -1,4 +1,4 @@
-import Command from '../../core/base';
+import Command from '../../internal/base';
 export default class New extends Command {
     static readonly description = "Create a new AsyncAPI project, specification files, or templates for clients and applications.";
     run(): Promise<void>;

package/lib/{commands → apps/cli/commands}/new/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const base_1 = tslib_1.__importDefault(require("../../core/base"));
+const base_1 = tslib_1.__importDefault(require("../../internal/base"));
 const core_1 = require("@oclif/core");
 class New extends base_1.default {
     run() {

package/lib/{commands → apps/cli/commands}/new/template.d.ts

@@ -1,4 +1,4 @@
-import Command from '../../core/base';
+import Command from '../../internal/base';
 export declare const successMessage: (projectName: string) => string;
 export default class template extends Command {
     static description: string;