CHANGELOG.md

@@ -1,4 +1,3 @@
-- [Add `:matches-prop()` pseudo CSS operator](https://github.com/gorhill/uBlock/commit/aca7674bac)
 - [Improve `set-cookie` scriptlet](https://github.com/gorhill/uBlock/commit/b4d8750f44)
 - [Improve `trusted-replace-node-text` scriptlet](https://github.com/gorhill/uBlock/commit/cb0f65e035)
 - [Improve `trusted-replace-[fetch|xhr]-response` scriptlets](https://github.com/gorhill/uBlock/commit/9072772f61)

dist/firefox/updates.json

@@ -3,9 +3,9 @@
   "uBlock0@raymondhill.net": {
    "updates": [
     {
-     "version": "1.58.1.9",
+     "version": "1.58.1.8",
      "browser_specific_settings": { "gecko": { "strict_min_version": "78.0" } },
-     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.58.1b9/uBlock0_1.58.1b9.firefox.signed.xpi"
+     "update_link": "https://github.com/gorhill/uBlock/releases/download/1.58.1b8/uBlock0_1.58.1b8.firefox.signed.xpi"
     }
    ]
   }

dist/version

@@ -1 +1 @@
-1.58.1.9
+1.58.1.8

src/js/contentscript-extra.js

@@ -173,26 +173,6 @@ class PSelectorMatchesPathTask extends PSelectorTask {
     }
 }
 
-class PSelectorMatchesPropTask extends PSelectorTask {
-    constructor(task) {
-        super();
-        this.props = task[1].attr.split('.');
-        this.reValue = task[1].value !== ''
-            ? regexFromString(task[1].value, true)
-            : null;
-    }
-    transpose(node, output) {
-        let value = node;
-        for ( const prop of this.props ) {
-            if ( value === undefined ) { return; }
-            if ( value === null ) { return; }
-            value = value[prop];
-        }
-        if ( this.reValue !== null && this.reValue.test(value) === false ) { return; }
-        output.push(node);
-    }
-}
-
 class PSelectorMinTextLengthTask extends PSelectorTask {
     constructor(task) {
         super();
@@ -481,7 +461,6 @@ PSelector.prototype.operatorToTaskMap = new Map([
     [ 'matches-css-before', PSelectorMatchesCSSBeforeTask ],
     [ 'matches-media', PSelectorMatchesMediaTask ],
     [ 'matches-path', PSelectorMatchesPathTask ],
-    [ 'matches-prop', PSelectorMatchesPropTask ],
     [ 'min-text-length', PSelectorMinTextLengthTask ],
     [ 'not', PSelectorIfNotTask ],
     [ 'others', PSelectorOthersTask ],

src/js/static-filtering-parser.js

@@ -19,10 +19,12 @@
     Home: https://github.com/gorhill/uBlock
 */
 
+'use strict';
+
 /******************************************************************************/
 
-import * as cssTree from '../lib/csstree/css-tree.js';
 import Regex from '../lib/regexanalyzer/regex.js';
+import * as cssTree from '../lib/csstree/css-tree.js';
 
 /*******************************************************************************
  * 
@@ -857,17 +859,17 @@ export class AstFilterParser {
         this.reInlineComment = /(?:\s+#).*?$/;
         this.reNetException = /^@@/;
         this.reNetAnchor = /(?:)\$[^,\w~]/;
-        this.reHnAnchoredPlainAscii = /^\|\|[0-9a-z%&,\-./:;=?_]+$/;
+        this.reHnAnchoredPlainAscii = /^\|\|[0-9a-z%&,\-.\/:;=?_]+$/;
         this.reHnAnchoredHostnameAscii = /^\|\|(?:[\da-z][\da-z_-]*\.)*[\da-z_-]*[\da-z]\^$/;
         this.reHnAnchoredHostnameUnicode = /^\|\|(?:[\p{L}\p{N}][\p{L}\p{N}\u{2d}]*\.)*[\p{L}\p{N}\u{2d}]*[\p{L}\p{N}]\^$/u;
         this.reHn3pAnchoredHostnameAscii = /^\|\|(?:[\da-z][\da-z_-]*\.)*[\da-z_-]*[\da-z]\^\$third-party$/;
-        this.rePlainAscii = /^[0-9a-z%&\-./:;=?_]{2,}$/;
+        this.rePlainAscii = /^[0-9a-z%&\-.\/:;=?_]{2,}$/;
         this.reNetHosts1 = /^127\.0\.0\.1 (?:[\da-z][\da-z_-]*\.)+[\da-z-]*[a-z]$/;
         this.reNetHosts2 = /^0\.0\.0\.0 (?:[\da-z][\da-z_-]*\.)+[\da-z-]*[a-z]$/;
         this.rePlainGenericCosmetic = /^##[.#][A-Za-z_][\w-]*$/;
         this.reHostnameAscii = /^(?:[\da-z][\da-z_-]*\.)*[\da-z][\da-z-]*[\da-z]$/;
         this.rePlainEntity = /^(?:[\da-z][\da-z_-]*\.)+\*$/;
-        this.reHostsSink = /^[\w%.:[\]-]+\s+/;
+        this.reHostsSink = /^[\w%.:\[\]-]+\s+/;
         this.reHostsRedirect = /(?:0\.0\.0\.0|broadcasthost|local|localhost(?:\.localdomain)?|ip6-\w+)(?:[^\w.-]|$)/;
         this.reNetOptionComma = /,(?:~?[13a-z-]+(?:=.*?)?|_+)(?:,|$)/;
         this.rePointlessLeftAnchor = /^\|\|?\*+/;
@@ -884,8 +886,8 @@ export class AstFilterParser {
         this.rePreparseDirectiveIf = /^!#if /;
         this.rePreparseDirectiveAny = /^!#(?:else|endif|if |include )/;
         this.reURL = /\bhttps?:\/\/\S+/;
-        this.reHasPatternSpecialChars = /[*^]/;
-        this.rePatternAllSpecialChars = /[*^]+|[^\x00-\x7f]+/g;
+        this.reHasPatternSpecialChars = /[\*\^]/;
+        this.rePatternAllSpecialChars = /[\*\^]+|[^\x00-\x7f]+/g;
         // https://github.com/uBlockOrigin/uBlock-issues/issues/1146
         //   From https://codemirror.net/doc/manual.html#option_specialChars
         this.reHasInvalidChar = /[\x00-\x1F\x7F-\x9F\xAD\u061C\u200B-\u200F\u2028\u2029\uFEFF\uFFF9-\uFFFC]/;
@@ -2418,7 +2420,7 @@ export class AstFilterParser {
             parentBeg + argsEnd
         );
         this.linkDown(next, this.parseExtPatternScriptletArglist(next));
-        this.linkRight(prev, next);
+        prev = this.linkRight(prev, next);
         return this.throwHeadNode(head);
     }
 
@@ -3204,7 +3206,6 @@ class ExtSelectorCompiler {
             'matches-css-before',
             'matches-media',
             'matches-path',
-            'matches-prop',
             'min-text-length',
             'others',
             'shadow',
@@ -3841,7 +3842,6 @@ class ExtSelectorCompiler {
         case 'if-not':
             return this.compileSelector(arg);
         case 'matches-attr':
-        case 'matches-prop':
             return this.compileMatchAttrArgument(arg);
         case 'matches-css':
             return this.compileCSSDeclaration(arg);
@@ -4037,7 +4037,7 @@ class ExtSelectorCompiler {
 
     compileAttrList(s) {
         if ( s === '' ) { return s; }
-        const attrs = s.split(/\s*,\s*/);
+        const attrs = s.split('\s*,\s*');
         const out = [];
         for ( const attr of attrs ) {
             if ( attr !== '' ) {
@@ -4075,7 +4075,6 @@ export const proceduralOperatorTokens = new Map([
     [ 'matches-css', 0b11 ],
     [ 'matches-media', 0b11 ],
     [ 'matches-path', 0b11 ],
-    [ 'matches-prop', 0b11 ],
     [ 'min-text-length', 0b01 ],
     [ 'not', 0b01 ],
     [ 'nth-ancestor', 0b00 ],