@deveco-test/deveco-code 1.10.32 → 1.10.35

package/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
   },
-  "version": "1.10.32",
+  "version": "1.10.35",
   "license": "MIT",
   "files": [
     "bin/**/*",
@@ -16,11 +16,11 @@
     "CHANGELOG.md"
   ],
   "optionalDependencies": {
-    "@deveco-test/deveco-code-darwin-arm64": "1.10.32",
-    "@deveco-test/deveco-code-darwin-x64": "1.10.32",
-    "@deveco-test/deveco-code-windows-x64-baseline": "1.10.32",
-    "@deveco-test/deveco-code-windows-x64": "1.10.32",
-    "@deveco-test/deveco-code-hmos-arm64": "1.10.32"
+    "@deveco-test/deveco-code-darwin-x64": "1.10.35",
+    "@deveco-test/deveco-code-darwin-arm64": "1.10.35",
+    "@deveco-test/deveco-code-windows-x64-baseline": "1.10.35",
+    "@deveco-test/deveco-code-windows-x64": "1.10.35",
+    "@deveco-test/deveco-code-hmos-arm64": "1.10.35"
   },
   "dependencies": {
     "@deveco/deveco-cli": "1.3.2"

package/postinstall.mjs

@@ -58,17 +58,21 @@ function binaryName(name) {
   return name.includes("-hmos-") ? "hmos" : sourceBinary
 }
 
-function resolveLocalDevecoCliEntry() {
-  const packageJsonPath = require.resolve(`${devecoCliPackageName}/package.json`)
+function resolveLocalDevecoCliEntry(packageName = devecoCliPackageName) {
+  const packageJsonPath = require.resolve(`${packageName}/package.json`)
   const entry = path.join(path.dirname(packageJsonPath), "dist", "cli.js")
   if (fs.existsSync(entry)) return entry
-  throw new Error(`Local dependency "${devecoCliPackageName}" has no CLI entry at ${entry}.`)
+  throw new Error(`Local dependency "${packageName}" has no CLI entry at ${entry}.`)
 }
 
 function writeDevecoCliEntryMarker(installRoot) {
+  // OHOS follows the darwin/windows dependency-marker mechanism; only the
+  // package name differs (hmos cli arrives as a dependency of the hmos
+  // platform package and is hoisted into the main package's node_modules).
+  const packageName = isOhos() ? "@deveco-test/hmos-deveco-cli" : devecoCliPackageName
   const marker = path.join(installRoot, "vendor", ".deveco-cli-entry")
   fs.mkdirSync(path.dirname(marker), { recursive: true })
-  fs.writeFileSync(marker, `${resolveLocalDevecoCliEntry()}\n`, "utf8")
+  fs.writeFileSync(marker, `${resolveLocalDevecoCliEntry(packageName)}\n`, "utf8")
 }
 
 function supportsAvx2() {
@@ -246,6 +250,14 @@ function installPackage(name) {
     const packageDir = path.join(temp, "node_modules", name)
     copyBinary(path.join(packageDir, "bin", binaryName(name)), targetBinary)
     copyVendor(packageDir)
+    // The temp prefix is deleted below; persist the cli into the vendor tree
+    // so the marker written by main() points at a stable path.
+    const entry = resolveCliEntry([path.join(packageDir, "node_modules"), path.join(temp, "node_modules")])
+    if (entry) {
+      const cliDir = entry.slice(0, -"/dist/cli.js".length)
+      const rel = path.relative(path.join(temp, "node_modules"), cliDir)
+      copyDir(cliDir, path.join(__dirname, "vendor", "deveco-cli", "node_modules", rel))
+    }
     return true
   } finally {
     fs.rmSync(temp, { recursive: true, force: true })
@@ -273,34 +285,64 @@ function verifyBinary() {
   return result.status === 0
 }
 
-function writeVendorEntryMarker(installRoot) {
-  const vendorRoot = path.join(installRoot, "vendor", "deveco-cli")
+function resolveCliEntry(roots) {
   const names = ["@deveco-test/hmos-deveco-cli", "@deveco/deveco-cli", "@deveco-test/deveco-cli"]
-  for (const name of names) {
-    const entry = path.join(vendorRoot, "node_modules", ...name.split("/"), "dist", "cli.js")
-    if (!fs.existsSync(entry)) continue
-    fs.mkdirSync(path.join(installRoot, "vendor"), { recursive: true })
-    fs.writeFileSync(path.join(installRoot, "vendor", ".deveco-cli-entry"), `${entry}\n`, "utf8")
-    return
+  for (const root of roots) {
+    for (const name of names) {
+      const entry = path.join(root, ...name.split("/"), "dist", "cli.js")
+      if (fs.existsSync(entry)) return entry
+    }
   }
 }
 
+function writeVendorEntryMarker(installRoot, extraRoots = []) {
+  // npm pack strips nested node_modules, so the tarball's vendor tree is an
+  // empty shell; the cli actually arrives as a dependency of the hmos package
+  // (hoisted or nested), hence the extra roots.
+  const entry = resolveCliEntry([path.join(installRoot, "vendor", "deveco-cli", "node_modules"), ...extraRoots])
+  if (!entry) return
+  fs.mkdirSync(path.join(installRoot, "vendor"), { recursive: true })
+  fs.writeFileSync(path.join(installRoot, "vendor", ".deveco-cli-entry"), `${entry}\n`, "utf8")
+}
+
 function main() {
-  // On OHOS the npm dependency cli must not win over the vendored hmos cli, so
-  // the dependency marker is skipped and the vendor marker is written instead.
-  if (!isOhos()) writeDevecoCliEntryMarker(__dirname)
+  // Same dependency-marker mechanism on every platform; on OHOS the cli may
+  // still be missing here (platform package not hoisted yet), in which case
+  // the loop below resolves or materializes it.
+  try {
+    writeDevecoCliEntryMarker(__dirname)
+  } catch {
+    // resolved later
+  }
 
   for (const name of packageNames()) {
     try {
       const packageDir = resolvePackageDir(name)
       copyBinary(resolveBinary(name), targetBinary)
       copyVendor(packageDir)
-      if (isOhos()) writeVendorEntryMarker(__dirname)
-      else writeDevecoCliEntryMarker(packageDir)
+      if (isOhos()) {
+        // The runtime derives installRoot from the hmos binary's own package
+        // dir (the shim spawns node_modules/.../bin/hmos), so the marker must
+        // exist there too — same as darwin/windows writing into packageDir.
+        try {
+          writeDevecoCliEntryMarker(__dirname)
+          writeDevecoCliEntryMarker(packageDir)
+        } catch {
+          const roots = [path.join(packageDir, "node_modules"), path.join(__dirname, "node_modules")]
+          writeVendorEntryMarker(__dirname, roots)
+          writeVendorEntryMarker(packageDir, roots)
+        }
+      } else writeDevecoCliEntryMarker(packageDir)
       if (verifyBinary()) return
     } catch {
       if (installPackage(name)) {
-        if (isOhos()) writeVendorEntryMarker(__dirname)
+        if (isOhos()) {
+          try {
+            writeDevecoCliEntryMarker(__dirname)
+          } catch {
+            writeVendorEntryMarker(__dirname)
+          }
+        }
         if (verifyBinary()) return
       }
     }