Simplify notation

Author: reggie_7

lib/generator.js

@@ -22,18 +22,19 @@ class Generator {
     * @return {string} the template
 */
 function makeInitial(srcData, generator) {
-    let definitions = generator.data.definitions[generator.data.modelName];
-    let properties = definitions.properties;
+    let definitions = generator.data.definitions[generator.data.modelName]
+    let properties = definitions.properties
     var data = {
-        imports: getImports(properties),
+        imports: genImports(properties),
         ...generator.data
     }
-    var template = srcData.replace(/{{.*?}}/g, function(str, p1, offset, s) {
+
+    var template = srcData.replace(/{{.*?}}/g, function(str, _, _, _) {
         var key = str.trim().slice(2,str.trim().length-2).trim()
         var ret = data[key]
         if(ret === null || ret === undefined) {
             console.log('missing property:', key)
-            ret = '!!!'+key+'!!'
+            ret = `!!!${key}!!`
         }
 
         return ret
@@ -42,7 +43,7 @@ function makeInitial(srcData, generator) {
     return template
 }
 
-function getImports(properties) {
+function genImports(properties) {
     var result = new Set()
     for(var propName in properties) {
         var props = properties[propName]
@@ -74,16 +75,20 @@ function genNames(properties) {
     for(var propName in properties) {
         if (propName !== 'children') {
             var props = properties[propName]
-            if(props['x-source'] == 'inject') {
-                inject += '\t/* '+JSON.stringify(props)+' */\n'
+            if(props['x-source'] === 'inject') {
+                inject += `\t/* ${JSON.stringify(props)} */\n`
                 inject += '\t@Inject\n'
-                if(props['x-sourceName']) {
-                    inject += '\t@Named(value ="'+props['x-sourceName']+'")\n'
+
+                var sourceName = props['x-sourceName'];
+                if(sourceName) {
+                    inject += `\t@Named(value ="${sourceName}")\n`
                 }
-                if(props['x-default'] === "" || props['x-default']) {
-                    inject += '\t@Default(values ="'+props['x-default']+'")\n'
+
+                var x_default = props['x-default'];
+                if(x_default === "" || x_default) {
+                    inject += `\t@Default(values ="${x_default}")\n`
                 }
-                if(props['x-form-type'] === ('collection')) {
+                if(props['x-form-type'] === 'collection') {
                     if (Object.keys(props['properties']).length > 1 || props['x-form-multifield'] === "true" || props['x-form-multifield'] === true) {
                         inject += '\tprivate List<IComponent> '
                     } else {
@@ -92,15 +97,12 @@ function genNames(properties) {
                 }  else {
                     inject += '\tprivate String '
                 }
-                inject += propName
-                inject += ';'
-                inject += '\n'
-                inject += '\n'
+                inject += `${propName};\n\n`
                 var annotate = props['x-annotate']
                 if (annotate) {
                     inject += genNamesAnnotates(propName, annotate)
                 }
-            } else if(props['x-form-type'] === ('reference')) {
+            } else if(props['x-form-type'] === 'reference') {
                 inject += genNames(props.properties)
             }
         }
@@ -129,11 +131,11 @@ function genGetters(properties, customGetters) {
     inject = ''
     for(var propName in properties) {
         var getterName = propName.charAt(0).toUpperCase()+propName.slice(1)
-        if (propName !== 'children' && (customGetters === null || !customGetters.includes('public String get' + getterName + '()'))) {
+        if (propName !== 'children' && (customGetters === null || !customGetters.includes(`public String get${getterName}()`))) {
             var props = properties[propName]
             if(props['x-source'] == 'inject') {
-                inject += '\t/* '+JSON.stringify(props)+' */\n'
-                if(props['x-form-type'] === ('collection')) {
+                inject += `\t/* ${JSON.stringify(props)} */\n`
+                if(props['x-form-type'] === 'collection') {
                      if (Object.keys(props['properties']).length > 1 || props['x-form-multifield'] === "true" || props['x-form-multifield'] === true) {
                         inject += '\tpublic List<IComponent> get'
                     } else {
@@ -142,11 +144,9 @@ function genGetters(properties, customGetters) {
                 } else {
                     inject += '\tpublic String get'
                 }
-                inject += getterName + '() {\n'
-                inject += '\t\treturn '+propName+';\n'
-                inject += '\t}'
-                inject += '\n'
-                inject += '\n'
+                inject += `${getterName}() {\n`
+                inject += `\t\treturn ${propName};\n`
+                inject += '\t}\n\n'
                 var annotate = props['x-annotate']
                 if (annotate) {
                     inject += genGettersAnnotates(propName, annotate)