@lvce-editor/static-server 0.51.2 → 0.51.4

package/static/{e4dc4ef → edd3a0e}/packages/keybindings-view-worker/dist/keyBindingsViewWorkerMain.js

@@ -424,7 +424,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$2 = (id, fn) => {
+const set$4 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -443,7 +443,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$2(id, resolve);
+  set$4(id, resolve);
   return {
     id,
     promise
@@ -1118,6 +1118,47 @@ const create$1 = () => {
     },
     dispose(uid) {
       delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    },
+    wrapCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState
+        } = states[uid];
+        const newerState = await fn(newState, ...args);
+        if (newState === newerState) {
+          return;
+        }
+        const latest = states[uid];
+        states[uid] = {
+          oldState: latest.oldState,
+          newState: newerState
+        };
+      };
+      return wrapped;
+    },
+    diff(uid, modules, numbers) {
+      const {
+        oldState,
+        newState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     }
   };
 };
@@ -1125,7 +1166,8 @@ const create$1 = () => {
 const {
   get: get$1,
   set: set$1,
-  dispose: dispose$1
+  dispose: dispose$1,
+  wrapCommand
 } = create$1();
 
 // TODO uri and platform might not be needed
@@ -1518,21 +1560,32 @@ const getMenuEntries = () => {
   }];
 };
 
-const RendererWorker = 1;
-
 const rpcs = Object.create(null);
-const set = (id, rpc) => {
+const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
   return rpcs[id];
 };
-
-const invoke = (method, ...params) => {
-  const rpc = get(RendererWorker);
+const RendererWorker$1 = 1;
+const invoke$2 = (method, ...params) => {
+  const rpc = get(RendererWorker$1);
   // @ts-ignore
   return rpc.invoke(method, ...params);
 };
+const set$2 = rpc => {
+  set$3(RendererWorker$1, rpc);
+};
+const RendererWorker = {
+  __proto__: null,
+  invoke: invoke$2,
+  set: set$2
+};
+
+const {
+  invoke,
+  set
+} = RendererWorker;
 
 const setFocus = focusKey => {
   return invoke('Focus.setFocus', focusKey);
@@ -1553,8 +1606,8 @@ const getIndex = (state, eventX, eventY) => {
 
 const DefineKeyBinding = 'DefineKeyBinding';
 
-const showDefineKeyBinding = () => {
-  return invoke('Viewlet.openWidget', DefineKeyBinding);
+const showDefineKeyBinding = async () => {
+  await invoke('Viewlet.openWidget', DefineKeyBinding);
 };
 
 const handleClick = async (state, eventX, eventY) => {
@@ -1768,6 +1821,7 @@ const getMaxVisibleItems = (height, searchHeaderHeight, tableHeaderHeight, rowHe
 };
 
 const getKeyBindings = () => {
+  // @ts-ignore
   return invoke('KeyBindingsInitial.getKeyBindings');
 };
 
@@ -2754,21 +2808,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const wrapCommand = fn => {
-  const wrapped = async (uid, ...args) => {
-    const {
-      newState
-    } = get$1(uid);
-    const newerState = await fn(newState, ...args);
-    if (newState === newerState) {
-      return;
-    }
-    const latest = get$1(uid);
-    set$1(uid, latest.oldState, newerState);
-  };
-  return wrapped;
-};
-
 const commandMap = {
   'KeyBindings.addKeyBinding': wrapCommand(addKeyBinding$1),
   'KeyBindings.changeWhenExpression': wrapCommand(changeWhenExpression$1),
@@ -2814,7 +2853,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set(RendererWorker, rpc);
+  set(rpc);
 };
 
 const main = async () => {

package/static/{e4dc4ef → edd3a0e}/packages/renderer-process/dist/rendererProcessMain.js

@@ -410,7 +410,7 @@ const getAssetDir = () => {
   }
   return '';
 };
-const assetDir = '/e4dc4ef';
+const assetDir = '/edd3a0e';
 
 const getConfiguredWorkerUrl = key => {
   if (typeof location === 'undefined' || typeof document === 'undefined') {
@@ -4961,7 +4961,6 @@ const focusPrevious = () => {
   }
 };
 
-const FocusDebugInput = 6;
 const FocusLocationList = 17;
 const FocusMenu = 18;
 const FocusSimpleBrowserInput = 23;
@@ -5711,9 +5710,7 @@ const toHaveAttribute = (locator, {
     actual
   };
 };
-const toHaveCount = (locator, {
-  count
-}) => {
+const toHaveCount = locator => {
   const elements = querySelector(locator._selector);
   const actualCount = elements.length;
   return {
@@ -9047,146 +9044,8 @@ const ViewletReferences = {
   setFocusedIndex: setFocusedIndex$2
 };
 
-const handleContinue = () => {
-  send('Run And Debug.continue');
-};
-const pause = () => {
-  send('Run And Debug.pause');
-};
-const stepOver = () => {
-  send('Run And Debug.stepOver');
-};
-const stepInto = () => {
-  send('Run And Debug.stepInto');
-};
-const stepOut = () => {
-  send('Run And Debug.stepOut');
-};
-const handleClickSectionWatch$1 = () => {
-  send('Run And Debug.handleClickSectionWatch');
-};
-const handleClickSectionBreakpoints$1 = () => {
-  send('Run And Debug.handleClickSectionBreakPoints');
-};
-const handleClickSectionScope$1 = () => {
-  send('Run And Debug.handleClickSectionScope');
-};
-const handleClickSectionCallstack$1 = () => {
-  send('Run And Debug.handleClickSectionCallstack');
-};
-const handleClickSectionBreakPoints$1 = () => {
-  send('Run And Debug.handleClickSectionBreakPoints');
-};
-const handleClickScopeValue$1 = text => {
-  send('Run And Debug.handleClickScopeValue', text);
-};
-const handleClickSectionHeading$1 = text => {
-  send('Run And Debug.handleClickSectionHeading', text);
-};
-const handleClickCheckBox$1 = text => {
-  send('Run And Debug.handleClickCheckBox', text);
-};
-
-/**
- *
- * @param {string} value
- */
-const handleDebugInput$1 = value => {
-  send('Run And Debug.handleDebugInput', value);
-};
-
-const handleClickContinue = () => {
-  handleContinue();
-};
-const handleClickPause = event => {
-  pause();
-};
-const handleClickStepOver = event => {
-  stepOver();
-};
-const handleClickStepInto = event => {
-  stepInto();
-};
-const handleClickStepOut = event => {
-  stepOut();
-};
-const handleClickSectionWatch = () => {
-  handleClickSectionWatch$1();
-};
-const handleClickSectionBreakpoints = () => {
-  handleClickSectionBreakpoints$1();
-};
-const handleClickSectionScope = () => {
-  handleClickSectionScope$1();
-};
-const handleClickSectionCallstack = () => {
-  handleClickSectionCallstack$1();
-};
-const handleClickSectionBreakPoints = () => {
-  handleClickSectionBreakPoints$1();
-};
-const handleDebugInputFocus = () => {
-  send('Focus.setFocus', FocusDebugInput);
-};
-const handleClickScopeValue = event => {
-  const {
-    target
-  } = event;
-  const {
-    textContent
-  } = target;
-  handleClickScopeValue$1(textContent);
-};
-const handleDebugInput = event => {
-  const {
-    target
-  } = event;
-  const {
-    value
-  } = target;
-  handleDebugInput$1(value);
-};
-const handleClickSectionHeading = event => {
-  const {
-    target
-  } = event;
-  const {
-    textContent
-  } = target;
-  handleClickSectionHeading$1(textContent);
-};
-const handleClickCheckBox = event => {
-  const {
-    target
-  } = event;
-  const {
-    name
-  } = target;
-  handleClickCheckBox$1(name);
-};
-
-const ViewletRunAndDebugEvents = {
-  __proto__: null,
-  handleClickCheckBox,
-  handleClickContinue,
-  handleClickPause,
-  handleClickScopeValue,
-  handleClickSectionBreakPoints,
-  handleClickSectionBreakpoints,
-  handleClickSectionCallstack,
-  handleClickSectionHeading,
-  handleClickSectionScope,
-  handleClickSectionWatch,
-  handleClickStepInto,
-  handleClickStepOut,
-  handleClickStepOver,
-  handleDebugInput,
-  handleDebugInputFocus
-};
-
 const ViewletRunAndDebug = {
-  __proto__: null,
-  Events: ViewletRunAndDebugEvents
+  __proto__: null
 };
 
 const handleLoadedMetaData = event => {

package/static/{e4dc4ef → edd3a0e}/packages/renderer-process/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "",
   "keywords": [
     "lvce-editor",

package/static/{e4dc4ef → edd3a0e}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -96,7 +96,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/e4dc4ef';
+    return '/edd3a0e';
   }
 };
 const assetDir = getAssetDir();

package/static/{e4dc4ef → edd3a0e}/packages/source-control-worker/dist/sourceControlWorkerMain.js

@@ -696,14 +696,14 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
-const warn = (...args) => {
+const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
   const fn = get$3(id);
   if (!fn) {
     console.log(response);
-    warn(`callback ${id} may already be disposed`);
+    warn$1(`callback ${id} may already be disposed`);
     return;
   }
   fn(response);
@@ -857,7 +857,7 @@ const send = (transport, method, ...params) => {
 const invoke$3 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$2 = (ipc, method, ...params) => {
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -890,7 +890,7 @@ const createRpc = ipc => {
       return invoke$3(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$2(ipc, method, ...params);
+      return invokeAndTransfer$1(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -1044,7 +1044,7 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     id,
     index: [],
     inputValue: '',
-    isExpanded: true,
+    expandedGroups: Object.create(null),
     itemHeight: 20,
     items: [],
     maxLineY: 0,
@@ -1104,7 +1104,7 @@ const getCommandIds = () => {
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1112,37 +1112,37 @@ const get$1 = id => {
 };
 const RendererWorker$1 = 1;
 const ExtensionHostWorker = 44;
-const invoke$1$1 = (method, ...params) => {
+const invoke$2 = (method, ...params) => {
   const rpc = get$1(RendererWorker$1);
   // @ts-ignore
   return rpc.invoke(method, ...params);
 };
-const invokeAndTransfer$1 = (method, ...params) => {
+const invokeAndTransfer$2 = (method, ...params) => {
   const rpc = get$1(RendererWorker$1);
   // @ts-ignore
   return rpc.invokeAndTransfer(method, ...params);
 };
-const set$1$1 = rpc => {
-  set$2(RendererWorker$1, rpc);
+const set$2 = rpc => {
+  set$3(RendererWorker$1, rpc);
 };
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$1$1,
-  invokeAndTransfer: invokeAndTransfer$1,
-  set: set$1$1
+  invoke: invoke$2,
+  invokeAndTransfer: invokeAndTransfer$2,
+  set: set$2
 };
-const invoke$2 = (method, ...params) => {
+const invoke$1$1 = (method, ...params) => {
   const rpc = get$1(ExtensionHostWorker);
   // @ts-ignore
   return rpc.invoke(method, ...params);
 };
-const set$3 = rpc => {
-  set$2(ExtensionHostWorker, rpc);
+const set$1$1 = rpc => {
+  set$3(ExtensionHostWorker, rpc);
 };
 const ExtensionHost = {
   __proto__: null,
-  invoke: invoke$2,
-  set: set$3
+  invoke: invoke$1$1,
+  set: set$1$1
 };
 
 const {
@@ -1199,7 +1199,7 @@ const pathBaseName = path => {
   return path.slice(path.lastIndexOf('/') + 1);
 };
 
-const getDisplayItemsGroup = (group, isExpanded) => {
+const getDisplayItemsGroup = (group, expandedGroups) => {
   const displayItems = [];
   const {
     id,
@@ -1210,6 +1210,7 @@ const getDisplayItemsGroup = (group, isExpanded) => {
     throw new Error('Source control group is missing an items property');
   }
   const length = items.length;
+  const isExpanded = expandedGroups[id] || false;
   const type = isExpanded ? DirectoryExpanded : Directory;
   const icon = isExpanded ? 'ChevronDown' : 'ChevronRight';
   if (length > 0) {
@@ -1260,10 +1261,10 @@ const getDisplayItemsGroup = (group, isExpanded) => {
   return displayItems;
 };
 
-const getDisplayItems = (allGroups, isExpanded) => {
+const getDisplayItems = (allGroups, expandedGroups) => {
   const displayItems = [];
   for (const group of allGroups) {
-    const groupDisplayItems = getDisplayItemsGroup(group, isExpanded);
+    const groupDisplayItems = getDisplayItemsGroup(group, expandedGroups);
     displayItems.push(...groupDisplayItems);
   }
   return displayItems;
@@ -1452,6 +1453,16 @@ const requestSourceActions = async () => {
   return newCache;
 };
 
+/* eslint-disable unicorn/no-array-reduce */
+const restoreExpandedGroups = groups => {
+  return groups.map(group => group.id).reduce((total, current) => {
+    return {
+      ...total,
+      [current]: true
+    };
+  }, Object.create(null));
+};
+
 const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   if (size >= contentSize) {
     return 0;
@@ -1474,8 +1485,8 @@ const loadContent = async state => {
     allGroups,
     gitRoot
   } = await getGroups(enabledProviderIds);
-  const isExpanded = true;
-  const displayItems = getDisplayItems(allGroups, isExpanded);
+  const expandedGroups = restoreExpandedGroups(allGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups);
   const actionsCache = await requestSourceActions();
   const splitButtonEnabled = get();
   const total = displayItems.length;
@@ -1495,7 +1506,6 @@ const loadContent = async state => {
     items: displayItems,
     visibleItems,
     enabledProviderIds,
-    isExpanded,
     root,
     splitButtonEnabled,
     maxLineY,
@@ -1531,6 +1541,10 @@ const getIndex = (state, eventX, eventY) => {
   return index;
 };
 
+const warn = (...args) => {
+  console.warn(...args);
+};
+
 const refresh = async state => {
   const {
     itemHeight,
@@ -1545,8 +1559,8 @@ const refresh = async state => {
     allGroups,
     gitRoot
   } = await getGroups(enabledProviderIds);
-  const isExpanded = true;
-  const displayItems = getDisplayItems(allGroups, isExpanded);
+  const expandedGroups = restoreExpandedGroups(allGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups);
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -1563,7 +1577,6 @@ const refresh = async state => {
     items: displayItems,
     visibleItems,
     enabledProviderIds,
-    isExpanded,
     splitButtonEnabled,
     maxLineY,
     scrollBarHeight,
@@ -1580,8 +1593,12 @@ const handleClickSourceControlButtons = async (state, index, name) => {
   if (!item) {
     return state;
   }
-  const button = item.buttons.find(button => button.label === name);
+  const {
+    buttons
+  } = item;
+  const button = buttons.find(button => button.label === name);
   if (!button) {
+    warn(`[source-control-worker] Button not found ${name}`);
     return state;
   }
   const file = item.file;
@@ -1590,46 +1607,51 @@ const handleClickSourceControlButtons = async (state, index, name) => {
   return newState;
 };
 
-const updateVisibleItems = async (state, isExpanded) => {
+const updateVisibleItems = async (state, expandedGroups) => {
   const {
-    allGroups,
     itemHeight,
     height,
-    minimumSliderSize,
+    actionsCache,
     fileIconCache,
-    actionsCache
+    allGroups
   } = state;
-  const displayItems = getDisplayItems(allGroups, isExpanded);
-  const newMaxLineY = displayItems.length;
+  const displayItems = getDisplayItems(allGroups, expandedGroups);
   const total = displayItems.length;
-  const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
-  const scrollBarHeight = getScrollBarSize(height, contentHeight, minimumSliderSize);
   const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
   const minLineY = 0;
   const maxLineY = Math.min(numberOfVisible, total);
-  const slicedItems = displayItems.slice(minLineY, maxLineY);
-  const newFileIconCache = await getFileIcons(slicedItems, fileIconCache);
-  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, fileIconCache);
   return {
     ...state,
     items: displayItems,
-    isExpanded,
-    maxLineY: newMaxLineY,
-    fileIconCache: newFileIconCache,
     visibleItems,
-    scrollBarHeight
+    expandedGroups,
+    minLineY,
+    maxLineY
   };
 };
 
 const handleClickDirectory = async (state, item) => {
-  const isExpanded = true;
-  return updateVisibleItems(state, isExpanded);
+  const {
+    expandedGroups
+  } = state;
+  const newExpandedGroups = {
+    ...expandedGroups,
+    [item.groupId]: true
+  };
+  return updateVisibleItems(state, newExpandedGroups);
 };
 
 const handleClickDirectoryExpanded = async (state, item) => {
-  const isExpanded = false;
-  return updateVisibleItems(state, isExpanded);
+  const {
+    expandedGroups
+  } = state;
+  const newExpandedGroups = {
+    ...expandedGroups,
+    [item.groupId]: false
+  };
+  return updateVisibleItems(state, newExpandedGroups);
 };
 
 const readFile = async (uri, encoding = 'utf8') => {
@@ -1666,9 +1688,9 @@ const selectIndex = async (state, index) => {
   const item = items[index];
   switch (item.type) {
     case Directory:
-      return handleClickDirectory(state);
+      return handleClickDirectory(state, item);
     case DirectoryExpanded:
-      return handleClickDirectoryExpanded(state);
+      return handleClickDirectoryExpanded(state, item);
     case File:
       return handleClickFile(state, item);
     default:
@@ -2261,14 +2283,14 @@ const saveState = uid => {
   const {
     root,
     maxLineY,
-    isExpanded
+    expandedGroups
   } = newState;
   return {
     root,
     minLineY: 0,
     maxLineY,
     deltaY: 0,
-    isExpanded
+    expandedGroups
   };
 };