@lvce-editor/test-with-playwright 12.0.0 → 13.0.0

package/README.md

@@ -16,7 +16,3 @@ test('sample.hello-world', async () => {
   await expect(sideBar).toBeVisible()
 })
 ```
-
-## Gitpod
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/lvce-editor/test-with-playwright)

package/dist/main.js

@@ -43,11 +43,11 @@ const getFinalResultMessage = (passed, skipped, failed, duration) => {
 
 const handleFinalResult = finalResult => {
   const {
-    passed,
+    end,
     failed,
+    passed,
     skipped,
-    start,
-    end
+    start
   } = finalResult;
   const duration = end - start;
   const message = getFinalResultMessage(passed, skipped, failed, duration);
@@ -70,9 +70,9 @@ const getDuration = (start, end) => {
 };
 const handleResultPassed = result => {
   const {
+    end,
     name,
-    start,
-    end
+    start
   } = result;
   const duration = getDuration(start, end);
   const formattedDuration = formatDuration(duration);
@@ -86,8 +86,8 @@ const handleResultSkipped = result => {
 };
 const handleResultFailed = result => {
   const {
-    name,
-    error
+    error,
+    name
   } = result;
   console.error(`${Fail$1} ${name}: ${error}`);
 };
@@ -97,6 +97,10 @@ const handleResult = result => {
   } = result;
   switch (status) {
     // @ts-ignore
+    case Fail:
+      handleResultFailed(result);
+      break;
+    // @ts-ignore
     case Pass:
       handleResultPassed(result);
       break;
@@ -104,18 +108,14 @@ const handleResult = result => {
     case Skip:
       handleResultSkipped(result);
       break;
-    // @ts-ignore
-    case Fail:
-      handleResultFailed(result);
-      break;
     default:
       throw new Error(`unexpected test state: ${status}`);
   }
 };
 
 const commandMap = {
-  [HandleResult]: handleResult,
-  [HandleFinalResult]: handleFinalResult
+  [HandleFinalResult]: handleFinalResult,
+  [HandleResult]: handleResult
 };
 
 function getDefaultExportFromCjs (x) {
@@ -370,6 +370,9 @@ const parseCliArgs = argv => {
   if (parsed['server-path']) {
     result.serverPath = parsed['server-path'];
   }
+  if (parsed['trace-focus']) {
+    result.traceFocus = true;
+  }
   return result;
 };
 
@@ -385,9 +388,9 @@ const parseEnv = env => {
 };
 
 const defaultOptions = {
-  testPath: '',
   extensionPath: '',
-  headless: false
+  headless: false,
+  testPath: ''
 };
 const getOptions = ({
   argv,
@@ -636,8 +639,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -660,14 +663,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -686,8 +689,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -697,8 +700,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -734,8 +737,8 @@ const removeListener = (emitter, type, callback) => {
 };
 const getFirstEvent = (eventEmitter, eventMap) => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   const listenerMap = Object.create(null);
   const cleanup = value => {
@@ -747,8 +750,8 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   for (const [event, type] of Object.entries(eventMap)) {
     const listener = event => {
       cleanup({
-        type,
-        event
+        event,
+        type
       });
     };
     addListener(eventEmitter, event, listener);
@@ -771,18 +774,18 @@ const fixNodeWorkerParameters = value => {
 };
 const getFirstNodeWorkerEvent = worker => {
   return getFirstEvent(worker, {
-    message: Message$1,
+    error: Error$2,
     exit: Exit,
-    error: Error$2
+    message: Message$1
   });
 };
 const create$1$1 = async ({
-  path,
   argv = [],
   env = process.env,
   execArgv = [],
-  stdio,
-  name
+  name,
+  path,
+  stdio
 }) => {
   string(path);
   const actualArgv = ['--ipc-type=node-worker', ...argv];
@@ -798,13 +801,13 @@ const create$1$1 = async ({
     argv: actualArgv,
     env: actualEnv,
     execArgv,
-    stdout: ignoreStdio,
+    name,
     stderr: ignoreStdio,
-    name
+    stdout: ignoreStdio
   });
   const {
-    type,
-    event
+    event,
+    type
   } = await getFirstNodeWorkerEvent(worker);
   if (type === Exit) {
     throw new IpcError(`Worker exited before ipc connection was established`);
@@ -850,56 +853,14 @@ const IpcParentWithNodeWorker$1 = {
   wrap: wrap$1
 };
 
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get = id => {
   return callbacks[id];
 };
 const remove = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -1095,7 +1056,7 @@ const getErrorProperty = (error, prettyError) => {
 };
 const create$1 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -1108,7 +1069,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
 };
 const create = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
@@ -1119,7 +1080,7 @@ const getSuccessResponse = (message, result) => {
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -1206,29 +1167,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
-};
-const invoke = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -1251,24 +1189,87 @@ const execute = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$s = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$r = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id = 0;
+const create$q = () => {
+  return ++id;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$q();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$r(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$s(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -1285,7 +1286,7 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -1295,22 +1296,22 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
-const create$6 = async ({
-  commandMap,
+const create$5 = async ({
   argv,
+  commandMap,
+  env,
   execArgv,
   path,
-  stdio,
-  env
+  stdio
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithNodeWorker$1.create({
     argv,
+    env,
     execArgv,
     path,
-    stdio,
-    env
+    stdio
   });
   const ipc = IpcParentWithNodeWorker$1.wrap(rawIpc);
   handleIpc(ipc);
@@ -1324,61 +1325,64 @@ const create$6 = async ({
 };
 const NodeWorkerRpcParent = {
   __proto__: null,
-  create: create$6
+  create: create$5
 };
 
 const RunAllTests = 'RunAllTests';
 
 const runAllTests = async ({
-  onlyExtension,
-  testPath,
+  commandMap,
   cwd,
   headless,
-  timeout,
-  commandMap,
+  onlyExtension,
+  serverPath,
+  testPath,
   testWorkerUri,
-  serverPath
+  timeout,
+  traceFocus
 }) => {
   // TODO use `using` once supported
   const path = fileURLToPath(testWorkerUri);
   const rpc = await NodeWorkerRpcParent.create({
-    path,
     argv: [],
     commandMap,
+    path,
     stdio: 'inherit'
   });
-  await rpc.invoke(RunAllTests, onlyExtension, testPath, cwd, headless, timeout, serverPath);
+  await rpc.invoke(RunAllTests, onlyExtension, testPath, cwd, headless, timeout, serverPath, traceFocus);
   await rpc.dispose();
 };
 
 const handleCliArgs = async ({
   argv,
-  env,
   commandMap,
-  cwd
+  cwd,
+  env
 }) => {
   const options = getOptions({
     argv,
     env
   });
   const {
+    headless,
     onlyExtension,
+    serverPath,
     testPath,
-    headless,
-    serverPath
+    traceFocus
   } = options;
   const timeout = 30_000;
   const testWorkerUri = getTestWorkerUrl();
   await runAllTests({
+    commandMap,
+    cwd,
+    headless,
     // @ts-ignore
     onlyExtension,
+    serverPath,
     testPath,
-    cwd,
-    headless,
-    timeout,
-    commandMap,
     testWorkerUri,
-    serverPath
+    timeout,
+    traceFocus
   });
 };
 
@@ -1400,9 +1404,9 @@ const main = async () => {
   on('uncaughtExceptionMonitor', handleUncaughtExceptionMonitor);
   await handleCliArgs({
     argv: argv,
-    env: env,
     commandMap: commandMap,
-    cwd: process.cwd()
+    cwd: process.cwd(),
+    env: env
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-with-playwright",
-  "version": "12.0.0",
+  "version": "13.0.0",
   "description": "CLI tool for running Playwright tests",
   "repository": {
     "type": "git",
@@ -12,8 +12,8 @@
   "main": "dist/main.js",
   "bin": "bin/test-with-playwright.js",
   "dependencies": {
-    "@lvce-editor/test-with-playwright-worker": "12.0.0",
-    "@lvce-editor/test-worker": "^10.7.0"
+    "@lvce-editor/test-with-playwright-worker": "13.0.0",
+    "@lvce-editor/test-worker": "^11.7.0"
   },
   "engines": {
     "node": ">=22"