Issue 7094 - Encapsulate management of subscription filters

lib/subscriptionClasses.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 41 matching lines @@
   url: null,
 
   /**
    * Type of the subscription
    * @type {?string}
    */
   type: null,
 
   /**
    * Filters contained in the filter subscription
-   * @type {Filter[]}
+   * @type {Array.<string>}
    */
   filters: null,
 
+  /**
+   * A list of {@link Filter} objects associated with the subscription in some
+   * way. This is used by {@link INIParser} to temporarily cache objects
+   * corresponding to the subscription's filter text.
+   * @type {?Array.<Filter>}
+   * @package
+   */
+  filterObjects: null,
+
   _title: null,
   _fixedTitle: false,
   _disabled: false,
 
   /**
    * Title of the filter subscription
    * @type {string}
    */
   get title()
   {
@@ skipping 68 matching lines @@
     if (_disabled)
       yield "disabled=true";
   },
 
   *serializeFilters()
   {
     let {filters} = this;
 
     yield "[Subscription filters]";
 
-    for (let filter of filters)
-      yield filter.text.replace(/\[/g, "\\[");
+    for (let text of filters)
+      yield text.replace(/\[/g, "\\[");
   },
 
   toString()
   {
     return [...this.serialize()].join("\n");
   }
 };
 
 /**
  * Cache for known filter subscriptions, maps URL to subscription objects.
@@ skipping 160 matching lines @@
 
 /**
  * Creates a new user-defined filter group and adds the given filter to it.
  * This group will act as the default group for this filter type.
  * @param {Filter} filter
  * @return {SpecialSubscription}
  */
 SpecialSubscription.createForFilter = function(filter)
 {
   let subscription = SpecialSubscription.create();
-  subscription.filters.push(filter);
+  subscription.filters.push(filter.text);
   for (let [type, class_] of SpecialSubscription.defaultsMap)
   {
     if (filter instanceof class_)
       subscription.defaults = [type];
   }
   if (!subscription.defaults)
     subscription.defaults = ["blocking"];
   return subscription;
 };
 
@@ skipping 235 matching lines @@
     if (errors)
       yield "errors=" + errors;
     if (version)
       yield "version=" + version;
     if (requiredVersion)
       yield "requiredVersion=" + requiredVersion;
     if (downloadCount)
       yield "downloadCount=" + downloadCount;
   }
 });