Merge branch 'master' into support_protobuf

.eslintignore

@@ -3,5 +3,5 @@ dist
 lib
 /test/commands/generate/models/
 test/helpers
-/test/minimaltemplate
+/test/fixtures/minimaltemplate
 create-glee-app

.gitignore

@@ -13,10 +13,16 @@
 !assets/examples/default-example.yaml
 !assets/examples/tutorial.yml
 node_modules
-/test/commands/generate/models/
+/test/integration/generate/models/
 asyncapi.json
 asyncapi.yml
-test/minimaltemplate/__transpiled
+test/fixtures/minimaltemplate/__transpiled
 .vscode
+
+
 oclif.manifest.json
-spec-examples.zip
+spec-examples.zip
+
+# Coverage for testing
+
+coverage

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

@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/asyncapi/glee-hello-world#readme",
   "dependencies": {
-    "@asyncapi/glee": "^0.26.2"
+    "@asyncapi/glee": "^0.26.3"
   },
   "devDependencies": {
     "@types/node": "^20.5.9"

docs/installation.md

@@ -43,7 +43,7 @@ asyncapi/cli [COMMAND HERE]
 # Example that you can run inside the cli directory after cloning this repository. First, you specify the mount in the location of your AsyncAPI specification file and then you mount it in the directory where the generation result should be saved.
 docker run --rm -it \
    --user=root \
-   -v ${PWD}/test/fixtures/asyncapi_v1.yml:/app/asyncapi.yml \
+   -v ${PWD}/test/integration/fixtures/asyncapi_v1.yml:/app/asyncapi.yml \
    -v ${PWD}/output:/app/output \
    asyncapi/cli generate fromTemplate -o /app/output /app/asyncapi.yml @asyncapi/html-template --force-write
 ```

docs/usage.md

@@ -29,7 +29,7 @@ $ npm install -g @asyncapi/cli
 $ asyncapi COMMAND
 running command...
 $ asyncapi (--version)
-@asyncapi/cli/0.54.5 linux-x64 node-v18.17.1
+@asyncapi/cli/0.54.7 linux-x64 node-v18.17.1
 $ asyncapi --help [COMMAND]
 USAGE
   $ asyncapi COMMAND
@@ -93,7 +93,7 @@ EXAMPLES
   $ asyncapi bundle ./asyncapi.yaml ./features.yaml --base ./asyncapi.yaml --reference-into-components
 ```
 
-_See code: [src/commands/bundle.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/bundle.ts)_
+_See code: [src/commands/bundle.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/bundle.ts)_
 
 ## `asyncapi config`
 
@@ -107,7 +107,7 @@ DESCRIPTION
   CLI config settings
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/config/index.ts)_
 
 ## `asyncapi config context`
 
@@ -282,7 +282,7 @@ DESCRIPTION
   Convert asyncapi documents older to newer versions
 ```
 
-_See code: [src/commands/convert.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/convert.ts)_
+_See code: [src/commands/convert.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/convert.ts)_
 
 ## `asyncapi diff OLD NEW`
 
@@ -337,7 +337,7 @@ DESCRIPTION
   Find diff between two asyncapi files
 ```
 
-_See code: [src/commands/diff.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/diff.ts)_
+_See code: [src/commands/diff.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/diff.ts)_
 
 ## `asyncapi generate`
 
@@ -351,7 +351,7 @@ DESCRIPTION
   Generate typed models or other things like clients, applications or docs using AsyncAPI Generator templates.
 ```
 
-_See code: [src/commands/generate/index.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/generate/index.ts)_
+_See code: [src/commands/generate/index.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/generate/index.ts)_
 
 ## `asyncapi generate fromTemplate ASYNCAPI TEMPLATE`
 
@@ -513,7 +513,7 @@ EXAMPLES
   $ asyncapi new --file-name=my-asyncapi.yml --example=default-example.yml --no-tty	 - create a new file with a specific name, using one of the examples and without interactive mode
 ```
 
-_See code: [src/commands/new/index.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/new/index.ts)_
+_See code: [src/commands/new/index.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/new/index.ts)_
 
 ## `asyncapi new file`
 
@@ -634,7 +634,7 @@ EXAMPLES
   $ asyncapi optimize ./asyncapi.yaml --optimization=remove-components,reuse-components,move-to-components --output=terminal --no-tty
 ```
 
-_See code: [src/commands/optimize.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/optimize.ts)_
+_See code: [src/commands/optimize.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/optimize.ts)_
 
 ## `asyncapi start`
 
@@ -648,7 +648,7 @@ DESCRIPTION
   Start asyncapi studio
 ```
 
-_See code: [src/commands/start/index.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/start/index.ts)_
+_See code: [src/commands/start/index.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/start/index.ts)_
 
 ## `asyncapi start studio`
 
@@ -692,5 +692,5 @@ DESCRIPTION
   validate asyncapi file
 ```
 
-_See code: [src/commands/validate.ts](https://github.com/asyncapi/cli/blob/v0.54.5/src/commands/validate.ts)_
+_See code: [src/commands/validate.ts](https://github.com/asyncapi/cli/blob/v0.54.7/src/commands/validate.ts)_
 <!-- commandsstop -->

jest.config.ts

@@ -2,7 +2,8 @@ import type { Config } from '@jest/types';
 
 const config: Config.InitialOptions = {
   coverageReporters: [
-    'text'
+    'text',
+    'html'
   ],
   transform: {
     '^.+\\.(t|j)sx?$': '@swc/jest',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asyncapi/cli",
   "description": "All in one CLI for all AsyncAPI tools",
-  "version": "0.54.6",
+  "version": "0.54.8",
   "author": "@asyncapi",
   "bin": {
     "asyncapi": "./bin/run"
@@ -12,7 +12,7 @@
     "@asyncapi/bundler": "^0.3.8",
     "@asyncapi/converter": "^1.3.1",
     "@asyncapi/diff": "^0.4.1",
-    "@asyncapi/generator": "^1.10.14",
+    "@asyncapi/generator": "^1.11.0",
     "@asyncapi/modelina": "^1.9.0",
     "@asyncapi/openapi-schema-parser": "^3.0.3",
     "@asyncapi/optimizer": "^0.2.1",
@@ -44,7 +44,7 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
-    "@asyncapi/minimaltemplate": "./test/minimaltemplate",
+    "@asyncapi/minimaltemplate": "./test/fixtures/minimaltemplate",
     "@babel/core": "^7.19.3",
     "@jest/types": "^29.1.0",
     "@oclif/test": "^2",

test/minimaltemplate/package.json → test/fixtures/minimaltemplate/package.json

@@ -9,7 +9,7 @@
         "description": "Custom version to be used"
       },
       "mode": {
-        "description": "developement or production"
+        "description": "development or production"
       }
     }
   },

test/testHelper.ts → test/helpers/index.ts

@@ -1,21 +1,21 @@
 import { existsSync, writeFileSync, unlinkSync, rmSync, mkdirSync , promises as fs } from 'fs';
 import * as path from 'path';
-import { IContextFile, CONTEXT_FILE_PATH } from '../src/models/Context';
-import SpecificationFile from '../src/models/SpecificationFile';
+import { IContextFile, CONTEXT_FILE_PATH } from '../../src/models/Context';
+import SpecificationFile from '../../src/models/SpecificationFile';
 import http from 'http';
 
 const ASYNCAPI_FILE_PATH = path.resolve(process.cwd(), 'specification.yaml');
-const SERVER_DIRECTORY= path.join(__dirname, 'dummyspec');
+const SERVER_DIRECTORY= path.join(__dirname, '../fixtures/dummyspec');
 export const PROJECT_DIRECTORY_PATH = path.join(process.cwd(), 'test-project');
 
 let server: http.Server;
 
 export default class ContextTestingHelper {
   private _context: IContextFile;
   constructor() {
-    const homeSpecFile = new SpecificationFile(path.resolve(__dirname, 'specification.yml'));
+    const homeSpecFile = new SpecificationFile(path.resolve(__dirname, '../fixtures/specification.yml'));
 
-    const codeSpecFile = new SpecificationFile(path.resolve(__dirname, 'specification.yml'));
+    const codeSpecFile = new SpecificationFile(path.resolve(__dirname, '../fixtures/specification.yml'));
     this._context = {
       current: 'home',
       store: {