@wwkit/shared 1.0.15 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wwkit/shared",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "author": "bluesliu <langcai163@163.com>",
   "description": "Shared utilities for @wwkit packages — config loader, platform detection",
   "type": "module",

package/src/shell.js

@@ -214,6 +214,12 @@ export class Shell {
   /**
    * 向指定 profile 文件写入/更新一个环境变量标记块
    *
+   * 写入前先清理文件中所有同名的裸 export/set 行（非标记块内的），
+   * 避免裸行与标记块并存导致残留误导。
+   * 标记块用单行注释头（无尾标记），形如：
+   *   # >>> wwkit NAME >>>
+   *   export NAME="value"
+   *
    * @param {string} profilePath - profile 文件绝对路径
    * @param {string} name - 环境变量名（用于生成标记）
    * @param {string} line - 变量设置行（含正确语法）
@@ -225,28 +231,59 @@ export class Shell {
       existing = fs.readFileSync(profilePath, 'utf8')
     } catch {}
 
-    const beginMarker = `# >>> wwkit ${name} >>>`
-    const endMarker = `# <<< wwkit ${name} <<<`
-    const block = `${beginMarker}\n${line}\n${endMarker}`
+const marker = `# >>> wwkit ${name} >>>`
+    const oldEndMarker = `# <<< wwkit ${name} <<<`
+
+    // 清理同名裸 export/set 行（不在任何标记块内的）
+    existing = this._stripBareEnvLines(existing, name)
 
-    const beginIdx = existing.indexOf(beginMarker)
+    const beginIdx = existing.indexOf(marker)
     if (beginIdx !== -1) {
-      const endIdx = existing.indexOf(endMarker)
-      if (endIdx !== -1 && existing.includes(line)) {
-        return false
+      const afterMarker = beginIdx + marker.length
+      // 块尾：优先找旧版 end marker，其次找下一个 wwkit marker，最后 EOF
+      const oldEndIdx = existing.indexOf(oldEndMarker, afterMarker)
+      const nextMarkerIdx = existing.indexOf('# >>> wwkit', afterMarker)
+      let blockEnd
+      if (oldEndIdx !== -1 && (nextMarkerIdx === -1 || oldEndIdx < nextMarkerIdx)) {
+        blockEnd = oldEndIdx + oldEndMarker.length
+      } else if (nextMarkerIdx !== -1) {
+        blockEnd = nextMarkerIdx
+      } else {
+        blockEnd = existing.length
       }
-      const afterEnd = endIdx !== -1 ? endIdx + endMarker.length : beginIdx + beginMarker.length
-      existing = existing.slice(0, beginIdx) + block + existing.slice(afterEnd)
+      const currentBlock = existing.slice(beginIdx, blockEnd)
+      const newBlock = `${marker}\n${line}`
+      if (currentBlock.trim() === newBlock.trim()) return false
+      existing = existing.slice(0, beginIdx) + newBlock + existing.slice(blockEnd)
       fs.writeFileSync(profilePath, existing, 'utf8')
       return true
     }
 
     const dir = path.dirname(profilePath)
     fs.mkdirSync(dir, { recursive: true })
-    fs.appendFileSync(profilePath, `\n${block}\n`, 'utf8')
+    fs.appendFileSync(profilePath, `\n${marker}\n${line}\n`, 'utf8')
     return true
   }
 
+  /**
+   * 从 profile 内容中删除所有同名的裸 export/set 行（不在标记块内的）
+   * @param {string} content
+   * @param {string} name
+   * @returns {string}
+   * @private
+   */
+  _stripBareEnvLines(content, name) {
+    const lines = content.split('\n')
+    const barePattern = new RegExp(`^\\s*(export|set -gx)\\s+${name}\\b`)
+    let inBlock = false
+    return lines.filter((l) => {
+      if (l.startsWith('# >>> wwkit ')) { inBlock = true; return true }
+      if (l.startsWith('# <<< wwkit ')) { inBlock = false; return true }
+      if (inBlock) return true
+      return !barePattern.test(l)
+    }).join('\n')
+  }
+
   /**
    * 检测系统命令是否可用
    * Windows: where <cmd>；Unix: which <cmd>