@@ -18,7 +18,7 @@ const crypto = require('crypto')
1818const fs = require ( 'fs' )
1919const path = require ( 'path' )
2020const { execFileSync } = require ( 'child_process' )
21- const { assertSingleSegment, resolveInside, resolveExistingRegularFileInside } = require ( './path-guard' )
21+ const { assertSingleSegment, resolveInside, resolveExistingRegularFileInside, resolveWritePathInside } = require ( './path-guard' )
2222const { createJsonLineServer } = require ( './stdio-jsonrpc.cjs' )
2323const {
2424 PROFILE_BASE_FILES ,
@@ -752,7 +752,7 @@ function resolveProfileFile(name, projectName, options = {}) {
752752 if ( ! LAYOUT . enabled ) {
753753 const sourceSnapshots = [ ]
754754 for ( const dir of getLegacyProfileDirs ( projectName ) ) {
755- const fullPath = resolveInside ( dir , safeName )
755+ const fullPath = resolveWritePathInside ( dir , safeName )
756756 const document = readProfileTextDocument ( fullPath , options )
757757 sourceSnapshots . push ( profileSourceSnapshot ( fullPath , document ) )
758758 if ( document . exists ) {
@@ -774,8 +774,8 @@ function resolveProfileFile(name, projectName, options = {}) {
774774
775775 const projectDir = getProjectNamespaceProfileDir ( projectName )
776776 const workspaceDir = getWorkspaceProfileDir ( )
777- const projectPath = projectDir ? resolveInside ( projectDir , safeName ) : null
778- const workspacePath = resolveInside ( workspaceDir , safeName )
777+ const projectPath = projectDir ? resolveWritePathInside ( projectDir , safeName ) : null
778+ const workspacePath = resolveWritePathInside ( workspaceDir , safeName )
779779 const sourceSnapshots = [ ]
780780
781781 if ( projectPath ) {
@@ -845,7 +845,7 @@ function resolveProfileSectionFile(name, projectName, options = {}) {
845845
846846 if ( ! LAYOUT . enabled ) {
847847 for ( const dir of getLegacyProfileDirs ( projectName ) ) {
848- const fullPath = resolveInside ( dir , safeName )
848+ const fullPath = resolveWritePathInside ( dir , safeName )
849849 const selected = selectAt ( fullPath , getLegacySourceLabel ( dir , projectName ) )
850850 if ( selected ) return selected
851851 }
@@ -856,11 +856,11 @@ function resolveProfileSectionFile(name, projectName, options = {}) {
856856
857857 const projectDir = getProjectNamespaceProfileDir ( projectName )
858858 if ( projectDir ) {
859- const projectPath = resolveInside ( projectDir , safeName )
859+ const projectPath = resolveWritePathInside ( projectDir , safeName )
860860 const selected = selectAt ( projectPath , `项目命名空间(${ resolveProjectName ( projectName ) } )` )
861861 if ( selected ) return selected
862862 }
863- const workspacePath = resolveInside ( getWorkspaceProfileDir ( ) , safeName )
863+ const workspacePath = resolveWritePathInside ( getWorkspaceProfileDir ( ) , safeName )
864864 const selected = selectAt ( workspacePath , '工作区基座(workspace)' )
865865 return selected || ( options . captureMissingSnapshots === true
866866 ? { exists : false , content : null , fullPath : null , sourceLabel : '未命中' , sourcePaths : [ ] , sourceSnapshots, sourceBytesRead : 0 }
@@ -893,7 +893,7 @@ function resolveConfigFile(projectName, options = {}) {
893893 if ( ! LAYOUT . enabled ) {
894894 const sourceSnapshots = [ ]
895895 for ( const dir of getLegacyProfileDirs ( projectName ) ) {
896- const fullPath = path . join ( dir , 'config.json' )
896+ const fullPath = resolveWritePathInside ( dir , 'config.json' )
897897 const loaded = loadConfig ( fullPath )
898898 if ( loaded ?. sourceSnapshot ) sourceSnapshots . push ( loaded . sourceSnapshot )
899899 if ( loaded ?. config !== null && loaded ?. config !== undefined ) {
@@ -927,8 +927,8 @@ function resolveConfigFile(projectName, options = {}) {
927927
928928 const workspaceDir = getWorkspaceProfileDir ( )
929929 const projectDir = getProjectNamespaceProfileDir ( projectName )
930- const workspacePath = path . join ( workspaceDir , 'config.json' )
931- const projectPath = projectDir ? path . join ( projectDir , 'config.json' ) : null
930+ const workspacePath = resolveWritePathInside ( workspaceDir , 'config.json' )
931+ const projectPath = projectDir ? resolveWritePathInside ( projectDir , 'config.json' ) : null
932932 const workspaceLoaded = loadConfig ( workspacePath )
933933 const projectLoaded = projectPath ? loadConfig ( projectPath ) : null
934934 const workspaceConfig = workspaceLoaded ?. config || null
0 commit comments