@asyncapi/generator 1.13.0 → 1.13.1

package/docs/api.md

@@ -26,10 +26,10 @@ Reference API documentation for AsyncAPI Generator library.
         * [.hooks](#Generator+hooks) : `Object`
         * [.mapBaseUrlToFolder](#Generator+mapBaseUrlToFolder) : `Object`
         * [.templateParams](#Generator+templateParams) : `Object`
-        * [.originalAsyncAPI](#Generator+originalAsyncAPI) : `String`
-        * [.generate(asyncapiDocument)](#Generator+generate) ⇒ `Promise`
+        * [.generate(asyncapiDocument, [parseOptions])](#Generator+generate) ⇒ `Promise`
+        * [.parseInput()](#Generator+parseInput)
         * [.configureTemplate()](#Generator+configureTemplate)
-        * [.generateFromString(asyncapiString, [parseOptions])](#Generator+generateFromString) ⇒ `Promise`
+        * ~~[.generateFromString(asyncapiString, [parseOptions])](#Generator+generateFromString) ⇒ `Promise`~~
         * [.generateFromURL(asyncapiURL)](#Generator+generateFromURL) ⇒ `Promise`
         * [.generateFromFile(asyncapiFile)](#Generator+generateFromFile) ⇒ `Promise`
         * [.installTemplate([force])](#Generator+installTemplate)
@@ -163,13 +163,6 @@ The template parameters. The structure for this object is based on each individu
 
 **Kind**: instance property of [`Generator`](#Generator)  
 
-<a name="Generator+originalAsyncAPI"></a>
-
-* generator.originalAsyncAPI : `String`** :
-AsyncAPI string to use as a source.
-
-**Kind**: instance property of [`Generator`](#Generator)  
-
 <a name="Generator+generate"></a>
 
 ### generator.generate
@@ -178,7 +171,8 @@ Generates files from a given template and an AsyncAPIDocument object.
 **Kind**: instance method of [`Generator`](#Generator)  
 **Params**
 
-- asyncapiDocument `AsyncAPIDocument` - AsyncAPIDocument object to use as source.
+- asyncapiDocument `AsyncAPIDocument` | `string` - AsyncAPIDocument object to use as source.
+- [parseOptions] `Object` ` = {}` - AsyncAPI Parser parse options. Check out [@asyncapi/parser](https://www.github.com/asyncapi/parser-js) for more information. Remember to use the right options to the right parser depending on the template you are using.
 
 **Example**  
 ```js
@@ -199,6 +193,13 @@ try {
 }
 ```
 
+<a name="Generator+parseInput"></a>
+
+* generator.parseInput()** :
+Parse the generator input based on the template `templateConfig.apiVersion` value.
+
+**Kind**: instance method of [`Generator`](#Generator)  
+
 <a name="Generator+configureTemplate"></a>
 
 * generator.configureTemplate()** :
@@ -208,7 +209,9 @@ Configure the templates based the desired renderer.
 
 <a name="Generator+generateFromString"></a>
 
-### generator.generateFromString
+### ~~generator.generateFromString~~
+***Deprecated***
+
 Generates files from a given template and AsyncAPI string.
 
 **Kind**: instance method of [`Generator`](#Generator)  

package/lib/parser.js

@@ -8,17 +8,18 @@ const parser = module.exports;
  * Convert the template defined value `apiVersion: 'v1'` to only contain the numeric value `1`.
  */
 parser.sanitizeTemplateApiVersion = (apiVersion) => {
+  if (!apiVersion) return;
   if (apiVersion && apiVersion.length > 1) {
-    return apiVersion.substring(1);
+    return Number(apiVersion.substring(1));
   }
-  return apiVersion;
+  return Number(apiVersion);
 };
 
 parser.parse = async (asyncapi, oldOptions, generator) => {
   let apiVersion = this.sanitizeTemplateApiVersion(generator.templateConfig.apiVersion);
   // Defaulting to apiVersion v1 to convert it to the Parser-API v1 afterwards.
   if (!this.usesNewAPI(generator.templateConfig)) {
-    apiVersion = '1';
+    apiVersion = 1;
   }
   const options = convertOldOptionsToNew(oldOptions, generator);
   const parser = NewParser(apiVersion, {parserOptions: options, includeSchemaParsers: true});
@@ -34,7 +35,7 @@ parser.parse = async (asyncapi, oldOptions, generator) => {
  * If the template expect one of the Parser-API versions, it must be above 0
  */
 parser.usesNewAPI = (templateConfig = {}) => {
-  return Number(this.sanitizeTemplateApiVersion(templateConfig.apiVersion)) > 0;
+  return this.sanitizeTemplateApiVersion(templateConfig.apiVersion) > 0;
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/generator",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "The AsyncAPI generator. It can generate documentation, code, anything!",
   "main": "./lib/generator.js",
   "bin": {
@@ -51,7 +51,7 @@
     "@asyncapi/generator-react-sdk": "^0.2.23",
     "@asyncapi/parser": "2.1.0",
     "@npmcli/arborist": "^2.2.4",
-    "@smoya/multi-parser": "3.0.0",
+    "@smoya/multi-parser": "^4.0.0",
     "ajv": "^8.12.0",
     "chokidar": "^3.4.0",
     "commander": "^6.1.0",