@lvce-editor/static-server 0.40.1 → 0.40.3

package/static/{21f6893 → 7d46644}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -110,7 +110,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/21f6893';
+    return '/7d46644';
   }
 };
 const assetDir = getAssetDir();
@@ -3927,9 +3927,10 @@ const add$1 = menuEntries => {
   state$v.menuEntries = [...state$v.menuEntries, ...menuEntries];
 };
 
-const loadModule$2 = (id, module) => {
+const loadModule$2 = async (id, module) => {
   if (module.getQuickPickMenuEntries) {
-    add$1(module.getQuickPickMenuEntries());
+    const entries = await module.getQuickPickMenuEntries();
+    add$1(entries);
   }
 };
 
@@ -4346,7 +4347,9 @@ const maybeRegisterMenuEntries = module => {
 };
 const actuallyLoadModule = async (getModule, id) => {
   const module = await getModule(id);
-  await invoke$g(/* Viewlet.load */kLoadModule, /* id */id);
+  if (!module.hasFunctionalEvents) {
+    await invoke$g(/* Viewlet.load */kLoadModule, /* id */id, /* hasFunctionalEvents */module.hasFunctionalEvents);
+  }
   await loadModule$1(id, module);
   maybeRegisterWrappedCommands(id, module);
   maybeRegisterEvents(module);
@@ -4504,7 +4507,7 @@ const load$7 = async (viewlet, focus = false, restore = false, restoreState = un
     });
     const commands = [];
     if (module.hasFunctionalRootRender) {
-      commands.push([kCreateFunctionalRoot, viewlet.id, viewletUid]);
+      commands.push([kCreateFunctionalRoot, viewlet.id, viewletUid, module.hasFunctionalEvents]);
     } else {
       commands.push([kCreate, viewlet.id, viewletUid]);
     }
@@ -10874,57 +10877,6 @@ const formatDocument = () => {
 const sourceAction = () => {
   return i18nString(UiStrings$n.SourceActions);
 };
-const editorShowHover = () => {
-  return i18nString(UiStrings$n.EditorShowHover);
-};
-const editorFormatDocumentForced = () => {
-  return i18nString(UiStrings$n.EditorFormatDocumentForced);
-};
-const editorSelectNextOccurrence = () => {
-  return i18nString(UiStrings$n.EditorSelectNextOccurrence);
-};
-const editorSelectAllOccurrences = () => {
-  return i18nString(UiStrings$n.EditorSelectAllOccurrences);
-};
-const editorGoToDefinition = () => {
-  return i18nString(UiStrings$n.EditorGoToDefinition);
-};
-const editorGoToTypeDefinition = () => {
-  return i18nString(UiStrings$n.EditorGoToTypeDefinition);
-};
-const editorSelectInsideString = () => {
-  return i18nString(UiStrings$n.EditorSelectInsideString);
-};
-const editorIndent = () => {
-  return i18nString(UiStrings$n.EditorIndent);
-};
-const editorUnindent = () => {
-  return i18nString(UiStrings$n.EditorUnindent);
-};
-const editorSortLinesAscending = () => {
-  return i18nString(UiStrings$n.EditorSortLinesAscending);
-};
-const editorToggleComment = () => {
-  return i18nString(UiStrings$n.EditorToggleComment);
-};
-const editorSelectUp = () => {
-  return i18nString(UiStrings$n.EditorSelectUp);
-};
-const editorSelectDown = () => {
-  return i18nString(UiStrings$n.EditorSelectDown);
-};
-const editorOpenColorPicker = () => {
-  return i18nString(UiStrings$n.EditorOpenColorPicker);
-};
-const editorCloseColorPicker = () => {
-  return i18nString(UiStrings$n.EditorCloseColorPicker);
-};
-const editorCopyLineDown = () => {
-  return i18nString(UiStrings$n.EditorCopyLineDown);
-};
-const editorCopyLineUp = () => {
-  return i18nString(UiStrings$n.EditorCopyLineUp);
-};
 
 const Separator$3 = 1;
 const None$i = 0;
@@ -14458,7 +14410,7 @@ const getWebViewsDefault = async () => {
       return getWebViewsNode();
   }
 };
-const getWebViews = async () => {
+const getWebViews$1 = async () => {
   const nodeWebViews = await getWebViewsDefault();
   const registeredWebViews = get$a();
   const allWebViews = [...nodeWebViews, ...registeredWebViews];
@@ -14528,7 +14480,7 @@ const compat = {
     return invoke$e(...args);
   },
   getWebViews() {
-    return getWebViews();
+    return getWebViews$1();
   },
   getSavedState() {
     return getSavedState();
@@ -14795,6 +14747,7 @@ const apply = (oldState, newState) => {
 
 const hasFunctionalRender$E = true;
 const hasFunctionalRootRender$m = true;
+const hasFunctionalEvents$1 = true;
 const renderDialog$2 = {
   isEqual(oldState, newState) {
     return false;
@@ -14803,7 +14756,7 @@ const renderDialog$2 = {
   multiple: true
 };
 const render$H = [renderDialog$2];
-const renderEventListeners = async () => {
+const renderEventListeners$1 = async () => {
   const listeners = await invoke$c('About.renderEventListeners');
   return listeners;
 };
@@ -14820,13 +14773,14 @@ const ViewletAbout_ipc = {
   handleClickCopy,
   handleClickOk: handleClickOk$1,
   handleFocusIn: handleFocusIn$1,
+  hasFunctionalEvents: hasFunctionalEvents$1,
   hasFunctionalRender: hasFunctionalRender$E,
   hasFunctionalRootRender: hasFunctionalRootRender$m,
   loadContent: loadContent$L,
   name: name$O,
   render: render$H,
   renderDialog: renderDialog$2,
-  renderEventListeners
+  renderEventListeners: renderEventListeners$1
 };
 
 const Tab = 1;
@@ -15336,7 +15290,6 @@ const HandleMouseOver = 'handleMouseOver';
 const HandlePointerDown = 'handlePointerDown';
 const HandlePointerOut = 'handlePointerOut';
 const HandlePointerOver = 'handlePointerOver';
-const HandleTitleBarButtonsClick = 'handleTitleBarButtonsClick';
 const HandleWheel = 'handleWheel';
 
 const ActivityBar$1 = 'ActivityBar';
@@ -17870,7 +17823,7 @@ const renderAll = {
       return [];
     }
     const adjustedCommands = commands.map(command => {
-      if (command[0] === 'Viewlet.create' || command[0] === 'Viewlet.send' || command[0] === 'Viewlet.createFunctionalRoot' || command[0] === 'Viewlet.setDom2' || command[0] === 'Viewlet.focusSelector') {
+      if (command[0] === 'Viewlet.create' || command[0] === 'Viewlet.send' || command[0] === 'Viewlet.createFunctionalRoot' || command[0] === 'Viewlet.registerEventListeners' || command[0] === 'Viewlet.setDom2' || command[0] === 'Viewlet.focusSelector') {
         return command;
       }
       return ['Viewlet.send', newState.uid, ...command];
@@ -18385,76 +18338,10 @@ const getKeyBindings$b = () => {
   return actualInvoke('Editor.getKeyBindings');
 };
 
-const getQuickPickMenuEntries$2 = () => {
-  return [{
-    id: 'Editor.format',
-    label: formatDocument()
-  }, {
-    id: 'Editor.showHover',
-    label: editorShowHover()
-  }, {
-    id: 'Editor.formatForced',
-    label: editorFormatDocumentForced()
-  }, {
-    id: 'Editor.selectNextOccurrence',
-    label: editorSelectNextOccurrence()
-  }, {
-    id: 'Editor.selectAllOccurrences',
-    label: editorSelectAllOccurrences()
-  }, {
-    id: 'Editor.goToDefinition',
-    label: editorGoToDefinition()
-  }, {
-    id: 'Editor.goToTypeDefinition',
-    label: editorGoToTypeDefinition()
-  }, {
-    id: 'Editor.selectInsideString',
-    label: editorSelectInsideString()
-  }, {
-    id: 'Editor.indent',
-    label: editorIndent(),
-    aliases: ['Indent More', 'DeIndent']
-  }, {
-    id: 'Editor.unindent',
-    label: editorUnindent(),
-    aliases: ['Indent Less', 'DeIndent']
-  }, {
-    id: 'Editor.sortLinesAscending',
-    label: editorSortLinesAscending()
-  }, {
-    id: 'Editor.toggleComment',
-    label: editorToggleComment()
-  }, {
-    id: 'Editor.selectUp',
-    label: editorSelectUp()
-  }, {
-    id: 'Editor.selectDown',
-    label: editorSelectDown()
-  }, {
-    id: 'Editor.toggleBlockComment',
-    label: toggleBlockComment()
-  }, {
-    id: 'Editor.openColorPicker',
-    label: editorOpenColorPicker()
-  }, {
-    id: 'Editor.closeColorPicker',
-    label: editorCloseColorPicker()
-  }, {
-    id: 'Editor.copyLineDown',
-    label: editorCopyLineDown()
-  }, {
-    id: 'Editor.copyLineUp',
-    label: editorCopyLineUp()
-  }, {
-    id: 'Editor.moveLineDown',
-    label: moveLineDown()
-  }, {
-    id: 'Editor.moveLineUp',
-    label: moveLineUp()
-  }, {
-    id: 'Editor.showSourceActions2',
-    label: sourceAction()
-  }];
+const getQuickPickMenuEntries$2 = async () => {
+  // @ts-ignore
+  const entries = await actualInvoke('Editor.getQuickPickMenuEntries');
+  return entries;
 };
 
 const name$D = 'EditorText';
@@ -24301,22 +24188,6 @@ const getSplitOverlayDimensions = (x, y, width, height, splitDirection) => {
   }
 };
 
-const getTabIndex = (tabs, x, eventX) => {
-  array(tabs);
-  number$1(x);
-  number$1(eventX);
-  const relativeX = eventX - x;
-  let total = 0;
-  for (let i = 0; i < tabs.length; i++) {
-    const tab = tabs[i];
-    total += tab.tabWidth;
-    if (total >= relativeX) {
-      return i;
-    }
-  }
-  return -1;
-};
-
 const getIndices = (eventX, eventY, tabs) => {
   let width = 0;
   for (let i = 0; i < tabs.length; i++) {
@@ -24349,6 +24220,22 @@ const getTabHighlightInfo = (eventX, eventY, tabs) => {
   };
 };
 
+const getTabIndex = (tabs, x, eventX) => {
+  array(tabs);
+  number$1(x);
+  number$1(eventX);
+  const relativeX = eventX - x;
+  let total = 0;
+  for (let i = 0; i < tabs.length; i++) {
+    const tab = tabs[i];
+    total += tab.tabWidth;
+    if (total >= relativeX) {
+      return i;
+    }
+  }
+  return -1;
+};
+
 const serializeEditor = editor => {
   const {
     preview,
@@ -24409,7 +24296,7 @@ const mapExtToEditorType = {
   '.ogg': Audio$1,
   '.opus': Audio$1
 };
-const getModuleId = async uri => {
+const getModuleId = async (uri, opener) => {
   if (uri === 'app://keybindings') {
     return KeyBindings;
   }
@@ -24445,10 +24332,19 @@ const getModuleId = async uri => {
   }
 
   // TODO only request webviews once
-  const webViews = await getWebViews();
+  const webViews = await getWebViews$1();
   for (const webView of webViews) {
+    if (webView && webView.id === opener) {
+      // TODO can return webview directly here?
+      return WebView;
+    }
     for (const selector of webView.selector || []) {
       if (uri.endsWith(selector)) {
+        // TODO configure webviews so that some open by default (video, image)
+        // while other webviews only open when needed (markdown, html preview)
+        if (selector === '.md') {
+          continue;
+        }
         return WebView;
       }
     }
@@ -24752,7 +24648,8 @@ const openUri = async (state, uri, focus = true, {
   const y = state.y + tabHeight;
   const width = state.width;
   const contentHeight = state.height - tabHeight;
-  const moduleId = await getModuleId(uri);
+  // @ts-ignore
+  const moduleId = await getModuleId(uri, context.opener);
   let activeGroup = groups[activeGroupIndex];
   activeGroup ||= {
     uid: create$13(),
@@ -24771,7 +24668,8 @@ const openUri = async (state, uri, focus = true, {
   } = activeGroup;
   const previousEditor = editors[activeIndex];
   let disposeCommands;
-  if (previousEditor && previousEditor.uri === uri) {
+  // @ts-ignore
+  if (previousEditor && previousEditor.uri === uri && previousEditor.opener === context.opener) {
     return {
       newState: state,
       commands: []
@@ -24780,7 +24678,10 @@ const openUri = async (state, uri, focus = true, {
   for (let i = 0; i < editors.length; i++) {
     const editor = editors[i];
     if (editor.uri === uri) {
-      return focusIndex$5(state, i);
+      // @ts-ignore
+      if (editor.opener === context.opener) {
+        return focusIndex$5(state, i);
+      }
     }
   }
   // TODO editor needs to be disposed when closing
@@ -24804,7 +24705,8 @@ const openUri = async (state, uri, focus = true, {
     title: tabTitle,
     icon,
     tabWidth,
-    flags: Preview
+    flags: Preview,
+    moduleId
   };
   const newEditors = [...activeGroup.editors, newEditor];
   const newActiveIndex = newEditors.length - 1;
@@ -25470,6 +25372,63 @@ const handleTabsDragOver = (state, eventX, eventY) => {
     commands: []
   };
 };
+const getExtension = uri => {
+  const dotIndex = uri.lastIndexOf('.');
+  if (dotIndex === -1) {
+    return '';
+  }
+  return uri.slice(dotIndex);
+};
+const getMatchingWebViews = (webViews, uri) => {
+  const extension = getExtension(uri);
+  const matching = [];
+  for (const webView of webViews) {
+    if (webView && webView.selector && Array.isArray(webView.selector) && webView.selector.includes(extension)) {
+      matching.push(webView);
+    }
+  }
+  return matching;
+};
+const toQuickPickEntry = webView => {
+  return {
+    id: webView.id,
+    label: webView.name || webView.id
+  };
+};
+const getWebViews = async uri => {
+  const extensionWebViews = await getWebViews$1();
+  const matching = getMatchingWebViews(extensionWebViews, uri);
+  const quickPickEntries = matching.map(toQuickPickEntry);
+  return [{
+    id: 'editor',
+    label: 'Editor'
+  }, ...quickPickEntries];
+};
+const reopenEditorWith = async state => {
+  // TODO
+  // 1. get current editor type
+  const {
+    groups
+  } = state;
+  const group = groups[0];
+  const {
+    editors
+  } = group;
+  const editor = editors[0];
+  // 2. get webviews that exist for editor type
+  const webViews = await getWebViews(editor.uri);
+  // 3. open quickpick, asking to select an editor type
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  await execute$4('QuickPick.showCustom', webViews, resolve);
+  const choice = await promise;
+  await execute$4('Main.openUri', editor.uri, /* focus */true, {
+    opener: choice.id
+  });
+  return state;
+};
 
 const Commands$i = {
   focus: focus$5,
@@ -25479,7 +25438,8 @@ const Commands$i = {
   handleTabContextMenu: handleTabContextMenu,
   openBackgroundTab: openBackgroundTab$1,
   save: save,
-  handleClickClose: handleClickClose$1
+  handleClickClose: handleClickClose$1,
+  reopenEditorWith: reopenEditorWith
 };
 const CommandsWithSideEffects = {
   openUri: openUri,
@@ -25549,6 +25509,9 @@ const getQuickPickMenuEntries = () => {
   }, {
     id: 'Main.splitUp',
     label: 'Main: Split Up'
+  }, {
+    id: 'Main.reopenEditorWith',
+    label: 'Main: Reopen Editor With'
   }];
 };
 
@@ -25899,6 +25862,7 @@ const ViewletMain_ipc = {
   openBackgroundTab: openBackgroundTab$1,
   openEditorWithType,
   render: render$l,
+  reopenEditorWith,
   resize: resize$g,
   save,
   saveState: saveState$5,
@@ -28009,7 +27973,7 @@ const loadContent$i = async state => {
   // @ts-ignore
   provider.getLabel();
   const minLineY = 0;
-  const maxLineY = Math.min(minLineY + state.maxVisibleItems, newPicks.length - 1);
+  const maxLineY = Math.min(minLineY + state.maxVisibleItems, newPicks.length);
   return {
     ...state,
     picks: newPicks,
@@ -32983,15 +32947,18 @@ const getTitleBarButtonsElectron = () => {
     return [{
       label: minimize(),
       icon: 'Minimize',
-      id: 'Minimize'
+      id: 'Minimize',
+      onClick: 'handleClickMinimize'
     }, {
       label: maximize(),
       icon: 'Maximize',
-      id: 'ToggleMaximize'
+      id: 'ToggleMaximize',
+      onClick: 'handleClickToggleMaximize'
     }, {
       label: close$1(),
       icon: 'ChromeClose',
-      id: 'Close'
+      id: 'Close',
+      onClick: 'handleClickClose'
     }];
   }
   return [];
@@ -33074,32 +33041,48 @@ const Events = {
 const Css$5 = [];
 const Variables$1 = ['TitleBarButtonCloseHoverForeground'];
 
+const renderEventListeners = () => {
+  return [{
+    name: 'handleClickMinimize',
+    params: ['handleClickMinimize']
+  }, {
+    name: 'handleClickClose',
+    params: ['handleClickClose']
+  }, {
+    name: 'handleClickToggleMaximize',
+    params: ['handleClickToggleMaximize']
+  }];
+};
+
 const createTitleBarButton = button => {
   const {
     id,
     icon,
-    label
+    label,
+    onClick
   } = button;
   const dom = [{
     type: Button$2,
     className: `TitleBarButton TitleBarButton${id}`,
     ariaLabel: label,
-    childCount: 1
+    childCount: 1,
+    onClick
   }, getIconVirtualDom(icon, I)];
   return dom;
 };
+
 const getTitleBarButtonsVirtualDom = buttons => {
   const dom = [{
     type: Div,
     className: 'Viewlet TitleBarButtons',
-    childCount: buttons.length,
-    onClick: HandleTitleBarButtonsClick
+    childCount: buttons.length
   }, ...buttons.flatMap(createTitleBarButton)];
   return dom;
 };
 
 const hasFunctionalRender$4 = true;
 const hasFunctionalRootRender$3 = true;
+const hasFunctionalEvents = true;
 const renderTitleBarButtons = {
   isEqual(oldState, newState) {
     return oldState.buttons === newState.buttons;
@@ -33133,12 +33116,14 @@ const ViewletTitleBarButtons_ipc = {
   handleWindowDidMaximize,
   handleWindowDidMinimize,
   handleWindowDidUnmaximize,
+  hasFunctionalEvents,
   hasFunctionalRender: hasFunctionalRender$4,
   hasFunctionalResize: hasFunctionalResize$4,
   hasFunctionalRootRender: hasFunctionalRootRender$3,
   loadContent: loadContent$5,
   name: name$c,
   render: render$5,
+  renderEventListeners,
   resize: resize$4
 };
 
@@ -33593,7 +33578,7 @@ const getWebViewId = async uri => {
     const webViewId = uri.slice('webview://'.length);
     return webViewId;
   }
-  const webViews = await getWebViews();
+  const webViews = await getWebViews$1();
   for (const webView of webViews) {
     for (const selector of webView.selector || []) {
       if (uri.endsWith(selector)) {

package/static/index.html

@@ -5,10 +5,10 @@
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
     <meta name="description" content="VS Code inspired text editor that mostly runs in a webworker." />
     <title>Lvce Editor</title>
-    <link rel="stylesheet" href="/21f6893/css/App.css" />
-    <link rel="manifest" href="/21f6893/manifest.json" crossorigin="use-credentials" />
-    <script type="module" src="/21f6893/packages/renderer-process/dist/rendererProcessMain.js"></script>
-    <link rel="apple-touch-icon" href="/21f6893/icons/pwa-icon-192.png" />
+    <link rel="stylesheet" href="/7d46644/css/App.css" />
+    <link rel="manifest" href="/7d46644/manifest.json" crossorigin="use-credentials" />
+    <script type="module" src="/7d46644/packages/renderer-process/dist/rendererProcessMain.js"></script>
+    <link rel="apple-touch-icon" href="/7d46644/icons/pwa-icon-192.png" />
     <meta name="theme-color" content="#282e2f" />
   </head>
 </html>