From 6181901fb12017196c59ccaf1ff68dc46f4767af Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Thu, 5 Mar 2020 12:38:19 +0300 Subject: [PATCH 1/2] replace isRedirectRule by specific methods --- README.md | 12 +++++++----- dist/cjs/scriptletsCjs.js | 16 +++++++++++++++- dist/scriptlets.js | 16 +++++++++++++++- src/redirects/index.js | 16 +++++++++++++++- 4 files changed, 52 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0e2ce67f..6d5781c3 100644 --- a/README.md +++ b/README.md @@ -220,11 +220,13 @@ redirects.getCode(source); ```javascript /** - * Checks if the `rule` satisfies the `type` - * @param {string} rule - rule text - * @param {'ADG'|'UBO'|'ABP'} type - type of a redirect rule - */ -redirects.isRedirectRule(rule, type); +* Checks if the `rule` is AdGuard / Ubo / Abp redirect resource rule +* @param {string} rule - rule text +* @returns {boolean} +*/ +redirects.isAdgRedirectRule(rule); +redirects.isUboRedirectRule(rule); +redirects.isAbpRedirectRule(rule); ``` ```javascript diff --git a/dist/cjs/scriptletsCjs.js b/dist/cjs/scriptletsCjs.js index c1672d30..dc6e19ca 100644 --- a/dist/cjs/scriptletsCjs.js +++ b/dist/cjs/scriptletsCjs.js @@ -4318,9 +4318,23 @@ var getRedirectCode = function getRedirectCode(name) { }, result); }; +var isAdgRedirectRule = function isAdgRedirectRule(rule) { + return validator.isRedirectRule(rule, 'ADG'); +}; + +var isUboRedirectRule = function isUboRedirectRule(rule) { + return validator.isRedirectRule(rule, 'UBO'); +}; + +var isAbpRedirectRule = function isAbpRedirectRule(rule) { + return validator.isRedirectRule(rule, 'ABP'); +}; + var redirectsCjs = { getCode: getRedirectCode, - isRedirectRule: validator.isRedirectRule, + isAdgRedirectRule: isAdgRedirectRule, + isUboRedirectRule: isUboRedirectRule, + isAbpRedirectRule: isAbpRedirectRule, convertUboRedirectToAdg: convertUboRedirectToAdg, convertAbpRedirectToAdg: convertAbpRedirectToAdg, convertRedirectToAdg: convertRedirectToAdg, diff --git a/dist/scriptlets.js b/dist/scriptlets.js index ca411140..6c764a58 100644 --- a/dist/scriptlets.js +++ b/dist/scriptlets.js @@ -4319,9 +4319,23 @@ }, result); }; + var isAdgRedirectRule = function isAdgRedirectRule(rule) { + return validator.isRedirectRule(rule, 'ADG'); + }; + + var isUboRedirectRule = function isUboRedirectRule(rule) { + return validator.isRedirectRule(rule, 'UBO'); + }; + + var isAbpRedirectRule = function isAbpRedirectRule(rule) { + return validator.isRedirectRule(rule, 'ABP'); + }; + var redirectsCjs = { getCode: getRedirectCode, - isRedirectRule: validator.isRedirectRule, + isAdgRedirectRule: isAdgRedirectRule, + isUboRedirectRule: isUboRedirectRule, + isAbpRedirectRule: isAbpRedirectRule, convertUboRedirectToAdg: convertUboRedirectToAdg, convertAbpRedirectToAdg: convertAbpRedirectToAdg, convertRedirectToAdg: convertRedirectToAdg, diff --git a/src/redirects/index.js b/src/redirects/index.js index a682afc5..1a3cc983 100644 --- a/src/redirects/index.js +++ b/src/redirects/index.js @@ -32,9 +32,23 @@ const getRedirectCode = (name) => { return passSourceAndProps({ name }, result); }; +const isAdgRedirectRule = (rule) => { + return validator.isRedirectRule(rule, 'ADG'); +}; + +const isUboRedirectRule = (rule) => { + return validator.isRedirectRule(rule, 'UBO'); +}; + +const isAbpRedirectRule = (rule) => { + return validator.isRedirectRule(rule, 'ABP'); +}; + export const redirectsCjs = { getCode: getRedirectCode, - isRedirectRule: validator.isRedirectRule, + isAdgRedirectRule, + isUboRedirectRule, + isAbpRedirectRule, convertUboRedirectToAdg, convertAbpRedirectToAdg, convertRedirectToAdg, From 4c3c0bc31c38b6cc0e10f85fb476f5f305ebe77d Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Thu, 5 Mar 2020 12:49:39 +0300 Subject: [PATCH 2/2] add comments --- dist/cjs/scriptletsCjs.js | 18 ++++++++++++++++++ dist/scriptlets.js | 18 ++++++++++++++++++ src/redirects/index.js | 15 +++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/dist/cjs/scriptletsCjs.js b/dist/cjs/scriptletsCjs.js index dc6e19ca..729e932d 100644 --- a/dist/cjs/scriptletsCjs.js +++ b/dist/cjs/scriptletsCjs.js @@ -4317,14 +4317,32 @@ var getRedirectCode = function getRedirectCode(name) { name: name }, result); }; +/** +* Checks if the `rule` is AdGuard redirect resource rule +* @param {string} rule - rule text +* @returns {boolean} +*/ + var isAdgRedirectRule = function isAdgRedirectRule(rule) { return validator.isRedirectRule(rule, 'ADG'); }; +/** +* Checks if the `rule` is Ubo redirect resource rule +* @param {string} rule - rule text +* @returns {boolean} +*/ + var isUboRedirectRule = function isUboRedirectRule(rule) { return validator.isRedirectRule(rule, 'UBO'); }; +/** +* Checks if the `rule` is Abp redirect resource rule +* @param {string} rule - rule text +* @returns {boolean} +*/ + var isAbpRedirectRule = function isAbpRedirectRule(rule) { return validator.isRedirectRule(rule, 'ABP'); diff --git a/dist/scriptlets.js b/dist/scriptlets.js index 6c764a58..78a97ef3 100644 --- a/dist/scriptlets.js +++ b/dist/scriptlets.js @@ -4318,14 +4318,32 @@ name: name }, result); }; + /** + * Checks if the `rule` is AdGuard redirect resource rule + * @param {string} rule - rule text + * @returns {boolean} + */ + var isAdgRedirectRule = function isAdgRedirectRule(rule) { return validator.isRedirectRule(rule, 'ADG'); }; + /** + * Checks if the `rule` is Ubo redirect resource rule + * @param {string} rule - rule text + * @returns {boolean} + */ + var isUboRedirectRule = function isUboRedirectRule(rule) { return validator.isRedirectRule(rule, 'UBO'); }; + /** + * Checks if the `rule` is Abp redirect resource rule + * @param {string} rule - rule text + * @returns {boolean} + */ + var isAbpRedirectRule = function isAbpRedirectRule(rule) { return validator.isRedirectRule(rule, 'ABP'); diff --git a/src/redirects/index.js b/src/redirects/index.js index 1a3cc983..553342ad 100644 --- a/src/redirects/index.js +++ b/src/redirects/index.js @@ -32,14 +32,29 @@ const getRedirectCode = (name) => { return passSourceAndProps({ name }, result); }; +/** +* Checks if the `rule` is AdGuard redirect resource rule +* @param {string} rule - rule text +* @returns {boolean} +*/ const isAdgRedirectRule = (rule) => { return validator.isRedirectRule(rule, 'ADG'); }; +/** +* Checks if the `rule` is Ubo redirect resource rule +* @param {string} rule - rule text +* @returns {boolean} +*/ const isUboRedirectRule = (rule) => { return validator.isRedirectRule(rule, 'UBO'); }; +/** +* Checks if the `rule` is Abp redirect resource rule +* @param {string} rule - rule text +* @returns {boolean} +*/ const isAbpRedirectRule = (rule) => { return validator.isRedirectRule(rule, 'ABP'); };