Merge branch 'master' of https://github.com/korzio/djv

lib/utils/properties.js

@@ -85,10 +85,10 @@ module.exports = {
         comparedValue = `'${JSON.stringify(value)}'`;
         $1 = fn.cache('JSON.stringify($1)');
       } else if (typeof value === 'string') {
-        comparedValue = `'${value}'`;
+        comparedValue = `'${encodeURIComponent(value)}'`;
       }
 
-      return `${$1} !== ${comparedValue}`;
+      return `${$1} != decodeURIComponent(${comparedValue})`;
     }).join(' && ');
   }
 };

lib/utils/template.js

@@ -37,20 +37,28 @@ function template(state, options) {
   const error = typeof options.errorHandler === 'function' ?
     options.errorHandler :
     function defaultErrorHandler(errorType) {
-      const path = this.data.toString().replace(/^data/, '');
+      const path = this.data.toString()
+        .replace(/^data/, '');
       const dataPath = path
         .replace(/\['([^']+)'\]/ig, '.$1')
         .replace(/\[(i[0-9]*)\]/ig, '[\'+$1+\']');
       const schemaPath = `#${
         path
           .replace(/\[i([0-9]*)\]/ig, '/items')
           .replace(/\['([^']+)'\]/ig, '/properties/$1')
-      }/${errorType}`;
-
+        }/${errorType}`;
+      function clearDecode(tplString) {
+        return tplString
+          .replace('[', '')
+          .replace(']', '')
+          .replace('(', '')
+          .replace(')', '')
+          .replace('decodeURIComponent', '');
+      }
       return `return {
         keyword: '${errorType}',
-        dataPath: '${dataPath}',
-        schemaPath: '${schemaPath}'
+        dataPath: decodeURIComponent("${clearDecode(dataPath)}"),
+        schemaPath: decodeURIComponent("${clearDecode(schemaPath)}")
       };`;
     };
 

lib/validators/dependencies.js

@@ -12,10 +12,10 @@ module.exports = function dependencies(schema, tpl) {
     const value = schema.dependencies[dependency];
     const error = tpl.error('dependencies');
 
-    tpl(`if (${tpl.data}.hasOwnProperty("${dependency}")) {`);
+    tpl(`if (${tpl.data}.hasOwnProperty(decodeURIComponent("${encodeURIComponent(dependency)}"))) {`);
     if (Array.isArray(value) || typeof value === 'string') {
       [...value]
-        .map(property => `if (!${tpl.data}.hasOwnProperty("${property}")) ${error}`)
+        .map(property => `if (!${tpl.data}.hasOwnProperty(decodeURIComponent("${encodeURIComponent(property)}"))) ${error}`)
         .map(tpl);
     } else if (isSchema(value)) {
       tpl.visit(value);

lib/validators/properties.js

@@ -14,10 +14,10 @@ module.exports = function properties(schema, tpl) {
 
       const isNotRequired = !schema.required || schema.required.indexOf(propertyKey) === -1;
       if (isNotRequired) {
-        tpl(`if (${tpl.data}.hasOwnProperty("${propertyKey}")) {`);
+        tpl(`if (${tpl.data}.hasOwnProperty(decodeURIComponent("${encodeURIComponent(propertyKey)}"))) {`);
       }
 
-      tpl.data.push(`['${propertyKey}']`);
+      tpl.data.push(`[decodeURIComponent('${encodeURIComponent(propertyKey)}')]`);
       tpl.visit(propertySchema);
       tpl.data.pop();
 

lib/validators/required.js

@@ -5,7 +5,7 @@ module.exports = function required(schema, tpl) {
 
   tpl(`if (${tpl.data} !== null && typeof ${tpl.data} === 'object' && !Array.isArray(${tpl.data})) {
     ${schema.required.map((name) => {
-      const condition = `!${tpl.data}.hasOwnProperty("${name}")`;
+      const condition = `!${tpl.data}.hasOwnProperty(decodeURIComponent("${encodeURIComponent(name)}"))`;
       const error = tpl.error('required', name);
       return `if (${condition}) ${error}`;
     }).join('')}