Fix/compiler for ubo

.travis.yml

@@ -7,6 +7,3 @@ cache: false
 
 script:
   - bash -e ./build.sh
-
-notifications:
-  slack: performix:yXTihlSzsLFSZiqbXMNzvTSX

dist/cjs/scriptlets.cjs.js

@@ -4170,34 +4170,41 @@ var isAbpRedirectCompatibleWithAdg = function isAbpRedirectCompatibleWithAdg(rul
 
 
 var hasValidContentType = function hasValidContentType(rule) {
-  if (isRedirectRuleByType(rule, 'ADG')) {
-    var ruleModifiers = parseModifiers(rule); // rule can have more than one source type modifier
+  if (!isRedirectRuleByType(rule, 'ADG')) {
+    throw new Error("Unable to convert - not an ADG rule: ".concat(rule));
+  }
 
-    var sourceTypes = ruleModifiers.filter(function (el) {
-      return VALID_SOURCE_TYPES.indexOf(el) > -1;
-    });
-    var isSourceTypeSpecified = sourceTypes.length > 0;
-    var isEmptyRedirect = ruleModifiers.indexOf("".concat(ADG_UBO_REDIRECT_MARKER).concat(EMPTY_REDIRECT_MARKER)) > -1;
-
-    if (isEmptyRedirect) {
-      if (isSourceTypeSpecified) {
-        var isValidType = sourceTypes.reduce(function (acc, sType) {
-          var isEmptySupported = EMPTY_REDIRECT_SUPPORTED_TYPES.find(function (type) {
-            return type === sType;
-          });
-          return !!isEmptySupported && acc;
-        }, true);
-        return isValidType;
-      } // no source type for 'empty' is allowed
+  if (!isAdgRedirectCompatibleWithUbo(rule)) {
+    throw new Error("Unable to convert - unsupported by uBO redirect in rule: ".concat(rule));
+  } // if (isAdgRedirectCompatibleWithUbo(rule)) {
+  // if (isRedirectRuleByType(rule, 'ADG')) {
 
 
-      return true;
-    }
+  var ruleModifiers = parseModifiers(rule); // rule can have more than one source type modifier
 
-    return isSourceTypeSpecified;
+  var sourceTypes = ruleModifiers.filter(function (el) {
+    return VALID_SOURCE_TYPES.indexOf(el) > -1;
+  });
+  var isSourceTypeSpecified = sourceTypes.length > 0;
+  var isEmptyRedirect = ruleModifiers.indexOf("".concat(ADG_UBO_REDIRECT_MARKER).concat(EMPTY_REDIRECT_MARKER)) > -1;
+
+  if (isEmptyRedirect) {
+    if (isSourceTypeSpecified) {
+      var isValidType = sourceTypes.reduce(function (acc, sType) {
+        var isEmptySupported = EMPTY_REDIRECT_SUPPORTED_TYPES.find(function (type) {
+          return type === sType;
+        });
+        return !!isEmptySupported && acc;
+      }, true);
+      return isValidType;
+    } // no source type for 'empty' is allowed
+
+
+    return true;
   }
 
-  return false;
+  return isSourceTypeSpecified; // }
+  // return false;
 };
 
 var validator = {

dist/scriptlets.js

@@ -4171,34 +4171,41 @@
 
 
     var hasValidContentType = function hasValidContentType(rule) {
-      if (isRedirectRuleByType(rule, 'ADG')) {
-        var ruleModifiers = parseModifiers(rule); // rule can have more than one source type modifier
+      if (!isRedirectRuleByType(rule, 'ADG')) {
+        throw new Error("Unable to convert - not an ADG rule: ".concat(rule));
+      }
 
-        var sourceTypes = ruleModifiers.filter(function (el) {
-          return VALID_SOURCE_TYPES.indexOf(el) > -1;
-        });
-        var isSourceTypeSpecified = sourceTypes.length > 0;
-        var isEmptyRedirect = ruleModifiers.indexOf("".concat(ADG_UBO_REDIRECT_MARKER).concat(EMPTY_REDIRECT_MARKER)) > -1;
-
-        if (isEmptyRedirect) {
-          if (isSourceTypeSpecified) {
-            var isValidType = sourceTypes.reduce(function (acc, sType) {
-              var isEmptySupported = EMPTY_REDIRECT_SUPPORTED_TYPES.find(function (type) {
-                return type === sType;
-              });
-              return !!isEmptySupported && acc;
-            }, true);
-            return isValidType;
-          } // no source type for 'empty' is allowed
+      if (!isAdgRedirectCompatibleWithUbo(rule)) {
+        throw new Error("Unable to convert - unsupported by uBO redirect in rule: ".concat(rule));
+      } // if (isAdgRedirectCompatibleWithUbo(rule)) {
+      // if (isRedirectRuleByType(rule, 'ADG')) {
 
 
-          return true;
-        }
+      var ruleModifiers = parseModifiers(rule); // rule can have more than one source type modifier
 
-        return isSourceTypeSpecified;
+      var sourceTypes = ruleModifiers.filter(function (el) {
+        return VALID_SOURCE_TYPES.indexOf(el) > -1;
+      });
+      var isSourceTypeSpecified = sourceTypes.length > 0;
+      var isEmptyRedirect = ruleModifiers.indexOf("".concat(ADG_UBO_REDIRECT_MARKER).concat(EMPTY_REDIRECT_MARKER)) > -1;
+
+      if (isEmptyRedirect) {
+        if (isSourceTypeSpecified) {
+          var isValidType = sourceTypes.reduce(function (acc, sType) {
+            var isEmptySupported = EMPTY_REDIRECT_SUPPORTED_TYPES.find(function (type) {
+              return type === sType;
+            });
+            return !!isEmptySupported && acc;
+          }, true);
+          return isValidType;
+        } // no source type for 'empty' is allowed
+
+
+        return true;
       }
 
-      return false;
+      return isSourceTypeSpecified; // }
+      // return false;
     };
 
     var validator = {

src/helpers/validator.js

@@ -347,31 +347,39 @@ const isAbpRedirectCompatibleWithAdg = (rule) => {
  * @returns {boolean}
  */
 const hasValidContentType = (rule) => {
-    if (isRedirectRuleByType(rule, 'ADG')) {
-        const ruleModifiers = parseModifiers(rule);
-        // rule can have more than one source type modifier
-        const sourceTypes = ruleModifiers
-            .filter((el) => VALID_SOURCE_TYPES.indexOf(el) > -1);
-
-        const isSourceTypeSpecified = sourceTypes.length > 0;
-        const isEmptyRedirect = ruleModifiers.indexOf(`${ADG_UBO_REDIRECT_MARKER}${EMPTY_REDIRECT_MARKER}`) > -1;
-
-        if (isEmptyRedirect) {
-            if (isSourceTypeSpecified) {
-                const isValidType = sourceTypes.reduce((acc, sType) => {
-                    const isEmptySupported = EMPTY_REDIRECT_SUPPORTED_TYPES
-                        .find((type) => type === sType);
-                    return !!isEmptySupported && acc;
-                }, true);
-                return isValidType;
-            }
-            // no source type for 'empty' is allowed
-            return true;
-        }
+    if (!isRedirectRuleByType(rule, 'ADG')) {
+        throw new Error(`Unable to convert - not an ADG rule: ${rule}`);
+    }
+    if (!isAdgRedirectCompatibleWithUbo(rule)) {
+        throw new Error(`Unable to convert - unsupported by uBO redirect in rule: ${rule}`);
+    }
 
-        return isSourceTypeSpecified;
+    // if (isAdgRedirectCompatibleWithUbo(rule)) {
+    // if (isRedirectRuleByType(rule, 'ADG')) {
+    const ruleModifiers = parseModifiers(rule);
+    // rule can have more than one source type modifier
+    const sourceTypes = ruleModifiers
+        .filter((el) => VALID_SOURCE_TYPES.indexOf(el) > -1);
+
+    const isSourceTypeSpecified = sourceTypes.length > 0;
+    const isEmptyRedirect = ruleModifiers.indexOf(`${ADG_UBO_REDIRECT_MARKER}${EMPTY_REDIRECT_MARKER}`) > -1;
+
+    if (isEmptyRedirect) {
+        if (isSourceTypeSpecified) {
+            const isValidType = sourceTypes.reduce((acc, sType) => {
+                const isEmptySupported = EMPTY_REDIRECT_SUPPORTED_TYPES
+                    .find((type) => type === sType);
+                return !!isEmptySupported && acc;
+            }, true);
+            return isValidType;
+        }
+        // no source type for 'empty' is allowed
+        return true;
     }
-    return false;
+
+    return isSourceTypeSpecified;
+    // }
+    // return false;
 };
 
 const validator = {

tests/lib-tests/index.test.js

@@ -174,6 +174,9 @@ test('Test redirect rule validation', (assert) => {
     // invalid redirect name
     inputRule = '||example.orf^$media,redirect=no-mp4';
     assert.strictEqual(validator.isAdgRedirectCompatibleWithUbo(inputRule), false);
+    // no ubo analog for redirect
+    inputRule = '||example.com/ad/vmap/*$xmlhttprequest,redirect=noopvmap-1.0';
+    assert.strictEqual(validator.isAdgRedirectCompatibleWithUbo(inputRule), false);
     // rules with 'redirect=' marker in base rule part should be skipped
     inputRule = '_redirect=*://look.$popup';
     assert.strictEqual(validator.isAdgRedirectCompatibleWithUbo(inputRule), false);
@@ -247,9 +250,11 @@ test('Test redirect rule validation for ADG -> UBO converting', (assert) => {
     adgRule = '||example.com/images/*.png$image,important,redirect=1x1-transparent.gif,domain=example.com|example.org';
     assert.strictEqual(validator.hasValidContentType(adgRule), true);
 
-    // abp rule ->> false
-    adgRule = '||example.com^$script,rewrite=abp-resource:blank-js';
-    assert.strictEqual(validator.hasValidContentType(adgRule), false);
+    // abp rule ->> error because only ADG rules accepted
+    assert.throws(() => {
+        adgRule = '||example.com^$script,rewrite=abp-resource:blank-js';
+        convertAdgRedirectToUbo(adgRule);
+    }, 'unable to convert -- no such ubo redirect');
 
     // no source type
     adgRule = '||example.com^$important,redirect=nooptext';
@@ -279,4 +284,14 @@ test('Test REDIRECT converting - ADG -> UBO', (assert) => {
     adgRule = '||example.com/vast/$important,redirect=empty,~thirt-party';
     expectedUboRule = '||example.com/vast/$important,redirect=empty,~thirt-party';
     assert.strictEqual(convertAdgRedirectToUbo(adgRule), expectedUboRule);
+
+    assert.throws(() => {
+        adgRule = '||example.com/ad/vmap/*$xmlhttprequest,redirect=noopvast-2.0';
+        convertAdgRedirectToUbo(adgRule);
+    }, 'unable to convert -- no such ubo redirect');
+
+    assert.throws(() => {
+        adgRule = '||example.com/ad/vmap/*$redirect=nooptext';
+        convertAdgRedirectToUbo(adgRule);
+    }, 'unable to convert -- no source type specified');
 });