@lvce-editor/main-area-worker 9.54.1 → 9.54.3

package/dist/mainAreaWorkerMain.js

@@ -158,55 +158,6 @@ const getTransferrables = value => {
   walkValue(value, transferrables, isTransferrable);
   return transferrables;
 };
-const removeValues = (value, toRemove) => {
-  if (!value) {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    const newItems = [];
-    for (const item of value) {
-      if (!toRemove.includes(item)) {
-        newItems.push(removeValues(item, toRemove));
-      }
-    }
-    return newItems;
-  }
-  if (typeof value === 'object') {
-    const newObject = Object.create(null);
-    for (const [key, property] of Object.entries(value)) {
-      if (!toRemove.includes(property)) {
-        newObject[key] = removeValues(property, toRemove);
-      }
-    }
-    return newObject;
-  }
-  return value;
-};
-
-// workaround for electron not supporting transferrable objects
-// as parameters. If the transferrable object is a parameter, in electron
-// only an empty objected is received in the main process
-const fixElectronParameters = value => {
-  const transfer = getTransferrables(value);
-  const newValue = removeValues(value, transfer);
-  return {
-    newValue,
-    transfer
-  };
-};
-const getActualDataElectron = event => {
-  const {
-    data,
-    ports
-  } = event;
-  if (ports.length === 0) {
-    return data;
-  }
-  return {
-    ...data,
-    params: [...ports, ...data.params]
-  };
-};
 const attachEvents = that => {
   const handleMessage = (...args) => {
     const data = that.getData(...args);
@@ -373,48 +324,6 @@ class IpcError extends VError {
     this.stderr = stderr;
   }
 }
-const listen$b = ({
-  messagePort
-}) => {
-  if (!isMessagePortMain(messagePort)) {
-    throw new IpcError('port must be of type MessagePortMain');
-  }
-  return messagePort;
-};
-const signal$c = messagePort => {
-  messagePort.start();
-};
-class IpcChildWithElectronMessagePort extends Ipc {
-  getData = getActualDataElectron;
-  send(message) {
-    this._rawIpc.postMessage(message);
-  }
-  sendAndTransfer(message) {
-    const {
-      newValue,
-      transfer
-    } = fixElectronParameters(message);
-    this._rawIpc.postMessage(newValue, transfer);
-  }
-  dispose() {
-    this._rawIpc.close();
-  }
-  onMessage(callback) {
-    this._rawIpc.on('message', callback);
-  }
-  onClose(callback) {
-    this._rawIpc.on('close', callback);
-  }
-}
-const wrap$j = messagePort => {
-  return new IpcChildWithElectronMessagePort(messagePort);
-};
-const IpcChildWithElectronMessagePort$1 = {
-  __proto__: null,
-  listen: listen$b,
-  signal: signal$c,
-  wrap: wrap$j
-};
 const readyMessage = 'ready';
 const getData$2 = event => {
   return event.data;
@@ -832,7 +741,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$f = (message, result) => {
+const create$c = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -841,7 +750,7 @@ const create$f = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$f(message, resultProperty);
+  return create$c(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -935,7 +844,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$e = (method, params) => {
+const create$b = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -943,7 +852,7 @@ const create$e = (method, params) => {
   };
 };
 
-const create$d = (id, method, params) => {
+const create$a = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -954,12 +863,12 @@ const create$d = (id, method, params) => {
 };
 
 let id = 0;
-const create$c = () => {
+const create$9 = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$c();
+  const id = create$9();
   const {
     promise,
     resolve
@@ -976,7 +885,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$d(id, method, params);
+  const message = create$a(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -1012,7 +921,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$e(method, params);
+      const message = create$b(method, params);
       ipc.send(message);
     }
   };
@@ -1052,24 +961,6 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-const create$b = async ({
-  commandMap,
-  messagePort,
-  requiresSocket
-}) => {
-  // TODO create a commandMap per rpc instance
-  register(commandMap);
-  const ipc = await listen$1(IpcChildWithElectronMessagePort$1, {
-    messagePort
-  });
-  if (requiresSocket) {
-    ipc.requiresSocket = requiresSocket;
-  }
-  handleIpc(ipc);
-  const rpc = createRpc(ipc);
-  return rpc;
-};
-
 const createSharedLazyRpc = factory => {
   let rpcPromise;
   const getOrCreate = () => {
@@ -1098,37 +989,6 @@ const createSharedLazyRpc = factory => {
   };
 };
 
-const create$a = async ({
-  commandMap,
-  getPortTuple,
-  send
-}) => {
-  const {
-    port1,
-    port2
-  } = await getPortTuple();
-  await send(port1);
-  const rpc = create$b({
-    commandMap,
-    messagePort: port2
-  });
-  return rpc;
-};
-
-const create$9 = async ({
-  commandMap,
-  getPortTuple,
-  send
-}) => {
-  return createSharedLazyRpc(() => {
-    return create$a({
-      commandMap,
-      getPortTuple,
-      send
-    });
-  });
-};
-
 const create$8 = async ({
   commandMap,
   isMessagePortOpen = true,
@@ -4107,8 +3967,6 @@ const getIconsCached = (dirents, fileIconCache) => {
   return dirents.map(dirent => fileIconCache[dirent]);
 };
 
-const ExtensionDetailScheme$1 = 'extension-detail://';
-const RunningExtensionsScheme$1 = 'running-extensions://';
 const getBasename = uri => {
   const lastSlashIndex = uri.lastIndexOf('/');
   if (lastSlashIndex === -1) {
@@ -4119,7 +3977,7 @@ const getBasename = uri => {
 const getMissingTabs = (tabs, fileIconCache) => {
   const missingTabs = [];
   for (const tab of tabs) {
-    if (tab.uri && !tab.uri.startsWith(ExtensionDetailScheme$1) && !tab.uri.startsWith(RunningExtensionsScheme$1) && !(tab.uri in fileIconCache)) {
+    if (tab.uri && !getFileIcon(tab.uri) && !(tab.uri in fileIconCache)) {
       missingTabs.push(tab);
     }
   }
@@ -5609,40 +5467,53 @@ const getAllTabs$1 = layout => {
   return allTabs;
 };
 
+const updateLayoutIcons = (layout, fileIconCache, preserveExisting) => {
+  const {
+    groups
+  } = layout;
+  return {
+    ...layout,
+    groups: groups.map(group => ({
+      ...group,
+      tabs: group.tabs.map(tab => {
+        const {
+          icon: existingIcon
+        } = tab;
+        const uri = tab.uri || '';
+        const builtInIcon = getFileIcon(uri);
+        let icon = fileIconCache[uri];
+        if (preserveExisting && !(uri in fileIconCache)) {
+          icon = existingIcon;
+        }
+        if (builtInIcon) {
+          icon = builtInIcon;
+        }
+        return {
+          ...tab,
+          icon
+        };
+      })
+    }))
+  };
+};
 const loadFileIcons = async state => {
   const {
     fileIconCache,
     layout
   } = state;
-  const {
-    groups
-  } = layout;
   try {
     const allTabs = getAllTabs$1(layout);
     const {
       newFileIconCache
     } = await getFileIconsForTabs(allTabs, fileIconCache);
-
-    // Update tabs with their icons
-    const updatedLayout = {
-      ...layout,
-      groups: groups.map(group => ({
-        ...group,
-        tabs: group.tabs.map(tab => ({
-          ...tab,
-          icon: newFileIconCache[tab.uri || '']
-        }))
-      }))
-    };
     return {
       fileIconCache: newFileIconCache,
-      updatedLayout
+      updatedLayout: updateLayoutIcons(layout, newFileIconCache, false)
     };
   } catch {
-    // If icon request fails, continue without icons
     return {
       fileIconCache,
-      updatedLayout: layout
+      updatedLayout: updateLayoutIcons(layout, fileIconCache, true)
     };
   }
 };
@@ -8817,7 +8688,7 @@ const sendMessagePortToClipBoardWorker = async port => {
 };
 
 const initializeClipBoardWorker = async () => {
-  const rpc = await create$9({
+  const rpc = await create$6({
     commandMap: {},
     send: sendMessagePortToClipBoardWorker
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "9.54.1",
+  "version": "9.54.3",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",