Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-22 18:32:45 +01:00
Code Issues Releases Wiki Activity

[mv3] Have one rule per line in ruleset files

Browse Source
This commit is contained in:
Raymond Hill 2023-12-09 11:02:20 -05:00
parent 7e44db763e
commit af0a3f4abb
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
platform/mv3/make-rulesets.js
View File

@ -295,9 +295,15 @@ function pruneHostnameArray(hostnames) {
return assemble(rootMap, '', []);
}
/******************************************************************************/
/*******************************************************************************
*
* One rule per line for compromise between size and readability. This also
* means that the number of lines in resulting file representative of the
* number of rules in the ruleset.
*
* */
async function processNetworkFilters(assetDetails, network) {
function toJSONRuleset(ruleset) {
const replacer = (k, v) => {
if ( k.startsWith('_') ) { return; }
if ( Array.isArray(v) ) {
@ -312,7 +318,16 @@ async function processNetworkFilters(assetDetails, network) {
}
return v;
};
const out = [];
for ( const rule of ruleset ) {
out.push(JSON.stringify(rule, replacer));
}
return `[\n${out.join(',\n')}\n]\n`;
}
/******************************************************************************/
async function processNetworkFilters(assetDetails, network) {
const { ruleset: rules } = network;
log(`Input filter count: ${network.filterCount}`);
log(`\tAccepted filter count: ${network.acceptedFilterCount}`);
@ -394,38 +409,36 @@ async function processNetworkFilters(assetDetails, network) {
log(`\tUnsupported: ${bad.length}`);
log(bad.map(rule => rule._error.map(v => `\t\t${v}`)).join('\n'), true);
const jsonIndent = platform !== 'firefox' ? 1 : undefined;
writeFile(
`${rulesetDir}/main/${assetDetails.id}.json`,
`${JSON.stringify(plainGood, replacer, jsonIndent)}\n`
toJSONRuleset(plainGood)
);
if ( regexes.length !== 0 ) {
writeFile(
`${rulesetDir}/regex/${assetDetails.id}.json`,
`${JSON.stringify(regexes, replacer, 1)}\n`
toJSONRuleset(regexes)
);
}
if ( removeparamsGood.length !== 0 ) {
writeFile(
`${rulesetDir}/removeparam/${assetDetails.id}.json`,
`${JSON.stringify(removeparamsGood, replacer, 1)}\n`
toJSONRuleset(removeparamsGood)
);
}
if ( redirects.length !== 0 ) {
writeFile(
`${rulesetDir}/redirect/${assetDetails.id}.json`,
`${JSON.stringify(redirects, replacer, 1)}\n`
toJSONRuleset(redirects)
);
}
if ( modifyHeaders.length !== 0 ) {
writeFile(
`${rulesetDir}/modify-headers/${assetDetails.id}.json`,
`${JSON.stringify(modifyHeaders, replacer, 1)}\n`
toJSONRuleset(modifyHeaders)
);
}