@deveco-test/deveco-code 0.2.0-Test → 0.2.1-5

package/README.md

@@ -241,7 +241,6 @@ DevEco Code 集成了常用 HarmonyOS 开发工具能力：
 | `hdc_log`                | 收集/清理设备日志/查看连接模拟器    |
 | `verify_ui`              | 执行 UI 操作验证功能是否正确        |
 | `arkts_check`            | ArkTS 静态语法检查         |
-| `arkts_knowledge_search` | HarmonyOS 知识搜索 |
 | `switch_cwd`             | 切换构建项目路径             |
 
 常见场景包括：从零到一创建 HarmonyOS 工程、增量开发页面、修复编译报错、真机调试。

package/bin/deveco.exe

@@ -0,0 +1,10 @@
+echo "Error: deveco-ai's postinstall script was not run." >&2
+echo "" >&2
+echo "This occurs when using --ignore-scripts during installation, or when using a" >&2
+echo "package manager like pnpm that does not run postinstall scripts by default." >&2
+echo "" >&2
+echo "To fix this, run the postinstall script manually:" >&2
+echo "  cd node_modules/deveco-ai && node postinstall.mjs" >&2
+echo "" >&2
+echo "Or reinstall deveco-ai without the --ignore-scripts flag." >&2
+exit 1

package/package.json

@@ -1,13 +1,22 @@
 {
   "name": "@deveco-test/deveco-code",
   "bin": {
-    "deveco": "./bin/deveco"
+    "deveco": "./bin/deveco.exe"
   },
   "scripts": {
-    "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
+    "postinstall": "node ./postinstall.mjs"
   },
-  "version": "0.2.0-Test",
+  "version": "0.2.1-5",
   "license": "MIT",
+  "os": [
+    "darwin",
+    "linux",
+    "win32"
+  ],
+  "cpu": [
+    "arm64",
+    "x64"
+  ],
   "files": [
     "bin/**/*",
     "postinstall.mjs",
@@ -16,9 +25,12 @@
     "CHANGELOG.md"
   ],
   "optionalDependencies": {
-    "@deveco-test/deveco-code-windows-x64": "0.2.0-Test",
-    "@deveco-test/deveco-code-darwin-x64": "0.2.0-Test",
-    "@deveco-test/deveco-code-darwin-arm64": "0.2.0-Test",
-    "@deveco-test/deveco-code-windows-x64-baseline": "0.2.0-Test"
+    "@deveco-test/deveco-code-darwin-x64": "0.2.1-5",
+    "@deveco-test/deveco-code-darwin-arm64": "0.2.1-5",
+    "@deveco-test/deveco-code-windows-x64-baseline": "0.2.1-5",
+    "@deveco-test/deveco-code-windows-x64": "0.2.1-5"
+  },
+  "dependencies": {
+    "@deveco/deveco-cli": "1.3.0-stable"
   }
 }

package/postinstall.mjs

@@ -24,9 +24,24 @@ const archMap = {
 
 const platform = platformMap[os.platform()] ?? os.platform()
 const arch = archMap[os.arch()] ?? os.arch()
-const base = `@deveco-test/deveco-code-${platform}-${arch}`
+const scope = packageJson.name && packageJson.name.includes("/") ? packageJson.name.split("/")[0] : "@deveco"
+const base = `${scope}/deveco-code-${platform}-${arch}`
 const sourceBinary = platform === "windows" ? "deveco.exe" : "deveco"
 const targetBinary = path.join(__dirname, "bin", "deveco.exe")
+const devecoCliEntryMarker = path.join(__dirname, "vendor", ".deveco-cli-entry")
+const devecoCliPackageName = "@deveco/deveco-cli"
+
+function resolveLocalDevecoCliEntry() {
+  const packageJsonPath = require.resolve(`${devecoCliPackageName}/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}.`)
+}
+
+function writeDevecoCliEntryMarker() {
+  fs.mkdirSync(path.dirname(devecoCliEntryMarker), { recursive: true })
+  fs.writeFileSync(devecoCliEntryMarker, `${resolveLocalDevecoCliEntry()}\n`, "utf8")
+}
 
 function supportsAvx2() {
   if (arch !== "x64") return false
@@ -148,24 +163,42 @@ function copyVendor(packageDir) {
   const vendorDst = path.join(__dirname, "vendor")
   if (fs.existsSync(vendorSrc)) {
     copyDir(vendorSrc, vendorDst)
-    restoreDevecoCliDeps(path.join(vendorDst, "deveco-cli"))
-    restoreDevecoCliDeps(path.join(packageDir, "vendor", "deveco-cli"))
+    // Windows packs often drop Unix +x; force it back on macOS/Linux install.
+    ensureVendorExecutables(vendorDst)
+    ensureVendorExecutables(path.join(packageDir, "vendor"))
   }
 }
 
-function restoreDevecoCliDeps(cliDir) {
-  const tarPath = path.join(cliDir, "deps.tar.gz")
-  if (!fs.existsSync(tarPath)) return
-  const result = childProcess.spawnSync("tar", ["-xzf", tarPath, "-C", cliDir], {
-    stdio: "inherit",
-    windowsHide: true,
-    shell: true,
-  })
-  if (result.status !== 0) {
-    console.warn("Warning: failed to restore deveco-cli dependencies")
-    return
+/** Restore execute bits lost when packages are built/published from Windows. */
+function ensureVendorExecutables(vendorRoot) {
+  if (process.platform === "win32" || !fs.existsSync(vendorRoot)) return
+
+  const stack = [vendorRoot]
+  while (stack.length > 0) {
+    const dir = stack.pop()
+    let entries
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true })
+    } catch {
+      continue
+    }
+    for (const entry of entries) {
+      const full = path.join(dir, entry.name)
+      if (entry.isDirectory()) {
+        stack.push(full)
+        continue
+      }
+      if (!entry.isFile()) continue
+      // Top-level vendor/ripgrep/rg and nested @vscode/ripgrep*/**/rg
+      if (entry.name === "rg") {
+        try {
+          fs.chmodSync(full, 0o755)
+        } catch {
+          // Best-effort; ignore files we cannot chmod.
+        }
+      }
+    }
   }
-  fs.unlinkSync(tarPath)
 }
 
 function installPackage(name) {
@@ -211,6 +244,8 @@ function verifyBinary() {
 }
 
 function main() {
+  writeDevecoCliEntryMarker()
+
   for (const name of packageNames()) {
     try {
       copyBinary(resolveBinary(name), targetBinary)

package/bin/deveco

@@ -1,199 +0,0 @@
-#!/usr/bin/env node
-
-const childProcess = require("child_process")
-const fs = require("fs")
-const path = require("path")
-const os = require("os")
-
-const forwardedSignals = ["SIGINT", "SIGTERM", "SIGHUP"]
-
-function run(target) {
-  const child = childProcess.spawn(target, process.argv.slice(2), {
-    stdio: "inherit",
-  })
-
-  child.on("error", (error) => {
-    console.error(error.message)
-    process.exit(1)
-  })
-
-  const forwarders = {}
-  for (const signal of forwardedSignals) {
-    forwarders[signal] = () => {
-      try {
-        child.kill(signal)
-      } catch {
-        // The child may have already exited.
-      }
-    }
-    process.on(signal, forwarders[signal])
-  }
-
-  child.on("exit", (code, signal) => {
-    for (const forwardedSignal of forwardedSignals) {
-      process.removeListener(forwardedSignal, forwarders[forwardedSignal])
-    }
-
-    if (signal) {
-      process.kill(process.pid, signal)
-      return
-    }
-
-    process.exit(typeof code === "number" ? code : 0)
-  })
-}
-
-const envPath = process.env.DEVECO_BIN_PATH
-
-const scriptPath = fs.realpathSync(__filename)
-const scriptDir = path.dirname(scriptPath)
-
-//
-const cached = path.join(scriptDir, ".deveco")
-
-const platformMap = {
-  darwin: "darwin",
-  linux: "linux",
-  win32: "windows",
-}
-const archMap = {
-  x64: "x64",
-  arm64: "arm64",
-  arm: "arm",
-}
-
-let platform = platformMap[os.platform()]
-if (!platform) {
-  platform = os.platform()
-}
-let arch = archMap[os.arch()]
-if (!arch) {
-  arch = os.arch()
-}
-const base = "@deveco-test/deveco-code-" + platform + "-" + arch
-const binary = platform === "windows" ? "deveco.exe" : "deveco"
-
-function supportsAvx2() {
-  if (arch !== "x64") return false
-
-  if (platform === "linux") {
-    try {
-      return /(^|\s)avx2(\s|$)/i.test(fs.readFileSync("/proc/cpuinfo", "utf8"))
-    } catch {
-      return false
-    }
-  }
-
-  if (platform === "darwin") {
-    try {
-      const result = childProcess.spawnSync("sysctl", ["-n", "hw.optional.avx2_0"], {
-        encoding: "utf8",
-        timeout: 1500,
-      })
-      if (result.status !== 0) return false
-      return (result.stdout || "").trim() === "1"
-    } catch {
-      return false
-    }
-  }
-
-  if (platform === "windows") {
-    const cmd =
-      '(Add-Type -MemberDefinition "[DllImport(""kernel32.dll"")] public static extern bool IsProcessorFeaturePresent(int ProcessorFeature);" -Name Kernel32 -Namespace Win32 -PassThru)::IsProcessorFeaturePresent(40)'
-
-    for (const exe of ["powershell.exe", "pwsh.exe", "pwsh", "powershell"]) {
-      try {
-        const result = childProcess.spawnSync(exe, ["-NoProfile", "-NonInteractive", "-Command", cmd], {
-          encoding: "utf8",
-          timeout: 3000,
-          windowsHide: true,
-        })
-        if (result.status !== 0) continue
-        const out = (result.stdout || "").trim().toLowerCase()
-        if (out === "true" || out === "1") return true
-        if (out === "false" || out === "0") return false
-      } catch {
-        continue
-      }
-    }
-
-    return false
-  }
-
-  return false
-}
-
-const names = (() => {
-  const avx2 = supportsAvx2()
-  const baseline = arch === "x64" && !avx2
-
-  if (platform === "linux") {
-    const musl = (() => {
-      try {
-        if (fs.existsSync("/etc/alpine-release")) return true
-      } catch {
-        // ignore
-      }
-
-      try {
-        const result = childProcess.spawnSync("ldd", ["--version"], { encoding: "utf8" })
-        const text = ((result.stdout || "") + (result.stderr || "")).toLowerCase()
-        if (text.includes("musl")) return true
-      } catch {
-        // ignore
-      }
-
-      return false
-    })()
-
-    if (musl) {
-      if (arch === "x64") {
-        if (baseline) return [`${base}-baseline-musl`, `${base}-musl`, `${base}-baseline`, base]
-        return [`${base}-musl`, `${base}-baseline-musl`, base, `${base}-baseline`]
-      }
-      return [`${base}-musl`, base]
-    }
-
-    if (arch === "x64") {
-      if (baseline) return [`${base}-baseline`, base, `${base}-baseline-musl`, `${base}-musl`]
-      return [base, `${base}-baseline`, `${base}-musl`, `${base}-baseline-musl`]
-    }
-    return [base, `${base}-musl`]
-  }
-
-  if (arch === "x64") {
-    if (baseline) return [`${base}-baseline`, base]
-    return [base, `${base}-baseline`]
-  }
-  return [base]
-})()
-
-function findBinary(startDir) {
-  let current = startDir
-  for (;;) {
-    const modules = path.join(current, "node_modules")
-    if (fs.existsSync(modules)) {
-      for (const name of names) {
-        const candidate = path.join(modules, name, "bin", binary)
-        if (fs.existsSync(candidate)) return candidate
-      }
-    }
-    const parent = path.dirname(current)
-    if (parent === current) {
-      return
-    }
-    current = parent
-  }
-}
-
-const resolved = envPath || (fs.existsSync(cached) ? cached : findBinary(scriptDir))
-if (!resolved) {
-  console.error(
-    "It seems that your package manager failed to install the right version of the deveco CLI for your platform. You can try manually installing " +
-      names.map((n) => `\"${n}\"`).join(" or ") +
-      " package",
-  )
-  process.exit(1)
-}
-
-run(resolved)