@appium/support 2.61.0 → 3.0.0

package/build/lib/log-internal.d.ts

@@ -1,27 +1,4 @@
 export default SECURE_VALUES_PREPROCESSOR;
-export type Rule = {
-    /**
-     * A valid RegExp pattern to be replaced
-     */
-    pattern: string;
-    /**
-     * A text match to replace. Either this property or the
-     * above one must be provided. `pattern` has priority over `text` if both are provided.
-     */
-    text: string;
-    /**
-     * Regular expression flags for the given pattern.
-     * Supported flag are the same as for the standard JavaScript RegExp constructor:
-     * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Advanced_searching_with_flags_2
-     * The 'g' (global matching) is always enabled though.
-     */
-    flags?: string | undefined;
-    /**
-     * The replacer value to use. By default
-     * equals to `DEFAULT_SECURE_REPLACER`
-     */
-    replacer?: string | undefined;
-};
 export type SecureValuePreprocessingRule = {
     /**
      * The parsed pattern which is going to be used for replacement
@@ -44,23 +21,23 @@ export class SecureValuesPreprocessor {
     /**
      * Parses single rule from the given JSON file
      *
-     * @param {string|Rule} rule The rule might either be represented as a single string
+     * @param {string|import('@appium/types').LogFilter} rule The rule might either be represented as a single string
      * or a configuration object
      * @throws {Error} If there was an error while parsing the rule
      * @returns {SecureValuePreprocessingRule} The parsed rule
      */
-    parseRule(rule: string | Rule): SecureValuePreprocessingRule;
+    parseRule(rule: string | import('@appium/types').LogFilter): SecureValuePreprocessingRule;
     /**
      * Loads rules from the given JSON file
      *
-     * @param {string|string[]|Rule[]} source The full path to the JSON file containing secure
+     * @param {string|string[]|import('@appium/types').LogFiltersConfig} source The full path to the JSON file containing secure
      * values replacement rules or the rules themselves represented as an array
      * @throws {Error} If the format of the source file is invalid or
      * it does not exist
      * @returns {Promise<string[]>} The list of issues found while parsing each rule.
      * An empty list is returned if no rule parsing issues were found
      */
-    loadRules(source: string | string[] | Rule[]): Promise<string[]>;
+    loadRules(source: string | string[] | import('@appium/types').LogFiltersConfig): Promise<string[]>;
     /**
      * Performs secure values replacement inside the given string
      * according to the previously loaded rules. No replacement is made

package/build/lib/log-internal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log-internal.d.ts","sourceRoot":"","sources":["../../lib/log-internal.js"],"names":[],"mappings":";;;;;aAoJc,MAAM;;;;;UACN,MAAM;;;;;;;;;;;;;;;;;;aAYN,MAAM;;;;;;;AApBpB,kEAAkE;AAxIlE;IAEI,cAAgB;IAGlB;;;OAGG;IACH,4CAEC;IAED;;;;;;;OAOG;IACH,gBALW,MAAM,GAAC,IAAI,GAGT,4BAA4B,CAsDxC;IAED;;;;;;;;;OASG;IACH,kBAPW,MAAM,GAAC,MAAM,EAAE,GAAC,IAAI,EAAE,GAIpB,QAAQ,MAAM,EAAE,CAAC,CA+B7B;IAED;;;;;;;OAOG;IACH,gBAHW,MAAM,GACJ,MAAM,CAYlB;CACF"}
+{"version":3,"file":"log-internal.d.ts","sourceRoot":"","sources":["../../lib/log-internal.js"],"names":[],"mappings":";;;;;aA6Jc,MAAM;;;;;;;AAPpB,kEAAkE;AAxIlE;IAEI,cAAgB;IAGlB;;;OAGG;IACH,4CAEC;IAED;;;;;;;OAOG;IACH,gBALW,MAAM,GAAC,OAAO,eAAe,EAAE,SAAS,GAGtC,4BAA4B,CAsDxC;IAED;;;;;;;;;OASG;IACH,kBAPW,MAAM,GAAC,MAAM,EAAE,GAAC,OAAO,eAAe,EAAE,gBAAgB,GAItD,QAAQ,MAAM,EAAE,CAAC,CA+B7B;IAED;;;;;;;OAOG;IACH,gBAHW,MAAM,GACJ,MAAM,CAYlB;CACF"}

package/build/lib/log-internal.js

@@ -1,136 +1,154 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.SecureValuesPreprocessor = exports.SECURE_VALUES_PREPROCESSOR = void 0;
-
-require("source-map-support/register");
-
-var _fs = _interopRequireDefault(require("./fs"));
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SecureValuesPreprocessor = exports.SECURE_VALUES_PREPROCESSOR = void 0;
+const fs_1 = __importDefault(require("./fs"));
+const lodash_1 = __importDefault(require("lodash"));
 const DEFAULT_REPLACER = '**SECURE**';
-
+/**
+ * Type guard for log filter type
+ * @param {object} value
+ * @returns {value is import('@appium/types').LogFilterRegex}
+ */
+function isLogFilterRegex(value) {
+    return 'pattern' in value;
+}
 class SecureValuesPreprocessor {
-  constructor() {
-    this._rules = [];
-  }
-
-  get rules() {
-    return this._rules;
-  }
-
-  parseRule(rule) {
-    let pattern;
-    let replacer = DEFAULT_REPLACER;
-    let flags = ['g'];
-
-    if (_lodash.default.isString(rule)) {
-      if (rule.length === 0) {
-        throw new Error(`${JSON.stringify(rule)} -> The value must not be empty`);
-      }
-
-      pattern = `\\b${_lodash.default.escapeRegExp(rule)}\\b`;
-    } else if (_lodash.default.isPlainObject(rule)) {
-      if (_lodash.default.has(rule, 'pattern')) {
-        if (!_lodash.default.isString(rule.pattern) || rule.pattern.length === 0) {
-          throw new Error(`${JSON.stringify(rule)} -> The value of 'pattern' must be a valid non-empty string`);
+    constructor() {
+        this._rules = [];
+    }
+    /**
+     * @returns {Array<SecureValuePreprocessingRule>} The list of successfully
+     * parsed preprocessing rules
+     */
+    get rules() {
+        return this._rules;
+    }
+    /**
+     * Parses single rule from the given JSON file
+     *
+     * @param {string|import('@appium/types').LogFilter} rule The rule might either be represented as a single string
+     * or a configuration object
+     * @throws {Error} If there was an error while parsing the rule
+     * @returns {SecureValuePreprocessingRule} The parsed rule
+     */
+    parseRule(rule) {
+        let pattern;
+        let replacer = DEFAULT_REPLACER;
+        let flags = ['g'];
+        if (lodash_1.default.isString(rule)) {
+            if (rule.length === 0) {
+                throw new Error(`${JSON.stringify(rule)} -> The value must not be empty`);
+            }
+            pattern = `\\b${lodash_1.default.escapeRegExp(rule)}\\b`;
         }
-
-        pattern = rule.pattern;
-      } else if (_lodash.default.has(rule, 'text')) {
-        if (!_lodash.default.isString(rule.text) || rule.text.length === 0) {
-          throw new Error(`${JSON.stringify(rule)} -> The value of 'text' must be a valid non-empty string`);
+        else if (lodash_1.default.isPlainObject(rule)) {
+            if (isLogFilterRegex(rule)) {
+                if (!lodash_1.default.isString(rule.pattern) || rule.pattern.length === 0) {
+                    throw new Error(`${JSON.stringify(rule)} -> The value of 'pattern' must be a valid non-empty string`);
+                }
+                pattern = rule.pattern;
+            }
+            else if (lodash_1.default.has(rule, 'text')) {
+                if (!lodash_1.default.isString(rule.text) || rule.text.length === 0) {
+                    throw new Error(`${JSON.stringify(rule)} -> The value of 'text' must be a valid non-empty string`);
+                }
+                pattern = `\\b${lodash_1.default.escapeRegExp(rule.text)}\\b`;
+            }
+            if (!pattern) {
+                throw new Error(`${JSON.stringify(rule)} -> Must either have a field named 'pattern' or 'text'`);
+            }
+            if (lodash_1.default.has(rule, 'flags')) {
+                // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Advanced_searching_with_flags_2
+                for (const flag of ['i', 'g', 'm', 's', 'u', 'y']) {
+                    if (lodash_1.default.includes(rule.flags, flag)) {
+                        flags.push(flag);
+                    }
+                }
+                flags = lodash_1.default.uniq(flags);
+            }
+            if (lodash_1.default.isString(rule.replacer)) {
+                replacer = rule.replacer;
+            }
         }
-
-        pattern = `\\b${_lodash.default.escapeRegExp(rule.text)}\\b`;
-      }
-
-      if (!pattern) {
-        throw new Error(`${JSON.stringify(rule)} -> Must either have a field named 'pattern' or 'text'`);
-      }
-
-      if (_lodash.default.has(rule, 'flags')) {
-        for (const flag of ['i', 'g', 'm', 's', 'u', 'y']) {
-          if (_lodash.default.includes(rule.flags, flag)) {
-            flags.push(flag);
-          }
+        else {
+            throw new Error(`${JSON.stringify(rule)} -> Must either be a string or an object`);
         }
-
-        flags = _lodash.default.uniq(flags);
-      }
-
-      if (_lodash.default.isString(rule.replacer)) {
-        replacer = rule.replacer;
-      }
-    } else {
-      throw new Error(`${JSON.stringify(rule)} -> Must either be a string or an object`);
-    }
-
-    return {
-      pattern: new RegExp(pattern, flags.join('')),
-      replacer
-    };
-  }
-
-  async loadRules(source) {
-    let rules;
-
-    if (_lodash.default.isArray(source)) {
-      rules = source;
-    } else {
-      if (!(await _fs.default.exists(source))) {
-        throw new Error(`'${source}' does not exist or is not accessible`);
-      }
-
-      try {
-        rules = JSON.parse(await _fs.default.readFile(source, 'utf8'));
-      } catch (e) {
-        throw new Error(`'${source}' must be a valid JSON file. Original error: ${e.message}`);
-      }
-
-      if (!_lodash.default.isArray(rules)) {
-        throw new Error(`'${source}' must contain a valid JSON array`);
-      }
-    }
-
-    const issues = [];
-    this._rules = [];
-
-    for (const rule of rules) {
-      try {
-        this._rules.push(this.parseRule(rule));
-      } catch (e) {
-        issues.push(e.message);
-      }
+        return {
+            pattern: new RegExp(pattern, flags.join('')),
+            replacer,
+        };
     }
-
-    return issues;
-  }
-
-  preprocess(str) {
-    if (this._rules.length === 0 || !_lodash.default.isString(str)) {
-      return str;
+    /**
+     * Loads rules from the given JSON file
+     *
+     * @param {string|string[]|import('@appium/types').LogFiltersConfig} source The full path to the JSON file containing secure
+     * values replacement rules or the rules themselves represented as an array
+     * @throws {Error} If the format of the source file is invalid or
+     * it does not exist
+     * @returns {Promise<string[]>} The list of issues found while parsing each rule.
+     * An empty list is returned if no rule parsing issues were found
+     */
+    async loadRules(source) {
+        let rules;
+        if (lodash_1.default.isArray(source)) {
+            rules = source;
+        }
+        else {
+            if (!(await fs_1.default.exists(source))) {
+                throw new Error(`'${source}' does not exist or is not accessible`);
+            }
+            try {
+                rules = JSON.parse(await fs_1.default.readFile(source, 'utf8'));
+            }
+            catch (e) {
+                throw new Error(`'${source}' must be a valid JSON file. Original error: ${e.message}`);
+            }
+            if (!lodash_1.default.isArray(rules)) {
+                throw new Error(`'${source}' must contain a valid JSON array`);
+            }
+        }
+        const issues = [];
+        this._rules = [];
+        for (const rule of rules) {
+            try {
+                this._rules.push(this.parseRule(rule));
+            }
+            catch (e) {
+                issues.push(e.message);
+            }
+        }
+        return issues;
     }
-
-    let result = str;
-
-    for (const rule of this._rules) {
-      result = result.replace(rule.pattern, rule.replacer);
+    /**
+     * Performs secure values replacement inside the given string
+     * according to the previously loaded rules. No replacement is made
+     * if there are no rules or the given value is not a string
+     *
+     * @param {string} str The string to make replacements in
+     * @returns {string} The string with replacements made
+     */
+    preprocess(str) {
+        if (this._rules.length === 0 || !lodash_1.default.isString(str)) {
+            return str;
+        }
+        let result = str;
+        for (const rule of this._rules) {
+            result = result.replace(rule.pattern, rule.replacer);
+        }
+        return result;
     }
-
-    return result;
-  }
-
 }
-
 exports.SecureValuesPreprocessor = SecureValuesPreprocessor;
 const SECURE_VALUES_PREPROCESSOR = new SecureValuesPreprocessor();
 exports.SECURE_VALUES_PREPROCESSOR = SECURE_VALUES_PREPROCESSOR;
-var _default = SECURE_VALUES_PREPROCESSOR;
-exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["DEFAULT_REPLACER","SecureValuesPreprocessor","constructor","_rules","rules","parseRule","rule","pattern","replacer","flags","_","isString","length","Error","JSON","stringify","escapeRegExp","isPlainObject","has","text","flag","includes","push","uniq","RegExp","join","loadRules","source","isArray","fs","exists","parse","readFile","e","message","issues","preprocess","str","result","replace","SECURE_VALUES_PREPROCESSOR"],"sources":["../../lib/log-internal.js"],"sourcesContent":["import fs from './fs';\nimport _ from 'lodash';\n\nconst DEFAULT_REPLACER = '**SECURE**';\n\nclass SecureValuesPreprocessor {\n  constructor() {\n    this._rules = [];\n  }\n\n  /**\n   * @returns {Array<SecureValuePreprocessingRule>} The list of successfully\n   * parsed preprocessing rules\n   */\n  get rules() {\n    return this._rules;\n  }\n\n  /**\n   * Parses single rule from the given JSON file\n   *\n   * @param {string|Rule} rule The rule might either be represented as a single string\n   * or a configuration object\n   * @throws {Error} If there was an error while parsing the rule\n   * @returns {SecureValuePreprocessingRule} The parsed rule\n   */\n  parseRule(rule) {\n    let pattern;\n    let replacer = DEFAULT_REPLACER;\n    let flags = ['g'];\n    if (_.isString(rule)) {\n      if (rule.length === 0) {\n        throw new Error(`${JSON.stringify(rule)} -> The value must not be empty`);\n      }\n      pattern = `\\\\b${_.escapeRegExp(rule)}\\\\b`;\n    } else if (_.isPlainObject(rule)) {\n      if (_.has(rule, 'pattern')) {\n        if (!_.isString(rule.pattern) || rule.pattern.length === 0) {\n          throw new Error(\n            `${JSON.stringify(rule)} -> The value of 'pattern' must be a valid non-empty string`\n          );\n        }\n        pattern = rule.pattern;\n      } else if (_.has(rule, 'text')) {\n        if (!_.isString(rule.text) || rule.text.length === 0) {\n          throw new Error(\n            `${JSON.stringify(rule)} -> The value of 'text' must be a valid non-empty string`\n          );\n        }\n        pattern = `\\\\b${_.escapeRegExp(rule.text)}\\\\b`;\n      }\n      if (!pattern) {\n        throw new Error(\n          `${JSON.stringify(rule)} -> Must either have a field named 'pattern' or 'text'`\n        );\n      }\n\n      if (_.has(rule, 'flags')) {\n        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Advanced_searching_with_flags_2\n        for (const flag of ['i', 'g', 'm', 's', 'u', 'y']) {\n          if (_.includes(rule.flags, flag)) {\n            flags.push(flag);\n          }\n        }\n        flags = _.uniq(flags);\n      }\n\n      if (_.isString(rule.replacer)) {\n        replacer = rule.replacer;\n      }\n    } else {\n      throw new Error(`${JSON.stringify(rule)} -> Must either be a string or an object`);\n    }\n\n    return {\n      pattern: new RegExp(pattern, flags.join('')),\n      replacer,\n    };\n  }\n\n  /**\n   * Loads rules from the given JSON file\n   *\n   * @param {string|string[]|Rule[]} source The full path to the JSON file containing secure\n   * values replacement rules or the rules themselves represented as an array\n   * @throws {Error} If the format of the source file is invalid or\n   * it does not exist\n   * @returns {Promise<string[]>} The list of issues found while parsing each rule.\n   * An empty list is returned if no rule parsing issues were found\n   */\n  async loadRules(source) {\n    let rules;\n    if (_.isArray(source)) {\n      rules = source;\n    } else {\n      if (!(await fs.exists(source))) {\n        throw new Error(`'${source}' does not exist or is not accessible`);\n      }\n      try {\n        rules = JSON.parse(await fs.readFile(source, 'utf8'));\n      } catch (e) {\n        throw new Error(`'${source}' must be a valid JSON file. Original error: ${e.message}`);\n      }\n      if (!_.isArray(rules)) {\n        throw new Error(`'${source}' must contain a valid JSON array`);\n      }\n    }\n\n    const issues = [];\n    this._rules = [];\n    for (const rule of rules) {\n      try {\n        this._rules.push(this.parseRule(rule));\n      } catch (e) {\n        issues.push(e.message);\n      }\n    }\n    return issues;\n  }\n\n  /**\n   * Performs secure values replacement inside the given string\n   * according to the previously loaded rules. No replacement is made\n   * if there are no rules or the given value is not a string\n   *\n   * @param {string} str The string to make replacements in\n   * @returns {string} The string with replacements made\n   */\n  preprocess(str) {\n    if (this._rules.length === 0 || !_.isString(str)) {\n      return str;\n    }\n\n    let result = str;\n    for (const rule of this._rules) {\n      result = result.replace(rule.pattern, rule.replacer);\n    }\n    return result;\n  }\n}\n\nconst SECURE_VALUES_PREPROCESSOR = new SecureValuesPreprocessor();\n\nexport {SECURE_VALUES_PREPROCESSOR, SecureValuesPreprocessor};\nexport default SECURE_VALUES_PREPROCESSOR;\n\n/**\n * @typedef Rule\n * @property {string} pattern A valid RegExp pattern to be replaced\n * @property {string} text A text match to replace. Either this property or the\n * above one must be provided. `pattern` has priority over `text` if both are provided.\n * @property {string} [flags] Regular expression flags for the given pattern.\n * Supported flag are the same as for the standard JavaScript RegExp constructor:\n * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Advanced_searching_with_flags_2\n * The 'g' (global matching) is always enabled though.\n * @property {string} [replacer] The replacer value to use. By default\n * equals to `DEFAULT_SECURE_REPLACER`\n */\n\n/**\n * @typedef SecureValuePreprocessingRule\n * @property {RegExp} pattern The parsed pattern which is going to be used for replacement\n * @property {string} [replacer] The replacer value to use. By default\n * equals to `DEFAULT_SECURE_REPLACER`\n */\n"],"mappings":"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"}
+exports.default = SECURE_VALUES_PREPROCESSOR;
+/**
+ * @typedef SecureValuePreprocessingRule
+ * @property {RegExp} pattern The parsed pattern which is going to be used for replacement
+ * @property {string} [replacer] The replacer value to use. By default
+ * equals to `DEFAULT_SECURE_REPLACER`
+ */
+//# sourceMappingURL=log-internal.js.map

package/build/lib/log-internal.js.map

@@ -1 +1 @@
-{"version":3,"file":"log-internal.js","names":["DEFAULT_REPLACER","SecureValuesPreprocessor","constructor","_rules","rules","parseRule","rule","pattern","replacer","flags","_","isString","length","Error","JSON","stringify","escapeRegExp","isPlainObject","has","text","flag","includes","push","uniq","RegExp","join","loadRules","source","isArray","fs","exists","parse","readFile","e","message","issues","preprocess","str","result","replace","SECURE_VALUES_PREPROCESSOR"],"sources":["../../lib/log-internal.js"],"sourcesContent":["import fs from './fs';\nimport _ from 'lodash';\n\nconst DEFAULT_REPLACER = '**SECURE**';\n\nclass SecureValuesPreprocessor {\n  constructor() {\n    this._rules = [];\n  }\n\n  /**\n   * @returns {Array<SecureValuePreprocessingRule>} The list of successfully\n   * parsed preprocessing rules\n   */\n  get rules() {\n    return this._rules;\n  }\n\n  /**\n   * Parses single rule from the given JSON file\n   *\n   * @param {string|Rule} rule The rule might either be represented as a single string\n   * or a configuration object\n   * @throws {Error} If there was an error while parsing the rule\n   * @returns {SecureValuePreprocessingRule} The parsed rule\n   */\n  parseRule(rule) {\n    let pattern;\n    let replacer = DEFAULT_REPLACER;\n    let flags = ['g'];\n    if (_.isString(rule)) {\n      if (rule.length === 0) {\n        throw new Error(`${JSON.stringify(rule)} -> The value must not be empty`);\n      }\n      pattern = `\\\\b${_.escapeRegExp(rule)}\\\\b`;\n    } else if (_.isPlainObject(rule)) {\n      if (_.has(rule, 'pattern')) {\n        if (!_.isString(rule.pattern) || rule.pattern.length === 0) {\n          throw new Error(\n            `${JSON.stringify(rule)} -> The value of 'pattern' must be a valid non-empty string`\n          );\n        }\n        pattern = rule.pattern;\n      } else if (_.has(rule, 'text')) {\n        if (!_.isString(rule.text) || rule.text.length === 0) {\n          throw new Error(\n            `${JSON.stringify(rule)} -> The value of 'text' must be a valid non-empty string`\n          );\n        }\n        pattern = `\\\\b${_.escapeRegExp(rule.text)}\\\\b`;\n      }\n      if (!pattern) {\n        throw new Error(\n          `${JSON.stringify(rule)} -> Must either have a field named 'pattern' or 'text'`\n        );\n      }\n\n      if (_.has(rule, 'flags')) {\n        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Advanced_searching_with_flags_2\n        for (const flag of ['i', 'g', 'm', 's', 'u', 'y']) {\n          if (_.includes(rule.flags, flag)) {\n            flags.push(flag);\n          }\n        }\n        flags = _.uniq(flags);\n      }\n\n      if (_.isString(rule.replacer)) {\n        replacer = rule.replacer;\n      }\n    } else {\n      throw new Error(`${JSON.stringify(rule)} -> Must either be a string or an object`);\n    }\n\n    return {\n      pattern: new RegExp(pattern, flags.join('')),\n      replacer,\n    };\n  }\n\n  /**\n   * Loads rules from the given JSON file\n   *\n   * @param {string|string[]|Rule[]} source The full path to the JSON file containing secure\n   * values replacement rules or the rules themselves represented as an array\n   * @throws {Error} If the format of the source file is invalid or\n   * it does not exist\n   * @returns {Promise<string[]>} The list of issues found while parsing each rule.\n   * An empty list is returned if no rule parsing issues were found\n   */\n  async loadRules(source) {\n    let rules;\n    if (_.isArray(source)) {\n      rules = source;\n    } else {\n      if (!(await fs.exists(source))) {\n        throw new Error(`'${source}' does not exist or is not accessible`);\n      }\n      try {\n        rules = JSON.parse(await fs.readFile(source, 'utf8'));\n      } catch (e) {\n        throw new Error(`'${source}' must be a valid JSON file. Original error: ${e.message}`);\n      }\n      if (!_.isArray(rules)) {\n        throw new Error(`'${source}' must contain a valid JSON array`);\n      }\n    }\n\n    const issues = [];\n    this._rules = [];\n    for (const rule of rules) {\n      try {\n        this._rules.push(this.parseRule(rule));\n      } catch (e) {\n        issues.push(e.message);\n      }\n    }\n    return issues;\n  }\n\n  /**\n   * Performs secure values replacement inside the given string\n   * according to the previously loaded rules. No replacement is made\n   * if there are no rules or the given value is not a string\n   *\n   * @param {string} str The string to make replacements in\n   * @returns {string} The string with replacements made\n   */\n  preprocess(str) {\n    if (this._rules.length === 0 || !_.isString(str)) {\n      return str;\n    }\n\n    let result = str;\n    for (const rule of this._rules) {\n      result = result.replace(rule.pattern, rule.replacer);\n    }\n    return result;\n  }\n}\n\nconst SECURE_VALUES_PREPROCESSOR = new SecureValuesPreprocessor();\n\nexport {SECURE_VALUES_PREPROCESSOR, SecureValuesPreprocessor};\nexport default SECURE_VALUES_PREPROCESSOR;\n\n/**\n * @typedef Rule\n * @property {string} pattern A valid RegExp pattern to be replaced\n * @property {string} text A text match to replace. Either this property or the\n * above one must be provided. `pattern` has priority over `text` if both are provided.\n * @property {string} [flags] Regular expression flags for the given pattern.\n * Supported flag are the same as for the standard JavaScript RegExp constructor:\n * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#Advanced_searching_with_flags_2\n * The 'g' (global matching) is always enabled though.\n * @property {string} [replacer] The replacer value to use. By default\n * equals to `DEFAULT_SECURE_REPLACER`\n */\n\n/**\n * @typedef SecureValuePreprocessingRule\n * @property {RegExp} pattern The parsed pattern which is going to be used for replacement\n * @property {string} [replacer] The replacer value to use. By default\n * equals to `DEFAULT_SECURE_REPLACER`\n */\n"],"mappings":"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"}
+{"version":3,"file":"log-internal.js","sourceRoot":"","sources":["../../lib/log-internal.js"],"names":[],"mappings":"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"}

package/build/lib/logger.d.ts

@@ -1,3 +1,3 @@
 export default log;
-declare let log: import("../../types/build").AppiumLogger;
+declare let log: import("../../types/build/lib").AppiumLogger;
 //# sourceMappingURL=logger.d.ts.map

package/build/lib/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";AAEA,0DAA+B"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";AAEA,8DAA+B"}

package/build/lib/logger.js

@@ -1,15 +1,6 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-require("source-map-support/register");
-
-var _logging = require("./logging");
-
-let log = (0, _logging.getLogger)('Support');
-var _default = log;
-exports.default = _default;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJsb2ciLCJnZXRMb2dnZXIiXSwic291cmNlcyI6WyIuLi8uLi9saWIvbG9nZ2VyLmpzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7Z2V0TG9nZ2VyfSBmcm9tICcuL2xvZ2dpbmcnO1xuXG5sZXQgbG9nID0gZ2V0TG9nZ2VyKCdTdXBwb3J0Jyk7XG5cbmV4cG9ydCBkZWZhdWx0IGxvZztcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7O0FBQUE7O0FBRUEsSUFBSUEsR0FBRyxHQUFHLElBQUFDLGtCQUFBLEVBQVUsU0FBVixDQUFWO2VBRWVELEcifQ==
+Object.defineProperty(exports, "__esModule", { value: true });
+const logging_1 = require("./logging");
+let log = (0, logging_1.getLogger)('Support');
+exports.default = log;
+//# sourceMappingURL=logger.js.map

package/build/lib/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","names":["log","getLogger"],"sources":["../../lib/logger.js"],"sourcesContent":["import {getLogger} from './logging';\n\nlet log = getLogger('Support');\n\nexport default log;\n"],"mappings":";;;;;;;;;AAAA;;AAEA,IAAIA,GAAG,GAAG,IAAAC,kBAAA,EAAU,SAAV,CAAV;eAEeD,G"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../lib/logger.js"],"names":[],"mappings":";;AAAA,uCAAoC;AAEpC,IAAI,GAAG,GAAG,IAAA,mBAAS,EAAC,SAAS,CAAC,CAAC;AAE/B,kBAAe,GAAG,CAAC"}

package/build/lib/logging.d.ts

@@ -41,12 +41,11 @@ export function getLogger(prefix?: AppiumLoggerPrefix | null): AppiumLogger;
  * appear in Appium logs.
  * Each call to this method replaces the previously loaded rules if any existed.
  *
- * @param {string|string[]|import('./log-internal').Rule[]} rulesJsonPath The full path to the JSON file containing
+ * @param {string|string[]|import('@appium/types').LogFiltersConfig} rulesJsonPath The full path to the JSON file containing
  * the replacement rules. Each rule could either be a string to be replaced
- * or an object with predefined properties. See the `Rule` type definition in
- * `log-internals.js` to get more details on its format.
+ * or an object with predefined properties.
  * @throws {Error} If the given file cannot be loaded
  * @returns {Promise<LoadResult>}
  */
-export function loadSecureValuesPreprocessingRules(rulesJsonPath: string | string[] | import('./log-internal').Rule[]): Promise<LoadResult>;
+export function loadSecureValuesPreprocessingRules(rulesJsonPath: string | string[] | import('@appium/types').LogFiltersConfig): Promise<LoadResult>;
 //# sourceMappingURL=logging.d.ts.map

package/build/lib/logging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../lib/logging.js"],"names":[],"mappings":"AAQA,0DAA0D;AAC1D,qBADW,OAAO,eAAe,EAAE,iBAAiB,EAAE,CAC+B;;;;;;;YAsHvE,MAAM,EAAE;;;;;WAER,OAAO,gBAAgB,EAAE,4BAA4B,EAAE;;iCAgCxD,OAAO,eAAe,EAAE,kBAAkB;2BAC1C,OAAO,eAAe,EAAE,YAAY;gCACpC,OAAO,eAAe,EAAE,iBAAiB;AARtD,uDAAwB;AAvIxB;;;GAGG;AACH,oCAFW,OAAO,QAAQ,EAAE,MAAM,QAMjC;AAsCD;;;;GAIG;AACH,mCAHW,kBAAkB,UAChB,YAAY,CAsDxB;AAED;;;;;;GAMG;AAEH;;;;;;;;;;;;GAYG;AACH,kEAPW,MAAM,GAAC,MAAM,EAAE,GAAC,OAAO,gBAAgB,EAAE,IAAI,EAAE,GAK7C,QAAQ,UAAU,CAAC,CAQ/B"}
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../lib/logging.js"],"names":[],"mappings":"AAQA,0DAA0D;AAC1D,qBADW,OAAO,eAAe,EAAE,iBAAiB,EAAE,CAC+B;;;;;;;YAsHvE,MAAM,EAAE;;;;;WAER,OAAO,gBAAgB,EAAE,4BAA4B,EAAE;;iCA+BxD,OAAO,eAAe,EAAE,kBAAkB;2BAC1C,OAAO,eAAe,EAAE,YAAY;gCACpC,OAAO,eAAe,EAAE,iBAAiB;AARtD,uDAAwB;AAtIxB;;;GAGG;AACH,oCAFW,OAAO,QAAQ,EAAE,MAAM,QAMjC;AAsCD;;;;GAIG;AACH,mCAHW,kBAAkB,UAChB,YAAY,CAsDxB;AAED;;;;;;GAMG;AAEH;;;;;;;;;;;GAWG;AACH,kEANW,MAAM,GAAC,MAAM,EAAE,GAAC,OAAO,eAAe,EAAE,gBAAgB,GAItD,QAAQ,UAAU,CAAC,CAQ/B"}