expect-webdriverio 4.10.1 → 4.11.1

package/lib/index.js

@@ -21,5 +21,5 @@ export const setDefaultOptions = (options = {}) => {
     });
 };
 export const setOptions = setDefaultOptions;
-export * from './snapshot.js';
+export { SnapshotService } from './snapshot.js';
 export * as utils from './utils.js';

package/lib/snapshot.js

@@ -1,33 +1,51 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _SnapshotService_instances, _SnapshotService_currentFilePath, _SnapshotService_currentTestName, _SnapshotService_options, _SnapshotService_snapshotResults, _SnapshotService_snapshotEnvironment, _SnapshotService_snapshotClient, _SnapshotService_isEqual;
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _WebdriverIOSnapshotEnvironment_resolveSnapshotPath, _SnapshotService_instances, _SnapshotService_currentFilePath, _SnapshotService_currentTestName, _SnapshotService_options, _SnapshotService_snapshotResults, _SnapshotService_snapshotClient, _SnapshotService_isEqual;
 import { expect } from '@wdio/globals';
 import { SnapshotClient } from '@vitest/snapshot';
 import { NodeSnapshotEnvironment } from '@vitest/snapshot/environment';
 let service;
+class WebdriverIOSnapshotEnvironment extends NodeSnapshotEnvironment {
+    constructor(resolveSnapshotPath) {
+        super({});
+        _WebdriverIOSnapshotEnvironment_resolveSnapshotPath.set(this, void 0);
+        __classPrivateFieldSet(this, _WebdriverIOSnapshotEnvironment_resolveSnapshotPath, resolveSnapshotPath, "f");
+    }
+    async resolvePath(filepath) {
+        if (__classPrivateFieldGet(this, _WebdriverIOSnapshotEnvironment_resolveSnapshotPath, "f")) {
+            return Promise.resolve(__classPrivateFieldGet(this, _WebdriverIOSnapshotEnvironment_resolveSnapshotPath, "f").call(this, filepath, '.snap'));
+        }
+        return super.resolvePath(filepath);
+    }
+}
+_WebdriverIOSnapshotEnvironment_resolveSnapshotPath = new WeakMap();
 export class SnapshotService {
-    constructor(updateState) {
+    constructor(options) {
         _SnapshotService_instances.add(this);
         _SnapshotService_currentFilePath.set(this, void 0);
         _SnapshotService_currentTestName.set(this, void 0);
         _SnapshotService_options.set(this, void 0);
         _SnapshotService_snapshotResults.set(this, []);
-        _SnapshotService_snapshotEnvironment.set(this, new NodeSnapshotEnvironment());
         _SnapshotService_snapshotClient.set(this, new SnapshotClient({
             isEqual: __classPrivateFieldGet(this, _SnapshotService_instances, "m", _SnapshotService_isEqual).bind(this),
         }));
+        const updateSnapshot = (Boolean(process.env.CI) && !options?.updateState)
+            ? 'none'
+            : options?.updateState
+                ? options.updateState
+                : 'new';
         __classPrivateFieldSet(this, _SnapshotService_options, {
-            updateSnapshot: updateState,
-            snapshotEnvironment: __classPrivateFieldGet(this, _SnapshotService_snapshotEnvironment, "f"),
+            updateSnapshot,
+            snapshotEnvironment: new WebdriverIOSnapshotEnvironment(options?.resolveSnapshotPath)
         }, "f");
     }
     get currentFilePath() {
@@ -54,14 +72,14 @@ export class SnapshotService {
         }
         __classPrivateFieldGet(this, _SnapshotService_snapshotResults, "f").push(result);
     }
-    static initiate(updateState = 'new') {
+    static initiate(options) {
         if (!service) {
-            service = new SnapshotService(updateState);
+            service = new SnapshotService(options);
         }
         return service;
     }
 }
-_SnapshotService_currentFilePath = new WeakMap(), _SnapshotService_currentTestName = new WeakMap(), _SnapshotService_options = new WeakMap(), _SnapshotService_snapshotResults = new WeakMap(), _SnapshotService_snapshotEnvironment = new WeakMap(), _SnapshotService_snapshotClient = new WeakMap(), _SnapshotService_instances = new WeakSet(), _SnapshotService_isEqual = function _SnapshotService_isEqual(received, expected) {
+_SnapshotService_currentFilePath = new WeakMap(), _SnapshotService_currentTestName = new WeakMap(), _SnapshotService_options = new WeakMap(), _SnapshotService_snapshotResults = new WeakMap(), _SnapshotService_snapshotClient = new WeakMap(), _SnapshotService_instances = new WeakSet(), _SnapshotService_isEqual = function _SnapshotService_isEqual(received, expected) {
     try {
         expect(received).toBe(expected);
         return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "4.10.1",
+  "version": "4.11.1",
   "author": "Mykola Grybyk <mykola.grybyk@gmail.com>",
   "description": "WebdriverIO Assertion Library",
   "license": "MIT",

package/types/expect-webdriverio.d.ts

@@ -3,10 +3,14 @@ declare namespace ExpectWebdriverIO {
     function setOptions(options: DefaultOptions): void
     function getConfig(): any
 
+    type ResolveSnapshotPathFunction = (path: string, extension: string) => string
+    interface SnapshotServiceArgs {
+        updateState?: SnapshotUpdateState
+        resolveSnapshotPath?: ResolveSnapshotPathFunction
+    }
+
     class SnapshotService {
-        static initiate(
-            updateState?: import('@vitest/snapshot').SnapshotUpdateState
-        ): import('@wdio/types').Services.ServiceInstance & {
+        static initiate(options: SnapshotServiceArgs): import('@wdio/types').Services.ServiceInstance & {
             results: import('@vitest/snapshot').SnapshotResult[]
         }
     }