wsl-utils 0.3.0 → 0.3.1

package/index.js

@@ -3,6 +3,7 @@ import childProcess from 'node:child_process';
 import fs, {constants as fsConstants} from 'node:fs/promises';
 import isWsl from 'is-wsl';
 import {powerShellPath as windowsPowerShellPath, executePowerShell} from 'powershell-utils';
+import {parseMountPointFromConfig} from './utilities.js';
 
 const execFile = promisify(childProcess.execFile);
 
@@ -32,13 +33,13 @@ export const wslDrivesMountPoint = (() => {
 		}
 
 		const configContent = await fs.readFile(configFilePath, {encoding: 'utf8'});
-		const configMountPoint = /(?<!#.*)root\s*=\s*(?<mountPoint>.*)/g.exec(configContent);
+		const parsedMountPoint = parseMountPointFromConfig(configContent);
 
-		if (!configMountPoint) {
+		if (parsedMountPoint === undefined) {
 			return defaultMountPoint;
 		}
 
-		mountPoint = configMountPoint.groups.mountPoint.trim();
+		mountPoint = parsedMountPoint;
 		mountPoint = mountPoint.endsWith('/') ? mountPoint : `${mountPoint}/`;
 
 		return mountPoint;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wsl-utils",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"description": "Utilities for working with Windows Subsystem for Linux (WSL)",
 	"license": "MIT",
 	"repository": "sindresorhus/wsl-utils",
@@ -24,7 +24,8 @@
 	},
 	"files": [
 		"index.js",
-		"index.d.ts"
+		"index.d.ts",
+		"utilities.js"
 	],
 	"keywords": [
 		"wsl",

package/utilities.js

@@ -0,0 +1,19 @@
+export function parseMountPointFromConfig(content) {
+	for (const line of content.split('\n')) {
+		// Skip comment lines
+		if (/^\s*#/.test(line)) {
+			continue;
+		}
+
+		// Match root at start of line (after optional whitespace)
+		const match = /^\s*root\s*=\s*(?<mountPoint>"[^"]*"|'[^']*'|[^#]*)/.exec(line);
+		if (!match) {
+			continue;
+		}
+
+		return match.groups.mountPoint
+			.trim()
+			// Strip surrounding quotes
+			.replaceAll(/^["']|["']$/g, '');
+	}
+}