5htp-core 0.3.6-1 → 0.3.6-3

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.3.6-1",
+	"version": "0.3.6-3",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/src/client/services/router/index.tsx

@@ -345,7 +345,7 @@ export default class ClientRouter<
 
             } catch (e) {
                 console.error(`Failed to fetch the route ${route.chunk}`, e);
-                this.app.handleError(new Error("Failed to load content. Please make sure you're connected to Internet."));
+                this.app.handleError(new Error("Failed to load content. Please reload the page and try again."));
                 throw e;
             }
 

package/src/server/services/database/index.ts

@@ -170,14 +170,19 @@ export default class SQL extends Service<Config, Hooks, Application, Services> {
         return query;
     }
 
-    public esc(data: any) {
+    public esc( data: any, forStorage: boolean = false ) {
 
         // JSON object
         // TODO: do it via datatypes.ts
         if (typeof data === 'object' && data !== null) {
 
+            // Object: stringify in JSON
             if (data.constructor.name === "Object")
                 data = safeStringify(data);
+            // Array: if for storage, reparate items with a comma
+            else if (forStorage && Array.isArray( data )) {
+                data = data.join(',')
+            } 
         }
     
         return mysql.escape(data);
@@ -474,7 +479,7 @@ export default class SQL extends Service<Config, Hooks, Application, Services> {
                 const values: string[] = [];
                 for (const col of colNames)
                     if (col in entry)
-                        values.push( this.esc( entry[col] ));
+                        values.push( this.esc( entry[col], true));
                     else
                         values.push("DEFAULT");
 
@@ -528,7 +533,7 @@ export default class SQL extends Service<Config, Hooks, Application, Services> {
             const { '*': updateAll, ...customValuesToUpdate } = colsToUpdate;
 
             for (const colKey in customValuesToUpdate)
-                valuesToUpdate[ colKey ] = this.esc(customValuesToUpdate[ colKey ]);
+                valuesToUpdate[ colKey ] = this.esc(customValuesToUpdate[ colKey ], true);
 
             if (updateAll)
                 valuesNamesToUpdate = Object.keys(table.colonnes);//table.columnNamesButPk;