From 1cffa6851a8eca9373a0c6f7c2a092f73a46bf58 Mon Sep 17 00:00:00 2001 From: Thijs Louisse Date: Tue, 14 May 2024 12:35:33 +0200 Subject: [PATCH] wip --- .../src/program/core/InputDataService.js | 4 ---- .../src/program/utils/optimised-glob.js | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages-node/providence-analytics/src/program/core/InputDataService.js b/packages-node/providence-analytics/src/program/core/InputDataService.js index 6cc6e10e3..bc949f750 100644 --- a/packages-node/providence-analytics/src/program/core/InputDataService.js +++ b/packages-node/providence-analytics/src/program/core/InputDataService.js @@ -572,10 +572,6 @@ export class InputDataService { cfg.extensions.some(ext => glob.endsWith(ext)), ); } - console.debug('cwd:', startPath); - console.debug('Found files raw:', filteredGlobRes); - - console.debug('Found files toPosix:', filteredGlobRes.map(toPosixPath)); if (!filteredGlobRes?.length) { LogService.warn(`No files found for path '${startPath}'`); diff --git a/packages-node/providence-analytics/src/program/utils/optimised-glob.js b/packages-node/providence-analytics/src/program/utils/optimised-glob.js index 289799273..553696c5e 100644 --- a/packages-node/providence-analytics/src/program/utils/optimised-glob.js +++ b/packages-node/providence-analytics/src/program/utils/optimised-glob.js @@ -232,7 +232,7 @@ export async function optimisedGlob(globOrGlobs, providedOptions = {}) { const allDirEntsRelativeToCwd = allDirentsRelativeToStartPath.map(dirent => ({ // @ts-expect-error relativeToCwdPath: toPosixPath(path.join(dirent.parentPath, dirent.name)).replace( - `${options.cwd}/`, + `${toPosixPath(options.cwd)}/`, '', ), @@ -267,10 +267,14 @@ export async function optimisedGlob(globOrGlobs, providedOptions = {}) { } if (options.absolute) { + console.debug({ 'options.cwd': options.cwd, filteredPathsBefore: filteredPaths }); filteredPaths = filteredPaths.map(f => toPosixPath(path.join(options.cwd, f))); + console.debug({ filteredPathsAfterAbso: filteredPaths }); + if (process.platform === 'win32') { const driveLetter = path.win32.resolve(options.cwd).slice(0, 1).toUpperCase(); filteredPaths = filteredPaths.map(f => `${driveLetter}:${f}`); + console.debug({ filteredPathsAfterWin32: filteredPaths }); } }