fixes stupid cheating shit

Author: danielcherubini

package-lock.json

@@ -11,16 +11,34 @@ class PropClass {
     }
 }
 
+function isLastElement(script: Object | any, currentElement: string): string {
+    const elementArray = Object.keys(script);
+    const lastElement = elementArray[elementArray.length - 1];
+
+    if (currentElement === lastElement) {
+        return '';
+    } else {
+        return ',';
+    }
+}
+
 function routesToString(routes: Object[]): string {
     let routeString = '';
-    routes.forEach(script => routeString += scriptToString(script) + ',');
-    return `[${routeString}]`.replace(new RegExp(/,}/, 'g'), '}').replace(new RegExp(/,]/, 'g'), ']');
+    const lastRoute = routes[routes.length-1];
+    routes.forEach(route => {
+        if (route !== lastRoute) {
+            routeString += scriptToString(route) + ',';
+        } else {
+            routeString += scriptToString(route);
+        }
+    });
+    return `[${routeString}]`;
 }
 
 function routeComponentsToString(script: Object): string {
     let componentString = '';
     for (let member in script) {
-        componentString += member + ': __' + script[member] + ',';
+        componentString += member + ': __' + script[member] + isLastElement(script, member);
     }
     return `{${componentString}}`;
 }
@@ -60,44 +78,44 @@ function scriptToString(script: Object | any): string {
                     const dataObj = xss(JSON.stringify(script[member]()));
                     scriptString += `${member}: function(){return ${dataObj}},`;
                 } else {
-                    scriptString += member + ': ' + String(script[member]) + ',';
+                    scriptString += member + ': ' + String(script[member]) + isLastElement(script, member);
                 }
                 break;
             case 'object':
                 if (member === 'data') {
-                    scriptString += member + ': ' + xss(JSON.stringify(script[member])) + ',';
+                    scriptString += member + ': ' + xss(JSON.stringify(script[member])) + isLastElement(script, member);
                 } else if (member === 'routes' || member === 'children') {
-                    scriptString += member + ': ' + routesToString(script[member]) + ',';
+                    scriptString += member + ': ' + routesToString(script[member]) + isLastElement(script, member);
                 } else if (member === 'components' && script['path'] !== undefined) { // Checks if 'components' is in a route object
-                    scriptString += member + ': ' + routeComponentsToString(script[member]) + ',';
+                    scriptString += member + ': ' + routeComponentsToString(script[member]) + isLastElement(script, member);
                 } else if (member === 'mixins') {
                     scriptString += member + ': [' + mixinsToString(script[member]) + '],';
                 } else if (script[member].constructor === Array) {
-                    scriptString += member + ': ' + xss(JSON.stringify(script[member])) + ',';
+                    scriptString += member + ': ' + xss(JSON.stringify(script[member])) + isLastElement(script, member);
                 } else if (member === 'props') {
                     if (script[member][Object.keys(script[member])[0]].type === null) {
                         var propsArray = Object.keys(script[member]);
-                        scriptString += member + ': ' + xss(JSON.stringify(propsArray)) + ',';
+                        scriptString += member + ': ' + xss(JSON.stringify(propsArray)) + isLastElement(script, member);
                     } else {
-                        // scriptString += member + ': ' + scriptToString(script[member]) + ',';
+                        // scriptString += member + ': ' + scriptToString(script[member]) + isLastElement(script, member);
                         const propsString = propsToString(script[member]);
                         scriptString += `${member}: ${propsString},`;
                     }
 
                 } else {
-                    scriptString += member + ': ' + scriptToString(script[member]) + ',';
+                    scriptString += member + ': ' + scriptToString(script[member]) + isLastElement(script, member);
                 }
                 break;
             default:
                 if (member === 'component' && script['path'] !== undefined) { // Checks if 'component' is in a route object
-                    scriptString += member + ': __' + script[member] + ',';
+                    scriptString += member + ': __' + script[member] + isLastElement(script, member);
                 } else {
-                    scriptString += member + ': ' + JSON.stringify(script[member]) + ',';
+                    scriptString += member + ': ' + JSON.stringify(script[member]) + isLastElement(script, member);
                 }
                 break;
         }
     }
-    let finalScriptString = `{${scriptString}}`.replace(new RegExp(/,}/, 'g'), '}').replace(new RegExp(/,]/, 'g'), ']');
+    let finalScriptString = `{${scriptString}}`;
     return finalScriptString;
 }
 

src/utils/string.js

@@ -12,7 +12,7 @@ export default {
         uuid: {
             type: String,
             default: 'missing',
-            required: true
+            required: false
         }
     },
     data: function () {