@lvce-editor/static-server 0.70.19 → 0.70.21

package/static/{711ab07 → a0480e0}/packages/extension-host-worker/dist/extensionHostWorkerMain.js

@@ -2851,7 +2851,7 @@ const {
 });
 
 const getExtensionHostSubWorkerUrl = () => {
-  return '/711ab07/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
+  return '/a0480e0/packages/extension-host-sub-worker/dist/extensionHostSubWorkerMain.js';
 };
 const extensionHostSubWorkerUrl = getExtensionHostSubWorkerUrl();
 
@@ -3071,9 +3071,9 @@ const getJson = async url => {
 
 const getAssetDir = () => {
   // @ts-ignore
-  if (typeof '/711ab07' !== 'undefined') {
+  if (typeof '/a0480e0' !== 'undefined') {
     // @ts-ignore
-    return '/711ab07';
+    return '/a0480e0';
   }
   if (platform === Electron) {
     return '../../../../..';

package/static/{711ab07 → a0480e0}/packages/extension-search-view-worker/dist/extensionSearchViewWorkerMain.js

@@ -1617,7 +1617,7 @@ const handleChange = async (state, update) => {
     ...update
   };
   try {
-    const value = fullNewState.searchValue;
+    const value = fullNewState.searchValue.trim();
     const {
       inputSource
     } = fullNewState;

package/static/{711ab07 → a0480e0}/packages/file-search-worker/dist/fileSearchWorkerMain.js

@@ -1,3 +1,42 @@
+const EditorWorker = 99;
+const RendererWorker = 1;
+
+const SetDom2 = 'Viewlet.setDom2';
+
+const FocusQuickPickInput = 20;
+
+const rpcs = Object.create(null);
+const set$3 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$2 = id => {
+  return rpcs[id];
+};
+
+const create$7 = rpcId => {
+  return {
+    async dispose() {
+      const rpc = get$2(rpcId);
+      await rpc.dispose();
+    },
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get$2(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get$2(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$3(rpcId, rpc);
+    }
+  };
+};
+
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -526,7 +565,7 @@ const IpcParentWithMessagePort$1 = {
 
 const Two$1 = '2.0';
 const callbacks$1 = Object.create(null);
-const get$2 = id => {
+const get$1 = id => {
   return callbacks$1[id];
 };
 const remove = id => {
@@ -675,7 +714,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$2(id);
+  const fn = get$1(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -1012,9 +1051,35 @@ const create$6 = async ({
     messagePort: port2
   });
 };
-const TransferMessagePortRpcParent = {
-  __proto__: null,
-  create: create$6
+
+/* eslint-disable @typescript-eslint/no-misused-promises */
+
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
 };
 const create$2$1 = async ({
   commandMap
@@ -1030,48 +1095,28 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$2$1
 };
-
-const EditorWorker = 99;
-const RendererWorker = 1;
-
-const FocusQuickPickInput = 20;
-
-const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get$1 = id => {
-  return rpcs[id];
+const create$3 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$6({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
 };
-
-const create$3 = rpcId => {
-  return {
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
-    },
-    // @ts-ignore
-    invoke(method, ...params) {
-      const rpc = get$1(rpcId);
-      // @ts-ignore
-      return rpc.invoke(method, ...params);
-    },
-    // @ts-ignore
-    invokeAndTransfer(method, ...params) {
-      const rpc = get$1(rpcId);
-      // @ts-ignore
-      return rpc.invokeAndTransfer(method, ...params);
-    },
-    set(rpc) {
-      set$3(rpcId, rpc);
-    }
-  };
+const LazyTransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3
 };
 
 const {
   invoke: invoke$2,
   set: set$2
-} = create$3(EditorWorker);
+} = create$7(EditorWorker);
 const getLines = async editorUid => {
   const lines = await invoke$2('Editor.getLines2', editorUid);
   return lines;
@@ -1081,7 +1126,7 @@ const {
   invoke: invoke$1,
   invokeAndTransfer,
   set: set$1
-} = create$3(RendererWorker);
+} = create$7(RendererWorker);
 const sendMessagePortToEditorWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
   // @ts-ignore
@@ -1292,7 +1337,7 @@ const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, w
     cursorOffset: 0,
     height: 300,
     icons: [],
-    maxVisibleItems: 10,
+    maxVisibleItems: 12,
     picks: [],
     recentPickIds: Object.create(null),
     recentPicks: [],
@@ -2949,14 +2994,7 @@ const handleMessagePort = async port => {
 };
 
 const initialize = async () => {
-  // TODO
-  const rpc = await TransferMessagePortRpcParent.create({
-    commandMap: {},
-    async send(port) {
-      await sendMessagePortToEditorWorker(port, 0);
-    }
-  });
-  set$2(rpc);
+  // not needed anymore
 };
 
 const getDefaultValue = id => {
@@ -3028,6 +3066,7 @@ const loadContent = async state => {
     fileIconCache,
     height,
     itemHeight,
+    maxVisibleItems,
     platform,
     uri
   } = state;
@@ -3043,7 +3082,7 @@ const loadContent = async state => {
   const filterValue = getFilterValue(id, subId, value);
   const items = filterQuickPickItems(newPicks, filterValue);
   const minLineY = 0;
-  const maxLineY = Math.min(minLineY + state.maxVisibleItems, newPicks.length);
+  const maxLineY = Math.min(minLineY + maxVisibleItems, newPicks.length);
   const sliced = newPicks.slice(minLineY, maxLineY);
   const {
     icons,
@@ -3156,34 +3195,43 @@ const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
 const getScrollBarY = getScrollBarOffset;
 
 const createQuickPickViewModel = (oldState, newState) => {
-  const protoVisibleItems = getVisible$1(newState.items, newState.minLineY, newState.maxLineY, newState.icons);
-  const visibleItems = getVisible(newState.items.length, protoVisibleItems, newState.minLineY, newState.focusedIndex);
-  const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY;
-  const newFocusedIndex = newState.focusedIndex - newState.minLineY;
-  const itemCount = newState.items.length;
   const {
+    cursorOffset,
     deltaY,
     finalDeltaY,
+    focused,
+    focusedIndex,
     headerHeight,
     height,
+    icons,
     itemHeight,
-    minimumSliderSize
+    items,
+    maxLineY,
+    minimumSliderSize,
+    minLineY,
+    uid,
+    value
   } = newState;
+  const protoVisibleItems = getVisible$1(items, minLineY, maxLineY, icons);
+  const visibleItems = getVisible(items.length, protoVisibleItems, minLineY, focusedIndex);
+  const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY;
+  const newFocusedIndex = focusedIndex - minLineY;
+  const itemCount = items.length;
   const listHeight = getListHeight(itemCount, itemHeight, height);
   const contentHeight = itemCount * itemHeight;
   const scrollBarHeight = getScrollBarSize(listHeight, contentHeight, minimumSliderSize);
   const scrollBarY = getScrollBarY(deltaY, finalDeltaY, height - headerHeight, scrollBarHeight);
   const roundedScrollBarY = Math.round(scrollBarY);
   return {
-    cursorOffset: newState.cursorOffset,
-    focused: newState.focused,
+    cursorOffset,
+    focused,
     height,
     newFocusedIndex,
     oldFocusedIndex,
     scrollBarHeight,
     scrollBarTop: roundedScrollBarY,
-    uid: newState.uid,
-    value: newState.value,
+    uid,
+    value,
     visibleItems
   };
 };
@@ -3207,10 +3255,14 @@ const renderFocusedIndex = newState => {
 };
 
 const renderHeight = newState => {
-  if (newState.height === 0) {
-    return ['Viewlet.send', newState.uid, /* method */SetItemsHeight, /* height */20];
+  const {
+    height,
+    uid
+  } = newState;
+  if (height === 0) {
+    return ['Viewlet.send', uid, /* method */SetItemsHeight, /* height */20];
   }
-  return ['Viewlet.send', newState.uid, /* method */SetItemsHeight, /* height */newState.height];
+  return ['Viewlet.send', uid, /* method */SetItemsHeight, /* height */height];
 };
 
 const Div = 4;
@@ -3459,8 +3511,13 @@ const getQuickPickVirtualDom = (visibleItems, scrollBarHeight, scrollBarTop) =>
 };
 
 const renderItems = newState => {
-  const dom = getQuickPickVirtualDom(newState.visibleItems, newState.scrollBarHeight, newState.scrollBarTop);
-  return ['Viewlet.setDom2', dom];
+  const {
+    scrollBarHeight,
+    scrollBarTop,
+    visibleItems
+  } = newState;
+  const dom = getQuickPickVirtualDom(visibleItems, scrollBarHeight, scrollBarTop);
+  return [SetDom2, dom];
 };
 
 const renderValue = newState => {
@@ -3616,6 +3673,23 @@ const commandMap = {
   'QuickPick.showQuickInput': showQuickInput
 };
 
+const initializeEditorWorker = async () => {
+  const rpc = await LazyTransferMessagePortRpcParent.create({
+    commandMap: {},
+    async send(port) {
+      await sendMessagePortToEditorWorker(port, 0);
+    }
+  });
+  set$2(rpc);
+};
+
+const initializeRendererWorker = async () => {
+  const rpc = await WebWorkerRpcClient.create({
+    commandMap: commandMap
+  });
+  set$1(rpc);
+};
+
 const Memfs = 'memfs';
 const Html = 'html';
 const Fetch = 'fetch';
@@ -3672,10 +3746,7 @@ const listen = async () => {
   Object.assign(commandMapRef, commandMap);
   registerCommands(commandMap);
   register(searchModules);
-  const rpc = await WebWorkerRpcClient.create({
-    commandMap: commandMap
-  });
-  set$1(rpc);
+  await Promise.all([initializeRendererWorker(), initializeEditorWorker()]);
 };
 
 const main = async () => {

package/static/{711ab07 → a0480e0}/packages/find-widget-worker/dist/findWidgetWorkerMain.js

@@ -374,7 +374,7 @@ const callbacks = Object.create(null);
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -527,7 +527,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -834,6 +834,34 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$1$1
 };
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
+
+const CheckBox = 'checkbox';
+const Group = 'group';
+const None = 'none';
+
+const Button = 1;
+const Div = 4;
+const Text = 12;
+const TextArea = 62;
 
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
@@ -887,7 +915,11 @@ const set$2 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$2 = rpcId => {
   return {
     async dispose() {
@@ -906,6 +938,18 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$2(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$2(rpcId, rpc);
     }
@@ -1293,11 +1337,12 @@ const findRegexMatches = (lines, regex) => {
   return new Uint32Array(matches);
 };
 
+const emptyMatches$1 = new Uint32Array([]);
 const findMatches = (lines, searchString, options) => {
   if (searchString.length === 0) {
     return {
       error: '',
-      matches: new Uint32Array([])
+      matches: emptyMatches$1
     };
   }
   const {
@@ -1307,7 +1352,7 @@ const findMatches = (lines, searchString, options) => {
   if (error) {
     return {
       error,
-      matches: new Uint32Array([])
+      matches: emptyMatches$1
     };
   }
   const matches = findRegexMatches(lines, regex);
@@ -1602,6 +1647,43 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll, lines, pr
   return edits;
 };
 
+const getLines = async editorUid => {
+  const lines = await getLines$1(editorUid);
+  return lines;
+};
+
+const updateAfterReplace = async (state, matchIndex) => {
+  const {
+    editorUid,
+    matchCase,
+    matchWholeWord,
+    useRegularExpression,
+    value
+  } = state;
+  const options = {
+    matchCase,
+    matchWholeWord,
+    useRegularExpression
+  };
+  const newLines = await getLines(editorUid);
+  const {
+    error,
+    matches: newMatches
+  } = findMatches(newLines, value, options);
+  const newMatchCount = getMatchCount(newMatches);
+
+  // Keep matchIndex in bounds, or reset to 0 if no matches remain
+  const newMatchIndex = newMatchCount === 0 ? 0 : Math.min(matchIndex, newMatchCount - 1);
+  return {
+    ...state,
+    inputErrorMessage: error,
+    lines: newLines,
+    matchCount: newMatchCount,
+    matches: newMatches,
+    matchIndex: newMatchIndex
+  };
+};
+
 const replace$1 = async state => {
   const {
     editorUid,
@@ -1622,12 +1704,10 @@ const replace$1 = async state => {
   };
   const edits = getEdits(matches, value, replacement, matchIndex, false, lines, preserveCase, options);
   await applyEdits(editorUid, edits);
-  return {
-    ...state
-  };
+  return updateAfterReplace(state, matchIndex);
 };
 
-const replaceAll$1 = state => {
+const replaceAll$1 = async state => {
   const {
     editorUid,
     lines,
@@ -1645,10 +1725,8 @@ const replaceAll$1 = state => {
     useRegularExpression
   };
   const edits = getEdits(matches, value, replacement, 0, true, lines, preserveCase, options);
-  void applyEdits(editorUid, edits);
-  return {
-    ...state
-  };
+  await applyEdits(editorUid, edits);
+  return updateAfterReplace(state, 0);
 };
 
 const getClickHandler = name => {
@@ -1993,11 +2071,6 @@ const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
   };
 };
 
-const getLines = async editorUid => {
-  const lines = await getLines$1(editorUid);
-  return lines;
-};
-
 const getSelectedText = (lines, selections) => {
   if (selections.length === 0) {
     return '';
@@ -2284,24 +2357,15 @@ const getFindWidgetButtonsEnabled = (matchCount, value) => {
   };
 };
 
-const CheckBox = 'checkbox';
-const Group = 'group';
-const None = 'none';
-
-const Button = 1;
-const Div = 4;
-const Text = 12;
-const TextArea = 62;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };