@lvce-editor/test-with-playwright 4.0.0 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-with-playwright",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "",
   "main": "src/main.js",
   "type": "module",
@@ -10,17 +10,15 @@
     "url": "git@github.com:lvce-editor/test-with-playwright.git"
   },
   "keywords": [],
-  "author": "",
+  "author": "Lvce Editor",
   "license": "MIT",
   "dependencies": {
     "@lvce-editor/assert": "^1.4.0",
-    "@lvce-editor/command": "^2.0.0",
-    "@lvce-editor/ipc": "^14.5.0",
-    "@lvce-editor/json-rpc": "^7.0.0",
+    "@lvce-editor/rpc": "^4.18.0",
     "@lvce-editor/verror": "^1.7.0",
     "minimist": "^1.2.8",
-    "@lvce-editor/test-with-playwright-worker": "4.0.0",
-    "@lvce-editor/test-worker": "^5.0.0"
+    "@lvce-editor/test-with-playwright-worker": "5.0.0",
+    "@lvce-editor/test-worker": "^5.4.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",

package/src/parts/GetTestWorkerPath/GetTestWorkerPath.js

@@ -1,5 +1,3 @@
-import { testWorkerPath } from '@lvce-editor/test-with-playwright-worker'
-
 export const getTestWorkerPath = () => {
-  return testWorkerPath
+  return import.meta.resolve('@lvce-editor/test-with-playwright-worker')
 }

package/src/parts/HandleCliArgs/HandleCliArgs.js

@@ -1,17 +1,20 @@
 import * as GetOptions from '../GetOptions/GetOptions.js'
 import * as RunAllTests from '../RunAllTests/RunAllTests.js'
+import * as GetTestWorkerPath from '../GetTestWorkerPath/GetTestWorkerPath.js'
 
 /**
  *
- * @param {{argv:string[], env:any}} param0
+ * @param {{argv:string[], env:any, commandMap:any}} param0
  */
-export const handleCliArgs = async ({ argv, env }) => {
+export const handleCliArgs = async ({ argv, env, commandMap }) => {
   const cwd = process.cwd()
   const options = GetOptions.getOptions({ argv, env })
   const onlyExtension = options.onlyExtension
   const testPath = options.testPath
   const headless = options.headless
   const timeout = 30_000
+  const testWorkerPath = GetTestWorkerPath.getTestWorkerPath()
+
   // TODO
   // console.log({ argv, env })
   await RunAllTests.runAllTests({
@@ -20,5 +23,7 @@ export const handleCliArgs = async ({ argv, env }) => {
     cwd,
     headless,
     timeout,
+    commandMap,
+    testWorkerPath,
   })
 }

package/src/parts/Main/Main.js

@@ -1,11 +1,9 @@
-import * as Command from '../Command/Command.js'
 import * as CommandMap from '../CommandMap/CommandMap.js'
 import * as HandleCliArgs from '../HandleCliArgs/HandleCliArgs.js'
 import * as Process from '../Process/Process.js'
 import * as ProcessListeners from '../ProcessListeners/ProcessListeners.js'
 
-export const main = () => {
+export const main = async () => {
   Process.on('uncaughtExceptionMonitor', ProcessListeners.handleUncaughtExceptionMonitor)
-  Command.register(CommandMap.commandMap)
-  HandleCliArgs.handleCliArgs({ argv: Process.argv, env: Process.env })
+  await HandleCliArgs.handleCliArgs({ argv: Process.argv, env: Process.env, commandMap: CommandMap.commandMap })
 }

package/src/parts/RunAllTests/RunAllTests.js

@@ -1,22 +1,17 @@
-import * as GetTestWorkerPath from '../GetTestWorkerPath/GetTestWorkerPath.js'
-import * as HandleIpc from '../HandleIpc/HandleIpc.js'
-import * as IpcParent from '../IpcParent/IpcParent.js'
-import * as IpcParentType from '../IpcParentType/IpcParentType.js'
-import * as JsonRpc from '../JsonRpc/JsonRpc.js'
+import { NodeWorkerRpcParent } from '@lvce-editor/rpc'
 import * as TestWorkerCommandType from '../TestWorkerCommandType/TestWorkerCommandType.js'
 
 /**
  *
- * @param {{onlyExtension:string, testPath:string, cwd:string, headless:boolean, timeout:number}} param0
+ * @param {{onlyExtension:string, testPath:string, cwd:string, headless:boolean, timeout:number, commandMap:any, testWorkerPath:string}} param0
  */
-export const runAllTests = async ({ onlyExtension, testPath, cwd, headless, timeout }) => {
-  const path = GetTestWorkerPath.getTestWorkerPath()
-  const ipc = await IpcParent.create({
-    method: IpcParentType.NodeWorker,
-    path,
+export const runAllTests = async ({ onlyExtension, testPath, cwd, headless, timeout, commandMap, testWorkerPath }) => {
+  // TODO use `using` once supported
+  const rpc = await NodeWorkerRpcParent.create({
+    path: testWorkerPath,
     argv: [],
+    commandMap,
   })
-  HandleIpc.handleIpc(ipc)
-  await JsonRpc.invoke(ipc, TestWorkerCommandType.RunAllTests, onlyExtension, testPath, cwd, headless, timeout)
-  ipc.dispose()
+  await rpc.invoke(TestWorkerCommandType.RunAllTests, onlyExtension, testPath, cwd, headless, timeout)
+  await rpc.dispose()
 }

package/src/parts/Command/Command.js

@@ -1 +0,0 @@
-export * from '@lvce-editor/command'

package/src/parts/HandleIpc/HandleIpc.js

@@ -1,5 +0,0 @@
-import * as HandleMessage from '../HandleMessage/HandleMessage.js'
-
-export const handleIpc = (ipc) => {
-  ipc.addEventListener('message', HandleMessage.handleMessage)
-}

package/src/parts/HandleMessage/HandleMessage.js

@@ -1,26 +0,0 @@
-import * as Command from '../Command/Command.js'
-import * as JsonRpc from '../JsonRpc/JsonRpc.js'
-
-const prepare = (error) => {
-  return error
-}
-
-const requiresSocket = (method) => {
-  return false
-}
-
-const logError = (error) => {
-  console.error(error)
-}
-
-export const handleMessage = (event) => {
-  return JsonRpc.handleJsonRpcMessage(
-    event.target,
-    event.data,
-    Command.execute,
-    JsonRpc.resolve,
-    prepare,
-    logError,
-    requiresSocket,
-  )
-}

package/src/parts/IpcParent/IpcParent.js

@@ -1,9 +0,0 @@
-import * as IpcParentModule from '../IpcParentModule/IpcParentModule.js'
-
-export const create = async ({ method, ...options }) => {
-  const module = IpcParentModule.getModule(method)
-  // @ts-ignore
-  const rawIpc = await module.create(options)
-  const ipc = module.wrap(rawIpc)
-  return ipc
-}

package/src/parts/IpcParentModule/IpcParentModule.js

@@ -1,11 +0,0 @@
-import * as IpcParentType from '../IpcParentType/IpcParentType.js'
-import { IpcParentWithNodeWorker } from '@lvce-editor/ipc'
-
-export const getModule = (method) => {
-  switch (method) {
-    case IpcParentType.NodeWorker:
-      return IpcParentWithNodeWorker
-    default:
-      throw new Error('unexpected ipc type')
-  }
-}

package/src/parts/IpcParentType/IpcParentType.js

@@ -1,2 +0,0 @@
-export const NodeWorker = 1
-export const NodeForkedProcess = 2

package/src/parts/JsonRpc/JsonRpc.js

@@ -1 +0,0 @@
-export * from '@lvce-editor/json-rpc'