@appium/base-plugin 2.2.52 → 2.3.0

package/build/lib/plugin.d.ts

@@ -6,7 +6,7 @@ export type Driver<C extends Constraints> = import("@appium/types").Driver<C>;
 /**
  * @implements {Plugin}
  */
-export class BasePlugin implements Plugin {
+export class BasePlugin extends ExtensionCore implements Plugin {
     /**
      * Subclasses should use type `import('@appium/types').MethodMap<SubclassName>`.
      *
@@ -43,11 +43,16 @@ export class BasePlugin implements Plugin {
     /**
      * @param {string} name
      * @param {Record<string,unknown>} [cliArgs]
+     * @param {string|null} driverId
      */
-    constructor(name: string, cliArgs?: Record<string, unknown>);
+    constructor(name: string, cliArgs?: Record<string, unknown>, driverId?: string | null);
+    /**
+     * @deprecated Use this.log instead of this.logger
+     * @type {import('@appium/types').AppiumLogger}
+     */
+    logger: import("@appium/types").AppiumLogger;
     name: string;
     cliArgs: Record<string, unknown>;
-    logger: import("@appium/types").AppiumLogger;
     /**
      * A convenience method that can be called by plugins who implement their own `executeMethodMap`.
      * Only useful if your plugin has defined `executeMethodMap`. This helper requires passing in the
@@ -62,4 +67,5 @@ export class BasePlugin implements Plugin {
      */
     executeMethod<C extends Constraints>(next: NextPluginCallback, driver: Driver<C>, script: string, protoArgs: readonly [import("@appium/types").StringRecord<unknown>] | readonly any[]): Promise<unknown>;
 }
+import { ExtensionCore } from '@appium/base-driver';
 //# sourceMappingURL=plugin.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":";qBAuFa,OAAO,eAAe,EAAE,MAAM;iCAC9B,OAAO,eAAe,EAAE,kBAAkB;0BAC1C,OAAO,eAAe,EAAE,WAAW;mBAIrB,CAAC,SAAd,WAAY,IACb,OAAO,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AA3F9C;;GAEG;AACH,mCAFgB,MAAM;IAGpB;;;;;;;;;;;;;;OAcG;IACH,wBAAyB;IAEzB;;;;;;;;;;;;;;;OAeG;IACH,4BAA6B;IAE7B;;;OAGG;IACH,kBAHW,MAAM,YACN,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,EAMhC;IAHC,aAAgB;IAChB,iCAAsB;IACtB,6CAAkD;IAGpD;;;;;;;;;;;OAWG;IACH,cAN2B,CAAC,SAAd,WAAY,QACf,kBAAkB,UAClB,MAAM,CAAC,CAAC,CAAC,UACT,MAAM,aACN,SAAS,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,GAAG,EAAE,oBAkBnF;CACF"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":";qBAkGa,OAAO,eAAe,EAAE,MAAM;iCAC9B,OAAO,eAAe,EAAE,kBAAkB;0BAC1C,OAAO,eAAe,EAAE,WAAW;mBAIrB,CAAC,SAAd,WAAY,IACb,OAAO,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;AAvG9C;;GAEG;AACH,yDAFgB,MAAM;IAUpB;;;;;;;;;;;;;;OAcG;IACH,wBAAyB;IAEzB;;;;;;;;;;;;;;;OAeG;IACH,4BAA6B;IAE7B;;;;OAIG;IACH,kBAJW,MAAM,YACN,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,aACtB,MAAM,GAAC,IAAI,EAUrB;IAtDD;;;OAGG;IACH,QAFU,OAAO,eAAe,EAAE,YAAY,CAEvC;IA+CL,aAAgB;IAChB,iCAAsB;IAIxB;;;;;;;;;;;OAWG;IACH,cAN2B,CAAC,SAAd,WAAY,QACf,kBAAkB,UAClB,MAAM,CAAC,CAAC,CAAC,UACT,MAAM,aACN,SAAS,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,GAAG,EAAE,oBAkBnF;CACF;8BA5FiF,qBAAqB"}

package/build/lib/plugin.js

@@ -1,20 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasePlugin = void 0;
-const support_1 = require("@appium/support");
 const base_driver_1 = require("@appium/base-driver");
 /**
  * @implements {Plugin}
  */
-class BasePlugin {
+class BasePlugin extends base_driver_1.ExtensionCore {
     /**
      * @param {string} name
      * @param {Record<string,unknown>} [cliArgs]
+     * @param {string|null} driverId
      */
-    constructor(name, cliArgs = {}) {
+    constructor(name, cliArgs = {}, driverId = null) {
+        super();
+        if (driverId) {
+            this.updateLogPrefix(`${(0, base_driver_1.generateDriverLogPrefix)(this)} <${driverId}>`);
+        }
         this.name = name;
         this.cliArgs = cliArgs;
-        this.logger = support_1.logger.getLogger(`Plugin [${name}]`);
+        this.logger = this.log;
     }
     /**
      * A convenience method that can be called by plugins who implement their own `executeMethodMap`.

package/build/lib/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":";;;AAAA,6CAAuC;AACvC,qDAAgE;AAEhE;;GAEG;AACH,MAAM,UAAU;IAoCd;;;OAGG;IACH,YAAY,IAAI,EAAE,OAAO,GAAG,EAAE;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,gBAAM,CAAC,SAAS,CAAC,WAAW,IAAI,GAAG,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS;QACjD,MAAM,MAAM,GAAG,0DAA0D,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7F,MAAM,eAAe,GAAG,EAAC,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC;QAE/D,IAAI,CAAC,eAAe,CAAC,OAAO,IAAI,CAAC,CAAC,eAAe,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;YACnE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,6CAA6C,MAAM,4BAA4B,CAChF,CAAC;YACF,OAAO,MAAM,IAAI,EAAE,CAAC;QACtB,CAAC;QAED,MAAM,OAAO,GAAG,+DAA+D,CAAC,CAC9E,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAC9B,CAAC;QACF,MAAM,IAAI,GAAG,IAAA,yCAA2B,EAAC,SAAS,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAC5E,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IACzD,CAAC;;AAIK,gCAAU;AA7EhB;;;;;;;;;;;;;;GAcG;AACI,uBAAY,GAAG,EAAE,CAAC;AAEzB;;;;;;;;;;;;;;;GAeG;AACI,2BAAgB,GAAG,EAAE,CAAC;AA2C/B,kBAAe,UAAU,CAAC;AAG1B;;;;GAIG;AAEH;;;GAGG"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":";;;AAAA,qDAAwG;AAExG;;GAEG;AACH,MAAM,UAAW,SAAQ,2BAAa;IA2CpC;;;;OAIG;IACH,YAAY,IAAI,EAAE,OAAO,GAAG,EAAE,EAAE,QAAQ,GAAG,IAAI;QAC7C,KAAK,EAAE,CAAC;QACR,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,CAAC,eAAe,CAAC,GAAG,IAAA,qCAAuB,EAAC,IAAI,CAAC,KAAK,QAAQ,GAAG,CAAC,CAAC;QACzE,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;IACzB,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS;QACjD,MAAM,MAAM,GAAG,0DAA0D,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7F,MAAM,eAAe,GAAG,EAAC,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,EAAC,CAAC;QAE/D,IAAI,CAAC,eAAe,CAAC,OAAO,IAAI,CAAC,CAAC,eAAe,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC;YACnE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,6CAA6C,MAAM,4BAA4B,CAChF,CAAC;YACF,OAAO,MAAM,IAAI,EAAE,CAAC;QACtB,CAAC;QAED,MAAM,OAAO,GAAG,+DAA+D,CAAC,CAC9E,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAC9B,CAAC;QACF,MAAM,IAAI,GAAG,IAAA,yCAA2B,EAAC,SAAS,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAC5E,OAAO,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IACzD,CAAC;;AAIK,gCAAU;AAlFhB;;;;;;;;;;;;;;GAcG;AACI,uBAAY,GAAG,EAAE,CAAC;AAEzB;;;;;;;;;;;;;;;GAeG;AACI,2BAAgB,GAAG,EAAE,CAAC;AAgD/B,kBAAe,UAAU,CAAC;AAG1B;;;;GAIG;AAEH;;;GAGG"}

package/lib/plugin.js

@@ -1,10 +1,16 @@
-import {logger} from '@appium/support';
-import {validateExecuteMethodParams} from '@appium/base-driver';
+import {ExtensionCore, generateDriverLogPrefix, validateExecuteMethodParams} from '@appium/base-driver';
 
 /**
  * @implements {Plugin}
  */
-class BasePlugin {
+class BasePlugin extends ExtensionCore {
+
+  /**
+   * @deprecated Use this.log instead of this.logger
+   * @type {import('@appium/types').AppiumLogger}
+   */
+  logger;
+
   /**
    * Subclasses should use type `import('@appium/types').MethodMap<SubclassName>`.
    *
@@ -43,11 +49,16 @@ class BasePlugin {
   /**
    * @param {string} name
    * @param {Record<string,unknown>} [cliArgs]
+   * @param {string|null} driverId
    */
-  constructor(name, cliArgs = {}) {
+  constructor(name, cliArgs = {}, driverId = null) {
+    super();
+    if (driverId) {
+      this.updateLogPrefix(`${generateDriverLogPrefix(this)} <${driverId}>`);
+    }
     this.name = name;
     this.cliArgs = cliArgs;
-    this.logger = logger.getLogger(`Plugin [${name}]`);
+    this.logger = this.log;
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appium/base-plugin",
-  "version": "2.2.52",
+  "version": "2.3.0",
   "description": "The base plugin used to create Appium 2.0 plugins",
   "keywords": [
     "automation",
@@ -40,8 +40,8 @@
     "test:unit": "mocha \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
-    "@appium/base-driver": "^9.14.1",
-    "@appium/support": "^6.0.2"
+    "@appium/base-driver": "^9.15.0",
+    "@appium/support": "^6.0.3"
   },
   "engines": {
     "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -50,7 +50,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3467f32c8e3618db05b6b210544cfdc6a57bb73c",
+  "gitHead": "a7ce83e169e101ae497bab11204a73703fd54e99",
   "tags": [
     "appium"
   ]