Merge branch 'next' into revert_from_tarball

modelina-cli/README.md

@@ -170,7 +170,7 @@ $ npm install -g @asyncapi/modelina-cli
 $ modelina COMMAND
 running command...
 $ modelina (--version)
-@asyncapi/modelina-cli/4.0.0-next.44 linux-x64 node-v18.20.3
+@asyncapi/modelina-cli/4.0.0-next.45 linux-x64 node-v18.20.3
 $ modelina --help [COMMAND]
 USAGE
   $ modelina COMMAND
@@ -204,7 +204,7 @@ DESCRIPTION
   CLI config settings
 ```
 
-_See code: [src/commands/config/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/index.ts)_
+_See code: [src/commands/config/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/index.ts)_
 
 ## `modelina config context`
 
@@ -218,7 +218,7 @@ DESCRIPTION
   Manage short aliases for full paths to inputs
 ```
 
-_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/context/index.ts)_
+_See code: [src/commands/config/context/index.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/context/index.ts)_
 
 ## `modelina config context add CONTEXT-NAME SPEC-FILE-PATH`
 
@@ -240,7 +240,7 @@ DESCRIPTION
   Add a context to the store
 ```
 
-_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/context/add.ts)_
+_See code: [src/commands/config/context/add.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/context/add.ts)_
 
 ## `modelina config context current`
 
@@ -257,7 +257,7 @@ DESCRIPTION
   Shows the current context that is being used
 ```
 
-_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/context/current.ts)_
+_See code: [src/commands/config/context/current.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/context/current.ts)_
 
 ## `modelina config context edit CONTEXT-NAME NEW-SPEC-FILE-PATH`
 
@@ -278,7 +278,7 @@ DESCRIPTION
   Edit a context in the store
 ```
 
-_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/context/edit.ts)_
+_See code: [src/commands/config/context/edit.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/context/edit.ts)_
 
 ## `modelina config context init [CONTEXT-FILE-PATH]`
 
@@ -301,7 +301,7 @@ DESCRIPTION
   Initialize context
 ```
 
-_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/context/init.ts)_
+_See code: [src/commands/config/context/init.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/context/init.ts)_
 
 ## `modelina config context list`
 
@@ -318,7 +318,7 @@ DESCRIPTION
   List all the stored contexts in the store
 ```
 
-_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/context/list.ts)_
+_See code: [src/commands/config/context/list.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/context/list.ts)_
 
 ## `modelina config context remove CONTEXT-NAME`
 
@@ -338,7 +338,7 @@ DESCRIPTION
   Delete a context from the store
 ```
 
-_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/context/remove.ts)_
+_See code: [src/commands/config/context/remove.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/context/remove.ts)_
 
 ## `modelina config context use CONTEXT-NAME`
 
@@ -358,7 +358,7 @@ DESCRIPTION
   Set a context as current
 ```
 
-_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/config/context/use.ts)_
+_See code: [src/commands/config/context/use.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/config/context/use.ts)_
 
 ## `modelina generate LANGUAGE FILE`
 
@@ -416,5 +416,5 @@ DESCRIPTION
   Generates typed models
 ```
 
-_See code: [src/commands/generate.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.44/modelina-cli/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/asyncapi/modelina/blob/v4.0.0-next.45/modelina-cli/src/commands/generate.ts)_
 <!-- commandsstop -->

modelina-cli/bin/dev

@@ -1,2 +1,17 @@
-import {execute} from '@oclif/core';
-await execute({development: true, dir: import.meta.url});
+#!/usr/bin/env nod
+
+const oclif = require('@oclif/core')
+
+const path = require('path')
+const project = path.join(__dirname, '..', 'tsconfig.json')
+
+// In dev mode -> use ts-node and dev plugins
+process.env.NODE_ENV = 'development'
+
+require('ts-node').register({project})
+
+// In dev mode, always show stack traces
+oclif.settings.debug = true;
+
+// Start the CLI
+oclif.run().then(oclif.flush).catch(oclif.Errors.handle)

modelina-cli/bin/run

@@ -1,4 +1,12 @@
 #!/usr/bin/env node
 
-import {execute} from '@oclif/core';
-await execute({dir: import.meta.url});
+process.env.NODE_ENV = 'development';
+
+const oclif = require('@oclif/core');
+
+oclif.run()
+  .then(require('@oclif/core/flush'))
+  .catch((err) => {
+    const oclifHandler = require('@oclif/core/handle');
+    return oclifHandler(err.message);
+  });

modelina-cli/bin/run_bin

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+
+// Only the binary installed through NPM is considered production environment. See "bin" in package.json.
+process.env.NODE_ENV = 'production';
+
+const oclif = require('@oclif/core');
+
+oclif.run()
+  .then(require('@oclif/core/flush'))
+  .catch((err) => {
+    const oclifHandler = require('@oclif/core/handle');
+    return oclifHandler(err.message);
+  });

modelina-cli/bin/run_bin.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\run_bin" %*

modelina-cli/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@asyncapi/modelina-cli",
   "description": "CLI to work with Modelina",
-  "version": "4.0.0-next.45",
+  "version": "4.0.0-next.46",
   "bin": {
-    "modelina": "./bin/run"
+    "modelina": "./bin/run_bin"
   },
   "bugs": "https://github.com/asyncapi/modelina/issues",
   "dependencies": {

modelina-cli/src/commands/generate.ts

@@ -45,7 +45,5 @@ ${model.result}
       });
       logger.info(`Successfully generated the following models: ${generatedModelsString.join('\n')}`);
     }
-
-
   }
 }

modelina-cli/tsconfig.json

@@ -23,4 +23,4 @@
   "include": [
     "src"
   ]
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/modelina",
-  "version": "4.0.0-next.45",
+  "version": "4.0.0-next.46",
   "description": "Library for generating data models based on inputs such as AsyncAPI, OpenAPI, or JSON Schema documents",
   "license": "Apache-2.0",
   "homepage": "https://www.modelina.org",