@wdio/utils 5.16.11 → 5.18.6

package/build/initialisePlugin.js

@@ -5,10 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = initialisePlugin;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _utils = require("./utils");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function initialisePlugin(name, type, target = 'default') {
-  if (name[0] === '@') {
+  if (name[0] === '@' || _path.default.isAbsolute(name)) {
     const service = (0, _utils.safeRequire)(name);
     return service[target];
   }

package/build/shim.js

@@ -10,6 +10,11 @@ var _logger = _interopRequireDefault(require("@wdio/logger"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const log = (0, _logger.default)('@wdio/utils:shim');
+let inCommandHook = false;
+let hasWdioSyncSupport = false;
+exports.hasWdioSyncSupport = hasWdioSyncSupport;
+let runSync = null;
+exports.runSync = runSync;
 
 let executeHooksWithArgs = async function executeHooksWithArgsShim(hooks, args) {
   if (!Array.isArray(hooks)) {
@@ -52,34 +57,91 @@ let runFnInFiberContext = function (fn) {
 
 exports.runFnInFiberContext = runFnInFiberContext;
 
-let wrapCommand = (_, origFn) => origFn;
+let wrapCommand = function wrapCommand(commandName, fn) {
+  return async function wrapCommandFn(...args) {
+    const beforeHookArgs = [commandName, args];
+
+    if (!inCommandHook && this.options.beforeCommand) {
+      inCommandHook = true;
+      await executeHooksWithArgs.call(this, this.options.beforeCommand, beforeHookArgs);
+      inCommandHook = false;
+    }
+
+    let commandResult;
+    let commandError;
+
+    try {
+      commandResult = await fn.apply(this, args);
+    } catch (err) {
+      commandError = err;
+    }
+
+    if (!inCommandHook && this.options.afterCommand) {
+      inCommandHook = true;
+      const afterHookArgs = [...beforeHookArgs, commandResult, commandError];
+      await executeHooksWithArgs.call(this, this.options.afterCommand, afterHookArgs);
+      inCommandHook = false;
+    }
+
+    if (commandError) {
+      throw commandError;
+    }
+
+    return commandResult;
+  };
+};
 
 exports.wrapCommand = wrapCommand;
-let hasWdioSyncSupport = false;
-exports.hasWdioSyncSupport = hasWdioSyncSupport;
 
-let executeSync = function (fn, _, args = []) {
-  return fn.apply(this, args);
+let executeSync = async function (fn, retries, args = []) {
+  this.wdioRetries = retries.attempts;
+
+  try {
+    let res = fn.apply(this, args);
+
+    if (res instanceof Promise) {
+      return await res;
+    }
+
+    return res;
+  } catch (e) {
+    if (retries.limit > retries.attempts) {
+      retries.attempts++;
+      return await executeSync.call(this, fn, retries, args);
+    }
+
+    return Promise.reject(e);
+  }
 };
 
 exports.executeSync = executeSync;
 
-let executeAsync = function (fn, _, args = []) {
-  return fn.apply(this, args);
+const executeAsync = async function (fn, retries, args = []) {
+  this.wdioRetries = retries.attempts;
+
+  try {
+    return await fn.apply(this, args);
+  } catch (e) {
+    if (retries.limit > retries.attempts) {
+      retries.attempts++;
+      return await executeAsync.call(this, fn, retries, args);
+    }
+
+    throw e;
+  }
 };
 
 exports.executeAsync = executeAsync;
-let runSync = null;
-exports.runSync = runSync;
 
 try {
-  const wdioSync = require('@wdio/sync');
-
-  exports.hasWdioSyncSupport = hasWdioSyncSupport = true;
-  exports.runFnInFiberContext = runFnInFiberContext = wdioSync.runFnInFiberContext;
-  exports.wrapCommand = wrapCommand = wdioSync.wrapCommand;
-  exports.executeHooksWithArgs = executeHooksWithArgs = wdioSync.executeHooksWithArgs;
-  exports.executeSync = executeSync = wdioSync.executeSync;
-  exports.executeAsync = executeAsync = wdioSync.executeAsync;
-  exports.runSync = runSync = wdioSync.runSync;
+  if (!process.env.WDIO_NO_SYNC_SUPPORT) {
+    const wdioSync = require('@wdio/sync');
+
+    exports.hasWdioSyncSupport = hasWdioSyncSupport = true;
+    exports.runFnInFiberContext = runFnInFiberContext = wdioSync.runFnInFiberContext;
+    exports.wrapCommand = wrapCommand = wdioSync.wrapCommand;
+    exports.executeHooksWithArgs = executeHooksWithArgs = wdioSync.executeHooksWithArgs;
+    exports.executeSync = executeSync = wdioSync.executeSync;
+    exports.runSync = runSync = wdioSync.runSync;
+  }
 } catch (_unused) {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/utils",
-  "version": "5.16.11",
+  "version": "5.18.6",
   "description": "A WDIO helper utility to provide several utility functions used across the project.",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/master/packages/wdio-utils",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ebea222f90021b0a76b475fcd70a5e1f8ec4dba8"
+  "gitHead": "fa344d53871401ad3a6513ffa16ed4f9d2218f59"
 }