@lvce-editor/static-server 0.55.0 → 0.55.2

package/static/{9c27ccd → 77beaf6}/packages/embeds-worker/dist/embedsWorkerMain.js

@@ -472,7 +472,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$1 = id => {
@@ -491,7 +491,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$3(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -667,6 +667,17 @@ const getErrorType = prettyError => {
   }
   return undefined;
 };
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
+};
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
+  }
+  return stackString;
+};
 const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
@@ -679,7 +690,7 @@ const getErrorProperty = (error, prettyError) => {
     code: Custom,
     message: prettyError.message,
     data: {
-      stack: prettyError.stack,
+      stack: getStack(prettyError),
       codeFrame: prettyError.codeFrame,
       type: getErrorType(prettyError),
       code: prettyError.code,
@@ -802,7 +813,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$1 = (ipc, method, ...params) => {
@@ -835,7 +846,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$1(ipc, method, ...params);
@@ -912,7 +923,7 @@ const WebWorkerRpcClient = {
 };
 
 const rpcs = Object.create(null);
-const set$7 = (id, rpc) => {
+const set$a = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -936,46 +947,46 @@ const create = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$7(rpcId, rpc);
+      set$a(rpcId, rpc);
     }
   };
 };
-const MainProcess$1 = -5;
 const RendererWorker$1 = 1;
+const EmbedsProcess$1 = 207;
 const {
-  invoke: invoke$5,
-  set: set$5
-} = create(MainProcess$1);
+  invoke: invoke$8,
+  set: set$8
+} = create(EmbedsProcess$1);
 const EmbedsProcess = {
   __proto__: null,
-  invoke: invoke$5,
-  set: set$5
+  invoke: invoke$8,
+  set: set$8
 };
 const {
-  invoke: invoke$2,
-  invokeAndTransfer: invokeAndTransfer$2,
-  set: set$2
+  invoke: invoke$5,
+  invokeAndTransfer: invokeAndTransfer$5,
+  set: set$5
 } = create(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$2,
-  invokeAndTransfer: invokeAndTransfer$2,
-  set: set$2
+  invoke: invoke$5,
+  invokeAndTransfer: invokeAndTransfer$5,
+  set: set$5
 };
 
 const {
   set: set$1,
   invoke: invoke$1} = EmbedsProcess;
 
+const ERR_ABORTED = 'ERR_ABORTED';
+const ERR_FAILED = 'ERR_FAILED';
+
 const {
   invoke,
   set,
   invokeAndTransfer
 } = RendererWorker;
 
-const ERR_ABORTED = 'ERR_ABORTED';
-const ERR_FAILED = 'ERR_FAILED';
-
 const createWebContentsView = async (restoreId, fallThroughKeyBindings) => {
   // @ts-ignore
   const id = await invoke$1('ElectronWebContentsView.createWebContentsView', restoreId, fallThroughKeyBindings);
@@ -985,7 +996,6 @@ const disposeWebContentsView = id => {
   return invoke$1('ElectronWebContentsView.disposeWebContentsView', id);
 };
 const resizeWebContentsView = (id, x, y, width, height) => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.resizeBrowserView', id, x, y, width, height);
 };
 const setIframeSrcFallback = async (id, error) => {
@@ -993,12 +1003,10 @@ const setIframeSrcFallback = async (id, error) => {
     code,
     message
   } = error;
-  // @ts-ignore
   await invoke$1('ElectronWebContentsView.setIframeSrcFallback', id, code, message);
 };
 const setIframeSrc = async (id, iframeSrc) => {
   try {
-    // @ts-ignore
     await invoke$1('ElectronWebContentsView.setIframeSrc', id, iframeSrc);
   } catch (error) {
     console.log({
@@ -1006,11 +1014,13 @@ const setIframeSrc = async (id, iframeSrc) => {
     });
     // TODO send error back to embeds worker,
     // embeds worker decides how to handle error
+
     // @ts-ignore
     if (error && error.code === ERR_ABORTED) {
       console.info(`[embeds worker] navigation to ${iframeSrc} aborted`);
       return;
     }
+
     // @ts-ignore
     if (error && error.code === ERR_FAILED) {
       console.info(`[embeds worker] navigation to ${iframeSrc} canceled`);
@@ -1025,63 +1035,49 @@ const setIframeSrc = async (id, iframeSrc) => {
   }
 };
 const focus = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.focus', id);
 };
 const openDevtools = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.openDevtools', id);
 };
 const reload = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.reload', id);
 };
 const show = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.show', id);
 };
 const hide = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.hide', id);
 };
 const forward = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.forward', id);
 };
 const backward = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.backward', id);
 };
 const getDomTree = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.getDomTree', id);
 };
 const insertCss = (id, css) => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.insertCss', id, css);
 };
 const insertJavaScript = (id, code) => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.insertJavaScript', id, code);
 };
 const cancelNavigation = id => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.cancelNavigation', id);
 };
 const inspectElement = (id, x, y) => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.inspectElement', id, x, y);
 };
 const copyImageAt = (id, x, y) => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.copyImageAt', id, x, y);
 };
-const setFallthroughKeyBindings = (id, fallthroughKeybindings) => {
+const setFallthroughKeyBindings = async (id, fallthroughKeybindings) => {
   // TODO
   // return EmbedsProcess.invoke('ElectronWebContentsView.setFallthroughKeyBindings', id, fallthroughKeybindings)
 };
 const getStats = (id, fallthroughKeybindings) => {
-  // @ts-ignore
   return invoke$1('ElectronWebContentsView.getStats', id, fallthroughKeybindings);
 };
 const forwardEvent = key => (id, ...args) => {
@@ -1093,7 +1089,7 @@ const handleWillNavigate = forwardEvent('ElectronBrowserView.handleWillNavigate'
 const handleContextMenu = forwardEvent('ElectronBrowserView.handleContextMenu');
 
 const exit = () => {
-  self.close();
+  globalThis.close();
 };
 
 const getPortTuple = () => {

package/static/{9c27ccd → 77beaf6}/packages/explorer-worker/dist/explorerViewWorkerMain.js

@@ -895,6 +895,7 @@ const CreateFolder$1 = 1;
 const CreateFile$1 = 2;
 const Copy$1 = 3;
 const Rename$2 = 4;
+const Remove = 5;
 
 const rpcs = Object.create(null);
 const set$g = (id, rpc) => {
@@ -1004,6 +1005,9 @@ const applyOperation = operation => {
   if (operation.type === Rename$2) {
     return rename$1(operation.from || '', operation.path);
   }
+  if (operation.type === Remove) {
+    return remove(operation.path);
+  }
   return writeFile(operation.path, operation.text);
 };
 
@@ -1882,7 +1886,12 @@ const copyPath = async state => {
   if (!dirent) {
     return state;
   }
-  // await Command.execute(RendererWorkerCommandType.ClipBoardWriteText, /* text */ path)
+  // TODO windows paths
+  // TODO handle error
+  const {
+    path
+  } = dirent;
+  await writeClipBoardText(path);
   return state;
 };
 
@@ -2022,7 +2031,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     confirmPaste: false,
     pasteShouldMove: false,
     cutItems: [],
-    isPointerDown: false
+    isPointerDown: false,
+    pointerDownIndex: -1
   };
   set(uid, state, state);
 };
@@ -2072,7 +2082,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     confirmPaste: false,
     pasteShouldMove: false,
     cutItems: [],
-    isPointerDown: false
+    isPointerDown: false,
+    pointerDownIndex: -1
   };
   set(state.uid, state, state);
   return state;
@@ -2085,6 +2096,11 @@ const RenderValue = 8;
 const RenderSelection = 9;
 const RenderDragData = 10;
 
+const diffType$4 = RenderDragData;
+const isEqual$5 = (oldState, newState) => {
+  return oldState.isPointerDown || !newState.isPointerDown;
+};
+
 const diffType$3 = RenderFocus;
 const isEqual$4 = (oldState, newState) => {
   return oldState.focused === newState.focused && oldState.focus === newState.focus;
@@ -2108,8 +2124,8 @@ const isEqual$1 = (oldState, newState) => {
   return oldState.focus === Input$1 && newState.focus === Input$1 && oldState.editingValue === newState.editingValue;
 };
 
-const modules = [isEqual$3, isEqual$4, isEqual$4, isEqual$1, isEqual$2];
-const numbers = [diffType$2, diffType$3, RenderFocusContext, diffType, diffType$1];
+const modules = [isEqual$3, isEqual$4, isEqual$4, isEqual$1, isEqual$2, isEqual$5];
+const numbers = [diffType$2, diffType$3, RenderFocusContext, diffType, diffType$1, diffType$4];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -2411,7 +2427,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleCut', 'handleDragLeave', 'handleDragOver', 'handleDragStart', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectIndices', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'toggleIndividualSelection', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleCut', 'handleDragLeave', 'handleDragOver', 'handleDragOverIndex', 'handleDragStart', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectIndices', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'toggleIndividualSelection', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -3289,19 +3305,28 @@ const canBeDroppedInto = dirent => {
   }
 };
 
+const countInRange = (start, end) => {
+  const items = [];
+  for (let i = start; i < end; i++) {
+    items.push(i);
+  }
+  return items;
+};
+
 const dropTargetFull = [-1];
 
-const getNewDropTargets = (state, x, y) => {
+const getNewDropTargets = (state, index) => {
   const {
     items
   } = state;
-  const index = getIndexFromPosition(state, x, y);
   if (index === -1) {
     return dropTargetFull;
   }
   const item = items[index];
   if (!canBeDroppedInto(item)) {
-    return [];
+    const startIndex = getParentStartIndex(items, index);
+    const endIndex = getParentEndIndex(items, index);
+    return countInRange(startIndex, endIndex);
   }
   const newDropTargets = [index];
   return newDropTargets;
@@ -3322,13 +3347,11 @@ const isEqual = (a, b) => {
   return true;
 };
 
-const handleDragOver = (state, x, y) => {
-  number(x);
-  number(y);
+const handleDragOverIndex = (state, index) => {
   const {
     dropTargets
   } = state;
-  const newDropTargets = getNewDropTargets(state, x, y);
+  const newDropTargets = getNewDropTargets(state, index);
   if (isEqual(dropTargets, newDropTargets)) {
     return state;
   }
@@ -3338,6 +3361,13 @@ const handleDragOver = (state, x, y) => {
   };
 };
 
+const handleDragOver = (state, x, y) => {
+  number(x);
+  number(y);
+  const index = getIndexFromPosition(state, x, y);
+  return handleDragOverIndex(state, index);
+};
+
 const handleDragStart = state => {
   return state;
 };
@@ -4085,10 +4115,7 @@ const handlePointerDown = (state, button, x, y) => {
       focus: List
     };
   }
-  return {
-    ...state,
-    focusedIndex: index
-  };
+  return state;
 };
 
 const handleUpload = async (state, dirents) => {
@@ -4518,16 +4545,6 @@ const confirmDelete = async paths => {
   return result === true;
 };
 
-const removePaths = async paths => {
-  for (const item of paths) {
-    try {
-      await remove(item);
-    } catch {
-      // ignore
-    }
-  }
-};
-
 const removeDirent = async state => {
   const {
     items,
@@ -4545,9 +4562,18 @@ const removeDirent = async state => {
       return state;
     }
   }
-
-  // TODO use file operations, bulk edit and explorer refresh
-  await removePaths(toRemove);
+  const fileOperations = toRemove.map(item => {
+    return {
+      type: Remove,
+      path: item
+    };
+  });
+  // TODO use bulk edit and explorer refresh
+  const errorMessage = await applyFileOperations(fileOperations);
+  if (errorMessage) {
+    await confirm(errorMessage);
+    return state;
+  }
   const newState = await refresh(state);
   return {
     ...newState,
@@ -4624,18 +4650,24 @@ const renameDirent = state => {
 
 const getDragLabel = urls => {
   if (urls.length === 1) {
-    return urls[0];
+    return getBaseName('/', urls[0]);
   }
   return `${urls.length}`;
 };
+
+const toUri = path => {
+  if (path.startsWith('file://')) {
+    return path;
+  }
+  return 'file://' + path;
+};
 const getDragData = urls => {
-  const data = urls.join('\n');
-  // TODO send selected urls
+  const data = urls.map(toUri).join('\n');
   const dragData = [{
-    type: 'text/plain',
+    type: 'text/uri-list',
     data
   }, {
-    type: 'text/uri-list',
+    type: 'text/plain',
     data
   }];
   // @ts-ignore
@@ -4940,6 +4972,7 @@ const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets
     onContextMenu: HandleContextMenu,
     onDragLeave: HandleDragLeave,
     onDragOver: HandleDragOver,
+    onDragStart: HandleDragStart,
     onDrop: HandleDrop,
     onFocus: HandleListFocus,
     onPointerDown: HandlePointerDown,
@@ -5363,10 +5396,6 @@ const renderEventListeners = () => {
     name: HandleDragStart,
     params: ['handleDragStart'],
     // @ts-ignore
-    dragInfo: [{
-      type: 'text/plain',
-      data: 'https://example.com'
-    }],
     dragEffect: 'copyMove'
   }];
 };
@@ -5665,6 +5694,7 @@ const commandMap = {
   'Explorer.focusIndex': wrapCommand(focusIndex),
   'Explorer.focusLast': wrapCommand(focusLast),
   'Explorer.handleDragStart': wrapCommand(handleDragStart),
+  'Explorer.handleDragOverIndex': wrapCommand(handleDragOverIndex),
   'Explorer.focusNext': wrapCommand(focusNext),
   'Explorer.focusNone': wrapCommand(focusNone),
   'Explorer.focusPrevious': wrapCommand(focusPrevious),