normalize paths in printed config

maddsua · Sep 12, 2024 · 8dea614 · 8dea614
1 parent 0b2e21d
commit 8dea614
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/cli/assets.ts b/cli/assets.ts
@@ -1,6 +1,7 @@
 import { readdirSync, existsSync, mkdirSync, createReadStream, statSync } from 'fs';
 import { createHash } from 'crypto';
 import { join, basename, resolve, extname, dirname } from 'path';
+import { normalizePath } from './utils';
 
 export interface AssetFile {
 	slug: string;
@@ -42,10 +43,7 @@ export const findAssets = async (assetDir: string, cacheDir: string): Promise<As
 
 	return entries.map(item => {
 
-		const slug = resolve(item)
-			.slice(assetDirResolved.length)
-			.replace(/[\\\/]+/g, '/');
-
+		const slug = normalizePath(resolve(item).slice(assetDirResolved.length));
 		const ext = extname(slug);
 
 		return {

diff --git a/cli/main.ts b/cli/main.ts
@@ -15,6 +15,7 @@ import { outputOptions, imageFormats } from './formats';
 import { existsSync, rmSync } from 'fs';
 import { clearUnusedCache, copyStaticAssets, transformImageAssets, type InvocationStats } from './operations';
 import type { RuntimeConfig } from "./config";
+import { normalizePath } from "./utils";
 
 const main = async () => {
 
@@ -164,8 +165,8 @@ const printCliConfig = (config: RuntimeConfig) => {
 
 	const entries: [string, string][] = [
 		['Cache', config.noCache ? 'disabled' : 'enabled'],
-		['Load from', `"${config.inputDir}"`],
-		['Save to', `"${config.outputDir}"`],
+		['Load from', `"${normalizePath(config.inputDir)}"`],
+		['Save to', `"${normalizePath(config.outputDir)}"`],
 		['Output formats', Object.keys(config.outputFormats).join(',')],
 	];
 

diff --git a/cli/utils.ts b/cli/utils.ts
@@ -13,3 +13,5 @@ export const splitChunks = <T>(items: T[], size: number): T[][] => {
 
 	return result;
 };
+
+export const normalizePath = (path: string): string => path.replace(/[\\\/]+/g, '/');
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,5 @@ export const splitChunks = <T>(items: T[], size: number): T[][] => {

		return result;
		};

		export const normalizePath = (path: string): string => path.replace(/[\\\/]+/g, '/');