fix(workbench): Windows 风格 DSH_HOME 在 POSIX 上按 Windows 语义拼账本路径
This commit is contained in:
parent
6f660ff2b4
commit
646f33589c
|
|
@ -7,13 +7,27 @@
|
|||
|
||||
import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, statSync, writeFileSync } from 'node:fs'
|
||||
import { homedir } from 'node:os'
|
||||
import { dirname, join, resolve } from 'node:path'
|
||||
import { dirname, join, resolve, win32 } from 'node:path'
|
||||
|
||||
export const SIDECAR_DIR_NAME = 'sansheng-liubu'
|
||||
|
||||
// DSH_HOME 是 Windows 绝对路径(盘符或 UNC)时按 Windows 语义拼:在 POSIX 上
|
||||
// 直接 resolve 会把 C:\… 当相对路径拼到当前目录后面。与 core/store 的
|
||||
// defaultStorePath 同一条规则,两处必须一致。
|
||||
const WINDOWS_ABSOLUTE = /^[A-Za-z]:[\\/]/
|
||||
|
||||
function isWindowsAbsolute(value) {
|
||||
return typeof value === 'string' && (WINDOWS_ABSOLUTE.test(value) || value.startsWith('\\\\'))
|
||||
}
|
||||
|
||||
function joinUnder(dir, name) {
|
||||
return isWindowsAbsolute(dir) ? win32.join(dir, name) : join(dir, name)
|
||||
}
|
||||
|
||||
/** 侧车目录:DSH_HOME 优先,其次 ~/.dsh;相对路径按当前目录解析,不做猜测。 */
|
||||
export function resolveSidecarDir(env = process.env) {
|
||||
const raw = env && typeof env.DSH_HOME === 'string' ? env.DSH_HOME.trim() : ''
|
||||
if (isWindowsAbsolute(raw)) return win32.join(raw, SIDECAR_DIR_NAME)
|
||||
const home = raw === '' ? join(homedir(), '.dsh') : raw
|
||||
return resolve(home, SIDECAR_DIR_NAME)
|
||||
}
|
||||
|
|
@ -26,15 +40,15 @@ export function resolveStorePath(env = process.env) {
|
|||
const override = env && typeof env.DSH_SANSHENG_WORKBENCH_FILE === 'string'
|
||||
? env.DSH_SANSHENG_WORKBENCH_FILE.trim()
|
||||
: ''
|
||||
if (override !== '') return resolve(override)
|
||||
return join(resolveSidecarDir(env), 'workbench.json')
|
||||
if (override !== '') return isWindowsAbsolute(override) ? win32.normalize(override) : resolve(override)
|
||||
return joinUnder(resolveSidecarDir(env), 'workbench.json')
|
||||
}
|
||||
|
||||
/** 派生路径:同一侧车目录下按用途分开,便于用户自己备份或清理而不碰账本。 */
|
||||
export function resolveSidecarFile(name, env = process.env) {
|
||||
if (typeof name !== 'string' || name.trim() === '') throw new Error('name 必须是非空字符串')
|
||||
if (name.includes('/') || name.includes('\\')) throw new Error('name 只能是一级文件名,不能带目录分隔符')
|
||||
return join(resolveSidecarDir(env), name)
|
||||
return joinUnder(resolveSidecarDir(env), name)
|
||||
}
|
||||
|
||||
/** 目录级入口:所有写入前都先建目录,缺目录不该表现为“保存失败”。 */
|
||||
|
|
|
|||
Loading…
Reference in New Issue