@lvce-editor/explorer-view 2.48.0 → 2.50.0

package/dist/explorerViewWorkerMain.js

@@ -431,7 +431,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$3 = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -450,7 +450,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$3(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -664,18 +664,18 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (message, error) => {
+const create$1$1 = (id, error) => {
   return {
     jsonrpc: Two,
-    id: message.id,
+    id,
     error
   };
 };
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
+const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(message, errorProperty);
+  return create$1$1(id, errorProperty);
 };
 const create$5 = (message, result) => {
   return {
@@ -688,12 +688,27 @@ const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
   return create$5(message, resultProperty);
 };
+const getErrorResponseSimple = (id, error) => {
+  return {
+    jsonrpc: Two,
+    id,
+    error: {
+      code: Custom,
+      // @ts-ignore
+      message: error.message,
+      data: error
+    }
+  };
+};
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
     const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
     return getSuccessResponse(message, result);
   } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
+    if (ipc.canUseSimpleErrorResponse) {
+      return getErrorResponseSimple(message.id, error);
+    }
+    return getErrorResponse(message.id, error, preparePrettyError, logError);
   }
 };
 const defaultPreparePrettyError = error => {
@@ -748,7 +763,7 @@ const handleJsonRpcMessage = async (...args) => {
       try {
         ipc.send(response);
       } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
         ipc.send(errorResponse);
       }
       return;
@@ -779,7 +794,7 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$3 = (ipc, method, ...params) => {
+const invoke$2 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -812,7 +827,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$3(ipc, method, ...params);
+      return invoke$2(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -868,13 +883,13 @@ const WebWorkerRpcClient = {
   create: create$3
 };
 
-const CreateFolder$1 = 'createFolder'; // TODO use number
-const CreateFile$1 = 'createFile'; // TODO use number
-const Copy$2 = 'copy'; // TODO use number
-const Rename$2 = 'rename'; // TODO use number
+const CreateFolder$1 = 1;
+const CreateFile$1 = 2;
+const Copy$2 = 3;
+const Rename$2 = 4;
 
 const rpcs = Object.create(null);
-const set$b = (id, rpc) => {
+const set$d = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -898,19 +913,19 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$b(rpcId, rpc);
+      set$d(rpcId, rpc);
     }
   };
 };
 const RendererWorker$1 = 1;
 const {
-  invoke: invoke$2,
-  set: set$2
+  invoke: invoke$3,
+  set: set$3
 } = create$2(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$2,
-  set: set$2
+  invoke: invoke$3,
+  set: set$3
 };
 
 const {
@@ -993,7 +1008,7 @@ const getBaseName = (pathSeparator, path) => {
   return path.slice(path.lastIndexOf(pathSeparator) + 1);
 };
 const join2 = (path, childPath) => {
-  if (path.endsWith('/')) {
+  if (path.endsWith('/') || childPath.startsWith('/')) {
     return `${path}${childPath}`;
   }
   return `${path}/${childPath}`;
@@ -1077,16 +1092,17 @@ const EditingFile = File + DELTA_EDITING;
 const EditingFolder = Directory + DELTA_EDITING;
 const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
 
-const getSimpleType = direntType => {
+const getSimpleIconRequestType = direntType => {
   if (direntType === Directory || direntType === DirectoryExpanded || direntType === EditingDirectoryExpanded || direntType === EditingFolder) {
     return 2;
   }
   return 1;
 };
+
 const toSimpleIconRequest = request => {
   return {
     name: request.name,
-    type: getSimpleType(request.type)
+    type: getSimpleIconRequestType(request.type)
   };
 };
 
@@ -1132,10 +1148,10 @@ const getFileOperationsNestedPath = (path, root, pathSeparator) => {
   let currentPath = '';
   for (const part of parts) {
     if (!part) continue;
-    currentPath = currentPath ? `${currentPath}${pathSeparator}${part}` : part;
+    currentPath = join2(currentPath, part);
     operations.push({
       type: CreateFolder$1,
-      path: `${root}${currentPath}`
+      path: join2(root, currentPath)
     });
   }
   return operations;
@@ -1251,6 +1267,15 @@ const resolveSymbolicLinks = async (uri, rawDirents) => {
   return resolvedDirents;
 };
 
+const getChildDirentsRaw = async uri => {
+  const rawDirents = await readDirWithFileTypes(uri);
+  array(rawDirents);
+  if (hasSymbolicLinks(rawDirents)) {
+    return resolveSymbolicLinks(uri, rawDirents);
+  }
+  return rawDirents;
+};
+
 const RE_CHARACTERS = /^[a-zA-Z.-]+$/;
 const compareStringNumeric = (a, b) => {
   if (RE_CHARACTERS.test(a) && RE_CHARACTERS.test(b)) {
@@ -1316,14 +1341,6 @@ const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDir
   return result;
 };
 
-const getChildDirentsRaw = async uri => {
-  const rawDirents = await readDirWithFileTypes(uri);
-  array(rawDirents);
-  if (hasSymbolicLinks(rawDirents)) {
-    return resolveSymbolicLinks(uri, rawDirents);
-  }
-  return rawDirents;
-};
 const getChildDirents = async (pathSeparator, parentDirentPath, parentDirentDepth, excluded = []) => {
   string(pathSeparator);
   // TODO use event/actor based code instead, this is impossible to cancel right now
@@ -1391,7 +1408,7 @@ const treeToArrayInternal = (map, root, items, path, depth) => {
   for (let i = 0; i < count; i++) {
     const child = children[i];
     const childPath = join2(path, child.name);
-    const absolutePath = `${root}${childPath}`;
+    const absolutePath = join2(root, childPath);
     items.push({
       depth,
       posInSet: i + 1,
@@ -3374,7 +3391,7 @@ const getFileOperationsElectron = async (root, paths, fileHandles) => {
     } = fileHandle;
     const path = paths[i];
     operations.push({
-      type: 'copy',
+      type: Copy$2,
       path: join2(root, name),
       from: path
     });
@@ -3640,7 +3657,6 @@ const handleKeyDown = (state, key) => {
   }
 
   // @ts-ignore
-  // eslint-disable-next-line  @typescript-eslint/no-misused-promises
   timeout = setTimeout(async () => {
     await invoke$1('Explorer.cancelTypeAhead');
   }, focusWordTimeout);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "2.48.0",
+  "version": "2.50.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",