@lvce-editor/quick-pick-worker 4.28.0 → 4.29.0

package/dist/quickPickWorkerMain.js

@@ -2834,7 +2834,7 @@ const getPicks$e = async (value, args, {
   const extensionPicks = await getExtensionPicks(assetDir, platform, applicationId);
   const allPicks = [...builtinPicks, ...extensionPicks];
   const converted = allPicks.map(toProtoVisibleItem$3);
-  return converted;
+  return value === '>' ? converted.toSorted((a, b) => a.label.localeCompare(b.label)) : converted;
 };
 
 const state$3 = {
@@ -2943,9 +2943,8 @@ const invoke$2 = (method, ...args) => {
 
 const cacheName = 'quick-pick-files-v1';
 const cacheUrl = workspace => {
-  const url = new URL('https://quick-pick-cache.invalid/cache/v1');
-  url.searchParams.set('folder', workspace);
-  return url.href;
+  const path = workspace.replaceAll('\\', '/').replace(/^\/+/, '').split('/').map(encodeURIComponent).join('/');
+  return `https://quick-pick-cache.invalid/cache/v1/file/${path}`;
 };
 const isEntry = value => {
   if (!value || typeof value !== 'object') {
@@ -2972,12 +2971,15 @@ const get = async workspace => {
 };
 const set$1 = async (workspace, entry) => {
   const expires = new Date(Date.now() + 90 * 24 * 60 * 60 * 1000).toUTCString();
+  const body = JSON.stringify(entry);
   const headers = {
     'cache-control': 'private, max-age=7776000',
+    'content-length': String(new TextEncoder().encode(body).byteLength),
+    'content-type': 'application/json',
     expires
   };
   try {
-    await invoke$2('Cache.setCacheStorageItem', cacheUrl(workspace), JSON.stringify(entry), cacheName, headers);
+    await invoke$2('Cache.setCacheStorageItem', cacheUrl(workspace), body, cacheName, headers);
   } catch {
     // Caching is optional; a storage failure must not break file search.
   }
@@ -3013,6 +3015,41 @@ const trimTrailingSeparators = path => {
   }
   return result;
 };
+const normalizePath = path => path.replaceAll('\\', '/');
+const getWorkspaceDisplayPath = workspace => {
+  if (!hasUriScheme(workspace)) {
+    return {
+      path: normalizePath(workspace)
+    };
+  }
+  const url = new URL(workspace);
+  return {
+    host: url.host,
+    path: decodeURIComponent(url.pathname),
+    scheme: url.protocol
+  };
+};
+const getRelativeDirectory = (workspace, uri, dirName) => {
+  const workspacePath = getWorkspaceDisplayPath(workspace);
+  if (hasUriScheme(uri)) {
+    const url = new URL(uri);
+    if (workspacePath.scheme !== url.protocol || workspacePath.host !== url.host) {
+      return dirName;
+    }
+  } else if (workspacePath.scheme) {
+    return dirName;
+  }
+  const normalizedWorkspace = trimTrailingSeparators(workspacePath.path);
+  const normalizedDirectory = normalizePath(dirName);
+  const prefix = normalizedWorkspace.endsWith('/') ? normalizedWorkspace : `${normalizedWorkspace}/`;
+  if (normalizedDirectory === normalizedWorkspace) {
+    return '';
+  }
+  if (!normalizedDirectory.startsWith(prefix)) {
+    return dirName;
+  }
+  return normalizedDirectory.slice(prefix.length);
+};
 const resolveFileUri = (workspace, path) => {
   if (hasUriScheme(path)) {
     return path;
@@ -3029,12 +3066,13 @@ const resolveFileUri = (workspace, path) => {
   }
   return `${trimTrailingSeparators(workspace)}/${path}`;
 };
-const convertToPick = uri => {
+const convertToPick = (workspace, uri) => {
   const displayPath = hasUriScheme(uri) ? decodeURIComponent(new URL(uri).pathname) : uri.replaceAll('\\', '/');
   const baseName = pathBaseName(displayPath);
   const dirName = pathDirName(displayPath);
+  const description = getRelativeDirectory(workspace, uri, dirName);
   return {
-    description: dirName,
+    description,
     direntType: File,
     fileIcon: '',
     icon: '',
@@ -3076,7 +3114,7 @@ const getPicks$b = async searchValue => {
       });
     }
   }
-  const picks = files.map(path => convertToPick(resolveFileUri(workspace, path)));
+  const picks = files.map(path => convertToPick(workspace, resolveFileUri(workspace, path)));
   return picks;
 };
 

package/package.json

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