Issue 6449 - Switch to Harmony modules

lib/filterValidation.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @module filterValidation */
 
-"use strict";
-
-const {Filter, InvalidFilter, ElemHideBase, ElemHideEmulationFilter} =
-      require("filterClasses");
+import {Filter, InvalidFilter, ElemHideBase,
+        ElemHideEmulationFilter} from "filterClasses";
 
 /**
  * An error returned by
  * {@link module:filterValidation.parseFilter parseFilter()} or
  * {@link module:filterValidation.parseFilters parseFilters()}
  * indicating that a given filter cannot be parsed,
  * contains an invalid CSS selector or is a filter list header.
  *
  * @param {string} type See documentation in the constructor below.
  * @param {Object} [details] Contains the "reason" and / or "selector"
@@ skipping 77 matching lines @@
 }
 
 /**
  * @typedef ParsedFilter
  * @property {?Filter} [filter]
  *   The parsed filter if it is valid. Or null if the given string is empty.
  * @property {FilterParsingError} [error]
  *   See {@link module:filterValidation~FilterParsingError FilterParsingError}
  */
 
-let parseFilter =
 /**
  * Parses and validates a filter given by the user.
  *
  * @param {string}  text
  * @return {ParsedFilter}
  */
-exports.parseFilter = text =>
+export const parseFilter = text =>
 {
   let filter = null;
   text = Filter.normalize(text);
 
   if (text)
   {
     if (text[0] == "[")
       return {error: new FilterParsingError("unexpected-filter-list-header")};
 
     filter = Filter.fromText(text);
@@ skipping 22 matching lines @@
  * @property {FilterParsingError[]} errors
  *   See {@link module:filterValidation~FilterParsingError FilterParsingError}
  */
 
 /**
  * Parses and validates a newline-separated list of filters given by the user.
  *
  * @param {string}  text
  * @return {ParsedFilters}
  */
-exports.parseFilters = text =>
+export const parseFilters = text =>
 {
   let lines = text.split("\n");
   let filters = [];
   let errors = [];
 
   for (let i = 0; i < lines.length; i++)
   {
     let {filter, error} = parseFilter(lines[i]);
 
     if (filter)
       filters.push(filter);
 
     if (error)
     {
       error.lineno = i + 1;
       errors.push(error);
     }
   }
 
   return {filters, errors};
 };