ohos-playwright 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohos-playwright",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Playwright adapter for OpenHarmony / ArkWeb via hdc + CDP",
   "license": "MIT",
   "author": "social4hyq",
@@ -23,6 +23,9 @@
     "cdp"
   ],
   "type": "module",
+  "scripts": {
+    "test": "node --test src/loader.test.mjs"
+  },
   "engines": {
     "node": ">=24"
   },
@@ -42,6 +45,7 @@
   },
   "files": [
     "src",
+    "!src/*.test.mjs",
     "SKILL.md"
   ],
   "peerDependencies": {

package/src/cli.mjs

@@ -3,18 +3,34 @@ import { spawn } from 'node:child_process'
 import { existsSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import { dirname, resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
-const register = resolve(__dirname, 'register.mjs')
+// Resolve @playwright/test from the consumer's project root (process.cwd()),
+// not from this package's own directory (which has no node_modules/ for its
+// peer dependencies when installed via a file: symlink).
+// noop.mjs doesn't need to exist on disk -- createRequire uses it only to
+// anchor the module resolution base path.
+const req = createRequire(resolve(process.cwd(), 'noop.mjs'))
 
 // @playwright/test's exports map blocks direct subpath resolution to cli.js,
 // so resolve the main entry and walk up to the package root, then append it.
-const req = createRequire(import.meta.url)
-let pkgRoot = dirname(req.resolve('@playwright/test'))
+let pwEntry
+try {
+  pwEntry = req.resolve('@playwright/test')
+} catch {
+  console.error(
+    `[ohos-playwright] Cannot find @playwright/test from ${process.cwd()}.\n` +
+    'Make sure it is installed in the current project or an ancestor:\n' +
+    '  npm install -D @playwright/test\n' +
+    '  pnpm add -D @playwright/test',
+  )
+  process.exit(1)
+}
+let pkgRoot = dirname(pwEntry)
 while (!existsSync(resolve(pkgRoot, 'package.json'))) pkgRoot = dirname(pkgRoot)
 const playwrightCli = resolve(pkgRoot, 'cli.js')
 
+const register = resolve(import.meta.dirname, 'register.mjs')
+
 const child = spawn(
   process.execPath,
   ['--import', register, playwrightCli, ...process.argv.slice(2)],

package/src/loader.mjs

@@ -1,8 +1,7 @@
-import { resolve as resolvePath, dirname } from 'node:path'
-import { fileURLToPath, pathToFileURL } from 'node:url'
+import { resolve as resolvePath } from 'node:path'
+import { pathToFileURL } from 'node:url'
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
-const FIXTURE_URL = pathToFileURL(resolvePath(__dirname, 'fixture.mjs')).href
+const FIXTURE_URL = pathToFileURL(resolvePath(import.meta.dirname, 'fixture.mjs')).href
 
 const TARGET = '@playwright/test'
 
@@ -12,12 +11,36 @@ const TARGET = '@playwright/test'
 // stay on stock Playwright.
 const TEST_FILE = /\.(spec|test)\.[mc]?[tj]sx?$/
 
+// Compute the package root URL from the loader's own location.  Used below to
+// detect when the importing module lives inside ohos-playwright, regardless of
+// what the package directory is named or how it was installed (file: symlink,
+// pnpm store hash, etc.).  Trailing '/' is critical to avoid matching sibling
+// directories whose names happen to share the same prefix.
+const PACKAGE_ROOT_URL = pathToFileURL(resolvePath(import.meta.dirname, '..') + '/').href
+
+// Anchor URL in the consumer project root for ESM resolution fallback.
+// When ohos-playwright is a file: symlink, modules inside it can't resolve
+// peer dependencies from the consumer's node_modules. Overriding parentURL
+// to a file inside the project restores normal resolution.
+// noop.mjs doesn't need to exist on disk.
+// PROJECT_ANCHOR is computed once at module-load time.  By the time this
+// module is --import'ed (via register.mjs), process.cwd() is guaranteed to be
+// the directory where the user invoked ohos-playwright test — Node sets cwd
+// before running --import hooks.  Do NOT defer this to the resolve hook; the
+// string is needed for synchronous prefix matching in the hot path.
+const PROJECT_ANCHOR = pathToFileURL(resolvePath(process.cwd(), 'noop.mjs')).href
+
 export async function resolve(specifier, context, nextResolve) {
   if (specifier === TARGET) {
     const parent = context.parentURL ?? ''
     if (TEST_FILE.test(parent)) {
+      // Spec files -> use custom ArkWeb fixture
       return nextResolve(FIXTURE_URL, context)
     }
+    if (parent.startsWith(PACKAGE_ROOT_URL)) {
+      // Internal modules (fixture.mjs, etc.) -> resolve from consumer project
+      return nextResolve(specifier, { ...context, parentURL: PROJECT_ANCHOR })
+    }
   }
   return nextResolve(specifier, context)
 }