Fixed broken tests on escaped characters

+replaced "escape" at all
korzio · May 25, 2019 · f0fe666 · f0fe666
1 parent ca832b4
commit f0fe666
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/utils/properties.js b/lib/utils/properties.js
@@ -85,7 +85,7 @@ module.exports = {
         comparedValue = `'${JSON.stringify(value)}'`;
         $1 = fn.cache('JSON.stringify($1)');
       } else if (typeof value === 'string') {
-        comparedValue = `'${escape(value)}'`;
+        comparedValue = `'${encodeURIComponent(value)}'`;
       }
 
       return `${$1} != decodeURIComponent(${comparedValue})`;

diff --git a/lib/validators/dependencies.js b/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(decodeURIComponent("${escape(dependency)}"))) {`);
+    tpl(`if (${tpl.data}.hasOwnProperty(decodeURIComponent("${encodeURIComponent(dependency)}"))) {`);
     if (Array.isArray(value) || typeof value === 'string') {
       [...value]
-        .map(property => `if (!${tpl.data}.hasOwnProperty(decodeURIComponent("${escape(property)}"))) ${error}`)
+        .map(property => `if (!${tpl.data}.hasOwnProperty(decodeURIComponent("${encodeURIComponent(property)}"))) ${error}`)
         .map(tpl);
     } else if (isSchema(value)) {
       tpl.visit(value);

diff --git a/lib/validators/properties.js b/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(decodeURIComponent("${escape(propertyKey)}"))) {`);
+        tpl(`if (${tpl.data}.hasOwnProperty(decodeURIComponent("${encodeURIComponent(propertyKey)}"))) {`);
       }
 
-      tpl.data.push(`[decodeURIComponent('${escape(propertyKey)}')]`);
+      tpl.data.push(`[decodeURIComponent('${encodeURIComponent(propertyKey)}')]`);
       tpl.visit(propertySchema);
       tpl.data.pop();
 

diff --git a/lib/validators/required.js b/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(decodeURIComponent("${escape(name)}"))`;
+      const condition = `!${tpl.data}.hasOwnProperty(decodeURIComponent("${encodeURIComponent(name)}"))`;
       const error = tpl.error('required', name);
       return `if (${condition}) ${error}`;
     }).join('')}