@lvce-editor/quick-pick-worker 4.33.0 → 4.33.1

package/dist/quickPickWorkerMain.js

@@ -3549,20 +3549,23 @@ const getWorkspaceDisplayPath = workspace => {
     };
   }
   const url = new URL(workspace);
+  const uriPrefix = url.search || url.hash || !url.pathname.startsWith('/') ? undefined : `${url.protocol}//${url.host}${trimTrailingSeparators(url.pathname)}/`;
   return {
     host: url.host,
     path: decodeURIComponent(url.pathname),
-    scheme: url.protocol
+    scheme: url.protocol,
+    uriPrefix,
+    url
   };
 };
-const getRelativeDirectory = (workspace, uri, dirName) => {
-  const workspacePath = getWorkspaceDisplayPath(workspace);
-  if (hasUriScheme(uri)) {
+const isSafeRelativePath = path => /^[a-z\d._~/-]+$/i.test(path) && path.split('/').every(segment => segment !== '.' && segment !== '..');
+const getRelativeDirectory = (workspacePath, uri, dirName, isWorkspaceRelative) => {
+  if (!isWorkspaceRelative && hasUriScheme(uri)) {
     const url = new URL(uri);
     if (workspacePath.scheme !== url.protocol || workspacePath.host !== url.host) {
       return dirName;
     }
-  } else if (workspacePath.scheme) {
+  } else if (!isWorkspaceRelative && workspacePath.scheme) {
     return dirName;
   }
   const normalizedWorkspace = trimTrailingSeparators(workspacePath.path);
@@ -3576,15 +3579,18 @@ const getRelativeDirectory = (workspace, uri, dirName) => {
   }
   return normalizedDirectory.slice(prefix.length);
 };
-const resolveFileUri = (workspace, path) => {
+const resolveFileUri = (workspace, path, workspacePath) => {
   if (hasUriScheme(path)) {
     return path;
   }
-  if (hasUriScheme(workspace)) {
-    const workspaceUrl = new URL(workspace);
+  if (workspacePath.url) {
+    if (workspacePath.uriPrefix && !isAbsolutePath(path) && isSafeRelativePath(path)) {
+      return `${workspacePath.uriPrefix}${path}`;
+    }
+    const workspaceUrl = new URL(workspacePath.url);
     const normalizedPath = path.replaceAll('\\', '/').replaceAll('%', '%25');
-    const workspacePath = trimTrailingSeparators(workspaceUrl.pathname);
-    workspaceUrl.pathname = normalizedPath.startsWith('/') ? normalizedPath : `${workspacePath}/${normalizedPath}`;
+    const workspaceUrlPath = trimTrailingSeparators(workspaceUrl.pathname);
+    workspaceUrl.pathname = normalizedPath.startsWith('/') ? normalizedPath : `${workspaceUrlPath}/${normalizedPath}`;
     return workspaceUrl.href;
   }
   if (isAbsolutePath(path)) {
@@ -3592,11 +3598,17 @@ const resolveFileUri = (workspace, path) => {
   }
   return `${trimTrailingSeparators(workspace)}/${path}`;
 };
-const convertToPick = (workspace, uri) => {
-  const displayPath = hasUriScheme(uri) ? decodeURIComponent(new URL(uri).pathname) : uri.replaceAll('\\', '/');
+const convertToPick = (workspacePath, uri, path) => {
+  const isWorkspaceRelative = Boolean(workspacePath.uriPrefix && !isAbsolutePath(path) && !hasUriScheme(path) && isSafeRelativePath(path));
+  let displayPath = uri.replaceAll('\\', '/');
+  if (isWorkspaceRelative) {
+    displayPath = `${trimTrailingSeparators(workspacePath.path)}/${path}`;
+  } else if (hasUriScheme(uri)) {
+    displayPath = decodeURIComponent(new URL(uri).pathname);
+  }
   const baseName = pathBaseName(displayPath);
   const dirName = pathDirName(displayPath);
-  const description = getRelativeDirectory(workspace, uri, dirName);
+  const description = getRelativeDirectory(workspacePath, uri, dirName, isWorkspaceRelative);
   return {
     description,
     direntType: File,
@@ -3647,7 +3659,11 @@ const getPicks$b = async searchValue => {
       });
     }
   }
-  const picks = files.map(path => convertToPick(workspace, resolveFileUri(workspace, path)));
+  if (files.length === 0) {
+    return [];
+  }
+  const workspacePath = getWorkspaceDisplayPath(workspace);
+  const picks = files.map(path => convertToPick(workspacePath, resolveFileUri(workspace, path, workspacePath), path));
   return picks;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/quick-pick-worker",
-  "version": "4.33.0",
+  "version": "4.33.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/quick-pick-worker.git"