one more update

dist/cjs/scriptletsCjs.js

@@ -1,7 +1,7 @@
 
 /**
  * AdGuard Scriptlets
- * Version 1.3.3
+ * Version 1.3.4
  */
 
 /**
@@ -5194,58 +5194,6 @@ var redirectsList = /*#__PURE__*/Object.freeze({
  AmazonApstag: AmazonApstag
 });
 
-/**
- * Finds redirect resource by it's name
- * @param {string} name - redirect name
- */
-
-var getRedirectByName = function getRedirectByName(name) {
- var redirects = Object.keys(redirectsList).map(function (key) {
- return redirectsList[key];
- });
- return redirects.find(function (r) {
- return r.names && r.names.indexOf(name) > -1;
- });
-};
-/**
- * @typedef {Object} Source - redirect properties
- * @property {string} name redirect name
- * @property {Array<string>} args Arguments for redirect function
- * @property {'extension'|'test'} [engine] -
- * Defines the final form of redirect string presentation
- * @property {boolean} [verbose] flag to enable printing to console debug information
- */
-
-/**
- * Returns redirect code by param
- * @param {Source} source
- * @returns {string} redirect code
- */
-
-
-var getRedirectCode = function getRedirectCode(source) {
- var redirect = getRedirectByName(source.name);
- var result = attachDependencies(redirect);
- result = addCall(redirect, result); // redirect code for different sources is checked in tests
- // so it should be just a code without any source and props passed
-
- result = source.engine === 'test' ? wrapInNonameFunc(result) : passSourceAndProps(source, result);
- return result;
-};
-
-var redirectsCjs = {
- getCode: getRedirectCode,
- isAdgRedirectRule: validator.isAdgRedirectRule,
- isValidAdgRedirectRule: validator.isValidAdgRedirectRule,
- isAdgRedirectCompatibleWithUbo: validator.isAdgRedirectCompatibleWithUbo,
- isUboRedirectCompatibleWithAdg: validator.isUboRedirectCompatibleWithAdg,
- isAbpRedirectCompatibleWithAdg: validator.isAbpRedirectCompatibleWithAdg,
- convertUboRedirectToAdg: convertUboRedirectToAdg,
- convertAbpRedirectToAdg: convertAbpRedirectToAdg,
- convertRedirectToAdg: convertRedirectToAdg,
- convertAdgRedirectToUbo: convertAdgRedirectToUbo
-};
-
 function _classCallCheck(instance, Constructor) {
  if (!(instance instanceof Constructor)) {
  throw new TypeError("Cannot call a class as a function");
@@ -9225,6 +9173,59 @@ var Redirects = /*#__PURE__*/function () {
  return Redirects;
 }();
 
+/**
+ * Finds redirect resource by it's name
+ * @param {string} name - redirect name
+ */
+
+var getRedirectByName = function getRedirectByName(name) {
+ var redirects = Object.keys(redirectsList).map(function (key) {
+ return redirectsList[key];
+ });
+ return redirects.find(function (r) {
+ return r.names && r.names.indexOf(name) > -1;
+ });
+};
+/**
+ * @typedef {Object} Source - redirect properties
+ * @property {string} name redirect name
+ * @property {Array<string>} args Arguments for redirect function
+ * @property {'extension'|'test'} [engine] -
+ * Defines the final form of redirect string presentation
+ * @property {boolean} [verbose] flag to enable printing to console debug information
+ */
+
+/**
+ * Returns redirect code by param
+ * @param {Source} source
+ * @returns {string} redirect code
+ */
+
+
+var getRedirectCode = function getRedirectCode(source) {
+ var redirect = getRedirectByName(source.name);
+ var result = attachDependencies(redirect);
+ result = addCall(redirect, result); // redirect code for different sources is checked in tests
+ // so it should be just a code without any source and props passed
+
+ result = source.engine === 'test' ? wrapInNonameFunc(result) : passSourceAndProps(source, result);
+ return result;
+};
+
+var redirectsCjs = {
+ Redirects: Redirects,
+ getCode: getRedirectCode,
+ isAdgRedirectRule: validator.isAdgRedirectRule,
+ isValidAdgRedirectRule: validator.isValidAdgRedirectRule,
+ isAdgRedirectCompatibleWithUbo: validator.isAdgRedirectCompatibleWithUbo,
+ isUboRedirectCompatibleWithAdg: validator.isUboRedirectCompatibleWithAdg,
+ isAbpRedirectCompatibleWithAdg: validator.isAbpRedirectCompatibleWithAdg,
+ convertUboRedirectToAdg: convertUboRedirectToAdg,
+ convertAbpRedirectToAdg: convertAbpRedirectToAdg,
+ convertRedirectToAdg: convertRedirectToAdg,
+ convertAdgRedirectToUbo: convertAdgRedirectToUbo
+};
+
 /**
  * @typedef {Object} Source - scriptlet properties
  * @property {string} name Scriptlet name
@@ -9275,8 +9276,7 @@ var scriptletsObject = function () {
  convertAbpToAdg: convertAbpSnippetToAdg,
  convertScriptletToAdg: convertScriptletToAdg,
  convertAdgToUbo: convertAdgScriptletToUbo,
- redirects: redirectsCjs,
- Redirects: Redirects
+ redirects: redirectsCjs
  };
 }();
 

dist/redirects.js

@@ -1,7 +1,7 @@
 
 /**
  * AdGuard Scriptlets
- * Version 1.3.3
+ * Version 1.3.4
  */
 
 var Redirects = (function () {

dist/redirects.yml

@@ -1,6 +1,6 @@
 #
 # AdGuard Scriptlets (Redirects Source)
-# Version 1.3.3
+# Version 1.3.4
 #
 - title: 1x1-transparent.gif
  description: |-

dist/scriptlets.corelibs.json

@@ -1,5 +1,5 @@
 {
- "version": "1.3.3",
+ "version": "1.3.4",
  "scriptlets": [
  {
  "names": [

dist/scriptlets.js

@@ -1,7 +1,7 @@
 
 /**
  * AdGuard Scriptlets
- * Version 1.3.3
+ * Version 1.3.4
  */
 
 (function () {
@@ -5195,58 +5195,6 @@
  AmazonApstag: AmazonApstag
  });
 
- /**
- * Finds redirect resource by it's name
- * @param {string} name - redirect name
- */
-
- var getRedirectByName = function getRedirectByName(name) {
- var redirects = Object.keys(redirectsList).map(function (key) {
- return redirectsList[key];
- });
- return redirects.find(function (r) {
- return r.names && r.names.indexOf(name) > -1;
- });
- };
- /**
- * @typedef {Object} Source - redirect properties
- * @property {string} name redirect name
- * @property {Array<string>} args Arguments for redirect function
- * @property {'extension'|'test'} [engine] -
- * Defines the final form of redirect string presentation
- * @property {boolean} [verbose] flag to enable printing to console debug information
- */
-
- /**
- * Returns redirect code by param
- * @param {Source} source
- * @returns {string} redirect code
- */
-
-
- var getRedirectCode = function getRedirectCode(source) {
- var redirect = getRedirectByName(source.name);
- var result = attachDependencies(redirect);
- result = addCall(redirect, result); // redirect code for different sources is checked in tests
- // so it should be just a code without any source and props passed
-
- result = source.engine === 'test' ? wrapInNonameFunc(result) : passSourceAndProps(source, result);
- return result;
- };
-
- var redirectsCjs = {
- getCode: getRedirectCode,
- isAdgRedirectRule: validator.isAdgRedirectRule,
- isValidAdgRedirectRule: validator.isValidAdgRedirectRule,
- isAdgRedirectCompatibleWithUbo: validator.isAdgRedirectCompatibleWithUbo,
- isUboRedirectCompatibleWithAdg: validator.isUboRedirectCompatibleWithAdg,
- isAbpRedirectCompatibleWithAdg: validator.isAbpRedirectCompatibleWithAdg,
- convertUboRedirectToAdg: convertUboRedirectToAdg,
- convertAbpRedirectToAdg: convertAbpRedirectToAdg,
- convertRedirectToAdg: convertRedirectToAdg,
- convertAdgRedirectToUbo: convertAdgRedirectToUbo
- };
-
  function _classCallCheck(instance, Constructor) {
  if (!(instance instanceof Constructor)) {
  throw new TypeError("Cannot call a class as a function");
@@ -9226,6 +9174,59 @@
  return Redirects;
  }();
 
+ /**
+ * Finds redirect resource by it's name
+ * @param {string} name - redirect name
+ */
+
+ var getRedirectByName = function getRedirectByName(name) {
+ var redirects = Object.keys(redirectsList).map(function (key) {
+ return redirectsList[key];
+ });
+ return redirects.find(function (r) {
+ return r.names && r.names.indexOf(name) > -1;
+ });
+ };
+ /**
+ * @typedef {Object} Source - redirect properties
+ * @property {string} name redirect name
+ * @property {Array<string>} args Arguments for redirect function
+ * @property {'extension'|'test'} [engine] -
+ * Defines the final form of redirect string presentation
+ * @property {boolean} [verbose] flag to enable printing to console debug information
+ */
+
+ /**
+ * Returns redirect code by param
+ * @param {Source} source
+ * @returns {string} redirect code
+ */
+
+
+ var getRedirectCode = function getRedirectCode(source) {
+ var redirect = getRedirectByName(source.name);
+ var result = attachDependencies(redirect);
+ result = addCall(redirect, result); // redirect code for different sources is checked in tests
+ // so it should be just a code without any source and props passed
+
+ result = source.engine === 'test' ? wrapInNonameFunc(result) : passSourceAndProps(source, result);
+ return result;
+ };
+
+ var redirectsCjs = {
+ Redirects: Redirects,
+ getCode: getRedirectCode,
+ isAdgRedirectRule: validator.isAdgRedirectRule,
+ isValidAdgRedirectRule: validator.isValidAdgRedirectRule,
+ isAdgRedirectCompatibleWithUbo: validator.isAdgRedirectCompatibleWithUbo,
+ isUboRedirectCompatibleWithAdg: validator.isUboRedirectCompatibleWithAdg,
+ isAbpRedirectCompatibleWithAdg: validator.isAbpRedirectCompatibleWithAdg,
+ convertUboRedirectToAdg: convertUboRedirectToAdg,
+ convertAbpRedirectToAdg: convertAbpRedirectToAdg,
+ convertRedirectToAdg: convertRedirectToAdg,
+ convertAdgRedirectToUbo: convertAdgRedirectToUbo
+ };
+
  /**
  * @typedef {Object} Source - scriptlet properties
  * @property {string} name Scriptlet name
@@ -9276,8 +9277,7 @@
  convertAbpToAdg: convertAbpSnippetToAdg,
  convertScriptletToAdg: convertScriptletToAdg,
  convertAdgToUbo: convertAdgScriptletToUbo,
- redirects: redirectsCjs,
- Redirects: Redirects
+ redirects: redirectsCjs
  };
  }();
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "scriptlets",
- "version": "1.3.3",
+ "version": "1.3.4",
  "scripts": {
  "watch": "rollup -c -w",
  "build": "rollup -c && babel-node redirects.build.js",

src/redirects/index.js

@@ -16,6 +16,8 @@ import {
 
 import * as redirectsList from './redirectsList';
 
+import Redirects from './redirects';
+
 /**
  * Finds redirect resource by it's name
  * @param {string} name - redirect name
@@ -54,6 +56,7 @@ const getRedirectCode = (source) => {
 };
 
 export const redirectsCjs = {
+ Redirects,
  getCode: getRedirectCode,
  isAdgRedirectRule: validator.isAdgRedirectRule,
  isValidAdgRedirectRule: validator.isValidAdgRedirectRule,

src/scriptlets/index.js

@@ -1,7 +1,5 @@
 import { redirectsCjs } from '../redirects';
 
-import Redirects from '../redirects/redirects';
-
 import {
  attachDependencies,
  addCall,
@@ -69,7 +67,6 @@ const scriptletsObject = (() => ({
  convertScriptletToAdg,
  convertAdgToUbo: convertAdgScriptletToUbo,
  redirects: redirectsCjs,
- Redirects,
 }))();
 
 export default scriptletsObject;