@lvce-editor/main-area-worker 7.2.0 → 7.4.0

package/dist/mainAreaWorkerMain.js

@@ -105,6 +105,7 @@ const Tab = 13;
 const Separator = 1;
 const None = 0;
 
+const ClipBoardWorker = 3400;
 const ExtensionHostWorker = 44;
 const IconThemeWorker = 7009;
 const RendererWorker = 1;
@@ -273,6 +274,55 @@ 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);
@@ -432,6 +482,48 @@ 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;
@@ -1083,6 +1175,23 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+const create$q = 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;
+};
 
 /* eslint-disable @typescript-eslint/no-misused-promises */
 
@@ -1113,6 +1222,39 @@ const createSharedLazyRpc = factory => {
     }
   };
 };
+const create$l = async ({
+  commandMap,
+  getPortTuple,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = await getPortTuple();
+  await send(port1);
+  const rpc = create$q({
+    commandMap,
+    messagePort: port2
+  });
+  return rpc;
+};
+const create$k = async ({
+  commandMap,
+  getPortTuple,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$l({
+      commandMap,
+      getPortTuple,
+      send
+    });
+  });
+};
+const LazyTransferElectronMessagePortRpc = {
+  __proto__: null,
+  create: create$k
+};
 const create$j = async ({
   commandMap,
   isMessagePortOpen,
@@ -1202,7 +1344,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$4 = (id, rpc) => {
+const set$5 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1235,7 +1377,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$4(rpcId, mockRpc);
+      set$5(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1244,11 +1386,15 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$4(rpcId, rpc);
+      set$5(rpcId, rpc);
     }
   };
 };
 
+const {
+  set: set$4
+} = create$2(ClipBoardWorker);
+
 const {
   set: set$3
 } = create$2(ExtensionHostWorker);
@@ -1274,6 +1420,10 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
+const sendMessagePortToClipBoardWorker$1 = async (port, rpcId) => {
+  const command = 'ClipBoard.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToClipBoardWorker', port, command, rpcId);
+};
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
@@ -2811,7 +2961,19 @@ const tryRestoreLayout = savedState => {
   if (!isValidMainAreaLayout(layout)) {
     return undefined;
   }
-  return layout;
+
+  // Normalize all tabs to have editorUid: -1 so SelectTab will create viewlets
+  const normalizedLayout = {
+    ...layout,
+    groups: layout.groups.map(group => ({
+      ...group,
+      tabs: group.tabs.map(tab => ({
+        ...tab,
+        editorUid: -1
+      }))
+    }))
+  };
+  return normalizedLayout;
 };
 
 const createViewlets = async (layout, viewletModuleIds, bounds) => {
@@ -4139,6 +4301,19 @@ const commandMap = {
   'MainArea.terminate': terminate
 };
 
+const sendMessagePortToClipBoardWorker = async port => {
+  // @ts-ignore
+  await sendMessagePortToClipBoardWorker$1(port, 0);
+};
+
+const initializeClipBoardWorker = async () => {
+  const rpc = await LazyTransferElectronMessagePortRpc.create({
+    commandMap: {},
+    send: sendMessagePortToClipBoardWorker
+  });
+  set$4(rpc);
+};
+
 const send = port => {
   return sendMessagePortToIconThemeWorker(port, 0);
 };
@@ -4168,7 +4343,7 @@ const initializeRendererWorker = async () => {
 
 const listen = async () => {
   registerCommands(commandMap);
-  await Promise.all([initializeRendererWorker(), initializeIconThemeWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeIconThemeWorker(), initializeClipBoardWorker()]);
 };
 
 const main$2 = async () => {

package/package.json

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