Skip to content

Commit a75329e

Browse files
slvvkoslvvko
committed
one more update
1 parent 02ded91 commit a75329e

8 files changed

Lines changed: 117 additions & 117 deletions

File tree

‎dist/cjs/scriptletsCjs.js‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/**
33
* AdGuard Scriptlets
4-
* Version 1.3.3
4+
* Version 1.3.4
55
*/
66

77
/**
@@ -5194,58 +5194,6 @@ var redirectsList = /*#__PURE__*/Object.freeze({
51945194
AmazonApstag: AmazonApstag
51955195
});
51965196

5197-
/**
5198-
* Finds redirect resource by it's name
5199-
* @param {string} name - redirect name
5200-
*/
5201-
5202-
var getRedirectByName = function getRedirectByName(name) {
5203-
var redirects = Object.keys(redirectsList).map(function (key) {
5204-
return redirectsList[key];
5205-
});
5206-
return redirects.find(function (r) {
5207-
return r.names && r.names.indexOf(name) > -1;
5208-
});
5209-
};
5210-
/**
5211-
* @typedef {Object} Source - redirect properties
5212-
* @property {string} name redirect name
5213-
* @property {Array<string>} args Arguments for redirect function
5214-
* @property {'extension'|'test'} [engine] -
5215-
* Defines the final form of redirect string presentation
5216-
* @property {boolean} [verbose] flag to enable printing to console debug information
5217-
*/
5218-
5219-
/**
5220-
* Returns redirect code by param
5221-
* @param {Source} source
5222-
* @returns {string} redirect code
5223-
*/
5224-
5225-
5226-
var getRedirectCode = function getRedirectCode(source) {
5227-
var redirect = getRedirectByName(source.name);
5228-
var result = attachDependencies(redirect);
5229-
result = addCall(redirect, result); // redirect code for different sources is checked in tests
5230-
// so it should be just a code without any source and props passed
5231-
5232-
result = source.engine === 'test' ? wrapInNonameFunc(result) : passSourceAndProps(source, result);
5233-
return result;
5234-
};
5235-
5236-
var redirectsCjs = {
5237-
getCode: getRedirectCode,
5238-
isAdgRedirectRule: validator.isAdgRedirectRule,
5239-
isValidAdgRedirectRule: validator.isValidAdgRedirectRule,
5240-
isAdgRedirectCompatibleWithUbo: validator.isAdgRedirectCompatibleWithUbo,
5241-
isUboRedirectCompatibleWithAdg: validator.isUboRedirectCompatibleWithAdg,
5242-
isAbpRedirectCompatibleWithAdg: validator.isAbpRedirectCompatibleWithAdg,
5243-
convertUboRedirectToAdg: convertUboRedirectToAdg,
5244-
convertAbpRedirectToAdg: convertAbpRedirectToAdg,
5245-
convertRedirectToAdg: convertRedirectToAdg,
5246-
convertAdgRedirectToUbo: convertAdgRedirectToUbo
5247-
};
5248-
52495197
function _classCallCheck(instance, Constructor) {
52505198
if (!(instance instanceof Constructor)) {
52515199
throw new TypeError("Cannot call a class as a function");
@@ -9225,6 +9173,59 @@ var Redirects = /*#__PURE__*/function () {
92259173
return Redirects;
92269174
}();
92279175

9176+
/**
9177+
* Finds redirect resource by it's name
9178+
* @param {string} name - redirect name
9179+
*/
9180+
9181+
var getRedirectByName = function getRedirectByName(name) {
9182+
var redirects = Object.keys(redirectsList).map(function (key) {
9183+
return redirectsList[key];
9184+
});
9185+
return redirects.find(function (r) {
9186+
return r.names && r.names.indexOf(name) > -1;
9187+
});
9188+
};
9189+
/**
9190+
* @typedef {Object} Source - redirect properties
9191+
* @property {string} name redirect name
9192+
* @property {Array<string>} args Arguments for redirect function
9193+
* @property {'extension'|'test'} [engine] -
9194+
* Defines the final form of redirect string presentation
9195+
* @property {boolean} [verbose] flag to enable printing to console debug information
9196+
*/
9197+
9198+
/**
9199+
* Returns redirect code by param
9200+
* @param {Source} source
9201+
* @returns {string} redirect code
9202+
*/
9203+
9204+
9205+
var getRedirectCode = function getRedirectCode(source) {
9206+
var redirect = getRedirectByName(source.name);
9207+
var result = attachDependencies(redirect);
9208+
result = addCall(redirect, result); // redirect code for different sources is checked in tests
9209+
// so it should be just a code without any source and props passed
9210+
9211+
result = source.engine === 'test' ? wrapInNonameFunc(result) : passSourceAndProps(source, result);
9212+
return result;
9213+
};
9214+
9215+
var redirectsCjs = {
9216+
Redirects: Redirects,
9217+
getCode: getRedirectCode,
9218+
isAdgRedirectRule: validator.isAdgRedirectRule,
9219+
isValidAdgRedirectRule: validator.isValidAdgRedirectRule,
9220+
isAdgRedirectCompatibleWithUbo: validator.isAdgRedirectCompatibleWithUbo,
9221+
isUboRedirectCompatibleWithAdg: validator.isUboRedirectCompatibleWithAdg,
9222+
isAbpRedirectCompatibleWithAdg: validator.isAbpRedirectCompatibleWithAdg,
9223+
convertUboRedirectToAdg: convertUboRedirectToAdg,
9224+
convertAbpRedirectToAdg: convertAbpRedirectToAdg,
9225+
convertRedirectToAdg: convertRedirectToAdg,
9226+
convertAdgRedirectToUbo: convertAdgRedirectToUbo
9227+
};
9228+
92289229
/**
92299230
* @typedef {Object} Source - scriptlet properties
92309231
* @property {string} name Scriptlet name
@@ -9275,8 +9276,7 @@ var scriptletsObject = function () {
92759276
convertAbpToAdg: convertAbpSnippetToAdg,
92769277
convertScriptletToAdg: convertScriptletToAdg,
92779278
convertAdgToUbo: convertAdgScriptletToUbo,
9278-
redirects: redirectsCjs,
9279-
Redirects: Redirects
9279+
redirects: redirectsCjs
92809280
};
92819281
}();
92829282

‎dist/redirects.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/**
33
* AdGuard Scriptlets
4-
* Version 1.3.3
4+
* Version 1.3.4
55
*/
66

77
var Redirects = (function () {

‎dist/redirects.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# AdGuard Scriptlets (Redirects Source)
3-
# Version 1.3.3
3+
# Version 1.3.4
44
#
55
- title: 1x1-transparent.gif
66
description: |-

‎dist/scriptlets.corelibs.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.3.3",
2+
"version": "1.3.4",
33
"scriptlets": [
44
{
55
"names": [

‎dist/scriptlets.js‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/**
33
* AdGuard Scriptlets
4-
* Version 1.3.3
4+
* Version 1.3.4
55
*/
66

77
(function () {
@@ -5195,58 +5195,6 @@
51955195
AmazonApstag: AmazonApstag
51965196
});
51975197

5198-
/**
5199-
* Finds redirect resource by it's name
5200-
* @param {string} name - redirect name
5201-
*/
5202-
5203-
var getRedirectByName = function getRedirectByName(name) {
5204-
var redirects = Object.keys(redirectsList).map(function (key) {
5205-
return redirectsList[key];
5206-
});
5207-
return redirects.find(function (r) {
5208-
return r.names && r.names.indexOf(name) > -1;
5209-
});
5210-
};
5211-
/**
5212-
* @typedef {Object} Source - redirect properties
5213-
* @property {string} name redirect name
5214-
* @property {Array<string>} args Arguments for redirect function
5215-
* @property {'extension'|'test'} [engine] -
5216-
* Defines the final form of redirect string presentation
5217-
* @property {boolean} [verbose] flag to enable printing to console debug information
5218-
*/
5219-
5220-
/**
5221-
* Returns redirect code by param
5222-
* @param {Source} source
5223-
* @returns {string} redirect code
5224-
*/
5225-
5226-
5227-
var getRedirectCode = function getRedirectCode(source) {
5228-
var redirect = getRedirectByName(source.name);
5229-
var result = attachDependencies(redirect);
5230-
result = addCall(redirect, result); // redirect code for different sources is checked in tests
5231-
// so it should be just a code without any source and props passed
5232-
5233-
result = source.engine === 'test' ? wrapInNonameFunc(result) : passSourceAndProps(source, result);
5234-
return result;
5235-
};
5236-
5237-
var redirectsCjs = {
5238-
getCode: getRedirectCode,
5239-
isAdgRedirectRule: validator.isAdgRedirectRule,
5240-
isValidAdgRedirectRule: validator.isValidAdgRedirectRule,
5241-
isAdgRedirectCompatibleWithUbo: validator.isAdgRedirectCompatibleWithUbo,
5242-
isUboRedirectCompatibleWithAdg: validator.isUboRedirectCompatibleWithAdg,
5243-
isAbpRedirectCompatibleWithAdg: validator.isAbpRedirectCompatibleWithAdg,
5244-
convertUboRedirectToAdg: convertUboRedirectToAdg,
5245-
convertAbpRedirectToAdg: convertAbpRedirectToAdg,
5246-
convertRedirectToAdg: convertRedirectToAdg,
5247-
convertAdgRedirectToUbo: convertAdgRedirectToUbo
5248-
};
5249-
52505198
function _classCallCheck(instance, Constructor) {
52515199
if (!(instance instanceof Constructor)) {
52525200
throw new TypeError("Cannot call a class as a function");
@@ -9226,6 +9174,59 @@
92269174
return Redirects;
92279175
}();
92289176

9177+
/**
9178+
* Finds redirect resource by it's name
9179+
* @param {string} name - redirect name
9180+
*/
9181+
9182+
var getRedirectByName = function getRedirectByName(name) {
9183+
var redirects = Object.keys(redirectsList).map(function (key) {
9184+
return redirectsList[key];
9185+
});
9186+
return redirects.find(function (r) {
9187+
return r.names && r.names.indexOf(name) > -1;
9188+
});
9189+
};
9190+
/**
9191+
* @typedef {Object} Source - redirect properties
9192+
* @property {string} name redirect name
9193+
* @property {Array<string>} args Arguments for redirect function
9194+
* @property {'extension'|'test'} [engine] -
9195+
* Defines the final form of redirect string presentation
9196+
* @property {boolean} [verbose] flag to enable printing to console debug information
9197+
*/
9198+
9199+
/**
9200+
* Returns redirect code by param
9201+
* @param {Source} source
9202+
* @returns {string} redirect code
9203+
*/
9204+
9205+
9206+
var getRedirectCode = function getRedirectCode(source) {
9207+
var redirect = getRedirectByName(source.name);
9208+
var result = attachDependencies(redirect);
9209+
result = addCall(redirect, result); // redirect code for different sources is checked in tests
9210+
// so it should be just a code without any source and props passed
9211+
9212+
result = source.engine === 'test' ? wrapInNonameFunc(result) : passSourceAndProps(source, result);
9213+
return result;
9214+
};
9215+
9216+
var redirectsCjs = {
9217+
Redirects: Redirects,
9218+
getCode: getRedirectCode,
9219+
isAdgRedirectRule: validator.isAdgRedirectRule,
9220+
isValidAdgRedirectRule: validator.isValidAdgRedirectRule,
9221+
isAdgRedirectCompatibleWithUbo: validator.isAdgRedirectCompatibleWithUbo,
9222+
isUboRedirectCompatibleWithAdg: validator.isUboRedirectCompatibleWithAdg,
9223+
isAbpRedirectCompatibleWithAdg: validator.isAbpRedirectCompatibleWithAdg,
9224+
convertUboRedirectToAdg: convertUboRedirectToAdg,
9225+
convertAbpRedirectToAdg: convertAbpRedirectToAdg,
9226+
convertRedirectToAdg: convertRedirectToAdg,
9227+
convertAdgRedirectToUbo: convertAdgRedirectToUbo
9228+
};
9229+
92299230
/**
92309231
* @typedef {Object} Source - scriptlet properties
92319232
* @property {string} name Scriptlet name
@@ -9276,8 +9277,7 @@
92769277
convertAbpToAdg: convertAbpSnippetToAdg,
92779278
convertScriptletToAdg: convertScriptletToAdg,
92789279
convertAdgToUbo: convertAdgScriptletToUbo,
9279-
redirects: redirectsCjs,
9280-
Redirects: Redirects
9280+
redirects: redirectsCjs
92819281
};
92829282
}();
92839283

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "scriptlets",
3-
"version": "1.3.3",
3+
"version": "1.3.4",
44
"scripts": {
55
"watch": "rollup -c -w",
66
"build": "rollup -c && babel-node redirects.build.js",

‎src/redirects/index.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import {
1616

1717
import * as redirectsList from './redirectsList';
1818

19+
import Redirects from './redirects';
20+
1921
/**
2022
* Finds redirect resource by it's name
2123
* @param {string} name - redirect name
@@ -54,6 +56,7 @@ const getRedirectCode = (source) => {
5456
};
5557

5658
export const redirectsCjs = {
59+
Redirects,
5760
getCode: getRedirectCode,
5861
isAdgRedirectRule: validator.isAdgRedirectRule,
5962
isValidAdgRedirectRule: validator.isValidAdgRedirectRule,

‎src/scriptlets/index.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { redirectsCjs } from '../redirects';
22

3-
import Redirects from '../redirects/redirects';
4-
53
import {
64
attachDependencies,
75
addCall,
@@ -69,7 +67,6 @@ const scriptletsObject = (() => ({
6967
convertScriptletToAdg,
7068
convertAdgToUbo: convertAdgScriptletToUbo,
7169
redirects: redirectsCjs,
72-
Redirects,
7370
}))();
7471

7572
export default scriptletsObject;

0 commit comments

Comments
 (0)