Merge pull request #17 from qial/issues/16

Fixed issues with JSON properties

Author: reusr1

lib/functions.js

@@ -860,8 +860,12 @@ const f = {
                 var collection = content.ele(key).att('jcr:primaryType','nt:unstructured')
                 for(var i = 0; i < value.length; i++) {
                     var children = collection.ele(key+i).att('jcr:primaryType','nt:unstructured')
-                    for (childKey in value[i])
-                    children.att(childKey, value[i][childKey])
+                    for (childKey in value[i]) {
+                        if(value[i][childKey].startsWith('{'))
+                            children.att(childkey, '\\' + value[i][childKey])
+                        else
+                            children.att(childKey, value[i][childKey])
+                    }
                 }
             } else {
                 content.att(key,value)
@@ -891,11 +895,18 @@ const f = {
                 var collection = versionContent.ele(key).att('jcr:primaryType','nt:unstructured')
                 for(var i = 0; i < value.length; i++) {
                     var children = collection.ele(key+i).att('jcr:primaryType','nt:unstructured')
-                    for (childKey in value[i])
-                    children.att(childKey, value[i][childKey])
+                    for (childKey in value[i]) {
+                        if(value[i][childKey].startsWith('{'))
+                            children.att(childkey, '\\' + value[i][childKey])
+                        else
+                            children.att(childKey, value[i][childKey])
+                    }
                 }
             } else {
-                versionContent.att(key,value)
+                if(value.toString().startsWith('{'))
+                    versionContent.att(key,'\\' + value)
+                else
+                    versionContent.att(key, value)
             }
         }
         return xml

lib/htmltovue.js

@@ -120,7 +120,9 @@ function htmltovue(name, container, compile, deploy, dialog, model, vue, samplee
 
             const templateVue = fs.readFileSync(path.join(componentPath, 'template.vue')).toString()
             const newTemplateVue = templateVue.replace(/^<template>[\s\S]*^<\/template>/m, out).replace(/&apos;/g, '\'')
-            if ((convertVue && templateVue.valueOf() !== newTemplateVue.valueOf()) || (convertVue && !fs.existsSync(path.join(uiAppsComponentPath, 'template.vue')))) {
+            const uiAppsTemplatePath = path.join(uiAppsComponentPath, 'template.vue')
+            const uiAppsTemplateMatches = fs.existsSync(uiAppsTemplatePath) && fs.readFileSync(uiAppsTemplatePath).toString().valueOf() === templateVue.valueOf()
+            if ((convertVue && templateVue.valueOf() !== newTemplateVue.valueOf()) || (convertVue && !uiAppsTemplateMatches)) {
                 fs.writeFileSync(path.join(componentPath, 'template.vue'), newTemplateVue)
 
                 // copy template.vue file to component