@lvce-editor/main-area-worker 9.34.2 → 9.35.1

package/dist/mainAreaWorkerMain.js

@@ -957,9 +957,9 @@ const create$d = (id, method, params) => {
   return message;
 };
 
-let id$1 = 0;
+let id = 0;
 const create$c = () => {
-  return ++id$1;
+  return ++id;
 };
 
 const registerPromise = map => {
@@ -1214,7 +1214,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$6 = (id, rpc) => {
+const set$5 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1247,7 +1247,7 @@ const create$4 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$6(rpcId, mockRpc);
+      set$5(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1256,7 +1256,7 @@ const create$4 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$6(rpcId, rpc);
+      set$5(rpcId, rpc);
     }
   };
 };
@@ -1456,7 +1456,6 @@ const Electron = 2;
 
 const ClipBoardWorker = 3400;
 const DialogWorker = 7014;
-const ExtensionHostWorker = 44;
 const IconThemeWorker = 7009;
 const RendererWorker = 1;
 
@@ -1467,17 +1466,13 @@ const SetPatches = 'Viewlet.setPatches';
 const FocusEditorText = 12;
 
 const {
-  set: set$5
+  set: set$4
 } = create$4(ClipBoardWorker);
 
 const {
   invoke: invoke$2,
-  set: set$4
-} = create$4(DialogWorker);
-
-const {
   set: set$3
-} = create$4(ExtensionHostWorker);
+} = create$4(DialogWorker);
 
 const {
   invoke: invoke$1,
@@ -1577,10 +1572,6 @@ const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
 const readFile = async uri => {
   return invoke('FileSystem.readFile', uri);
 };
-const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
-  const command = 'HandleMessagePort.handleMessagePort2';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
-};
 const confirm$1 = async (message, options) => {
   const result = await invoke('ConfirmPrompt.prompt', message, options);
   return result;
@@ -4817,32 +4808,40 @@ const handleDragOver = (state, eventX, eventY) => {
   };
 };
 
-const lineSeparatorRegex = /\r?\n/;
 const chromiumDragIdRegex = /^[A-F\d]{32}$/i;
-const isUriList = item => {
+const isChromiumDragId = item => {
   if (!item || typeof item !== 'object') {
     return false;
   }
   const candidate = item;
-  return candidate.kind === 'string' && candidate.type === 'text/uri-list' && typeof candidate.value === 'string';
-};
-const parseUriList = value => {
-  return value.split(lineSeparatorRegex).map(uri => uri.trim()).filter(uri => uri && !uri.startsWith('#'));
+  return candidate.kind === 'string' && (candidate.type === '' || candidate.type === 'chromium/x-drag-id') && typeof candidate.value === 'string' && chromiumDragIdRegex.test(candidate.value);
 };
-const isChromiumDragId = item => {
+
+const isDroppedFileSystemHandle = item => {
   if (!item || typeof item !== 'object') {
     return false;
   }
   const candidate = item;
-  return candidate.kind === 'string' && (candidate.type === '' || candidate.type === 'chromium/x-drag-id') && typeof candidate.value === 'string' && chromiumDragIdRegex.test(candidate.value);
+  const handle = candidate.value;
+  return candidate.kind === 'file' && Boolean(handle) && typeof handle === 'object' && (handle.kind === 'directory' || handle.kind === 'file') && typeof handle.name === 'string';
 };
-const isDroppedFile = item => {
+
+const isUriList = item => {
   if (!item || typeof item !== 'object') {
     return false;
   }
   const candidate = item;
-  const handle = candidate.value;
-  return candidate.kind === 'file' && Boolean(handle) && typeof handle === 'object' && handle.kind === 'file' && typeof handle.name === 'string';
+  return candidate.kind === 'string' && candidate.type === 'text/uri-list' && typeof candidate.value === 'string';
+};
+
+const lineSeparatorRegex = /\r?\n/;
+const parseUriList = value => {
+  return value.split(lineSeparatorRegex).map(uri => uri.trim()).filter(uri => uri && !uri.startsWith('#'));
+};
+
+const suffixByHandleKind = {
+  directory: '/',
+  file: ''
 };
 const getDroppedUris = async itemIds => {
   if (itemIds.length === 0) {
@@ -4851,7 +4850,7 @@ const getDroppedUris = async itemIds => {
   const items = await getFileHandles(itemIds);
   let hasChromiumDragId = false;
   const uris = [];
-  for (const item of items) {
+  for (const [index, item] of items.entries()) {
     if (isUriList(item)) {
       uris.push(...parseUriList(item.value));
       continue;
@@ -4860,11 +4859,12 @@ const getDroppedUris = async itemIds => {
       hasChromiumDragId = true;
       continue;
     }
-    if (!isDroppedFile(item)) {
+    if (!isDroppedFileSystemHandle(item)) {
       continue;
     }
     const handle = item.value;
-    const uri = `html:///dropped-files/${handle.name}`;
+    const suffix = suffixByHandleKind[handle.kind];
+    const uri = `html:///dropped-files/${Date.now()}/${itemIds[index]}/${handle.name}${suffix}`;
     await invoke('PersistentFileHandle.addHandle', uri, handle);
     uris.push(uri);
   }
@@ -4873,7 +4873,7 @@ const getDroppedUris = async itemIds => {
   }
   const dragInfo = await invoke('Viewlet.getDragData');
   if (!dragInfo || typeof dragInfo !== 'object' || !Array.isArray(dragInfo.items)) {
-    return [];
+    return uris;
   }
   for (const item of dragInfo.items) {
     const candidate = item;
@@ -4893,6 +4893,16 @@ const openUrisWithContext = async (context, uris) => {
 const handleDrop = async (context, itemIds) => {
   await context.updateState(handleDragLeave);
   const uris = await getDroppedUris(itemIds);
+  for (const uri of uris) {
+    if (uri.endsWith('/') || (await isDirectoryEditorInput({
+      type: 'editor',
+      uri
+    }))) {
+      const command = uri.startsWith('file://') ? 'Workspace.setUri' : 'Workspace.setPath';
+      void invoke(command, uri).catch(() => {});
+      return;
+    }
+  }
   await openUrisWithContext(context, uris);
 };
 
@@ -5862,26 +5872,8 @@ const hasActiveTextEditor = state => {
   return activeTab?.tab.editorInput?.type === 'editor';
 };
 
-const id = 7201;
-const sendMessagePortToExtensionHostWorker = async port => {
-  await sendMessagePortToExtensionHostWorker$1(port, id);
-};
-
-const createExtensionHostRpc = async () => {
-  try {
-    const rpc = await create$9({
-      commandMap: {},
-      send: sendMessagePortToExtensionHostWorker
-    });
-    return rpc;
-  } catch (error) {
-    throw new VError(error, `Failed to create extension host rpc`);
-  }
-};
-
 const initialize = async () => {
-  const rpc = await createExtensionHostRpc();
-  set$3(rpc);
+  // Kept as a compatibility command for existing renderer startup code.
 };
 
 const hasTargetGroup = groupId => {
@@ -8075,7 +8067,7 @@ const initializeClipBoardWorker = async () => {
     commandMap: {},
     send: sendMessagePortToClipBoardWorker
   });
-  set$5(rpc);
+  set$4(rpc);
 };
 
 const send = port => {
@@ -8125,7 +8117,7 @@ const listen = async () => {
     commandMap: {},
     send: sendMessagePortToDialogWorker
   });
-  set$4(dialogRpc);
+  set$3(dialogRpc);
 };
 
 const main$1 = async () => {

package/package.json

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