@lvce-editor/main-area-worker 1.1.0 → 1.2.0

package/dist/mainAreaWorkerMain.js

@@ -508,7 +508,7 @@ const IpcParentWithMessagePort$1 = {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$3 = id => {
+const get$2 = id => {
   return callbacks[id];
 };
 const remove$1 = id => {
@@ -657,7 +657,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$3(id);
+  const fn = get$2(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -1028,12 +1028,9 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const Button$1 = 'button';
-
 const Button = 1;
 const Div = 4;
 const Span = 8;
-const Text = 12;
 const Pre = 51;
 
 const TargetName = 'event.target.name';
@@ -1047,7 +1044,7 @@ const rpcs = Object.create(null);
 const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$2 = id => {
+const get$1 = id => {
   return rpcs[id];
 };
 const remove = id => {
@@ -1058,18 +1055,18 @@ const remove = id => {
 const create$2 = rpcId => {
   return {
     async dispose() {
-      const rpc = get$2(rpcId);
+      const rpc = get$1(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$2(rpcId);
+      const rpc = get$1(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$2(rpcId);
+      const rpc = get$1(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1092,12 +1089,10 @@ const create$2 = rpcId => {
 };
 
 const {
-  invoke: invoke$1,
   set: set$2
 } = create$2(ExtensionHostWorker);
 
 const {
-  invoke,
   invokeAndTransfer,
   set: set$1
 } = create$2(RendererWorker);
@@ -1105,12 +1100,6 @@ const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
 };
-const activateByEvent$1 = (event, assetDir, platform) => {
-  return invoke('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
-};
-const getPreference = async key => {
-  return await invoke('Preferences.get', key);
-};
 
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
@@ -1198,11 +1187,11 @@ const terminate = () => {
 };
 
 const {
-  get: get$1,
-  getCommandIds: getCommandIds$1,
-  registerCommands: registerCommands$1,
+  get,
+  getCommandIds,
+  registerCommands,
   set,
-  wrapCommand: wrapCommand$1} = create$1();
+  wrapCommand} = create$1();
 
 const create = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
@@ -1216,7 +1205,7 @@ const create = (uid, uri, x, y, width, height, platform, assetDir) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.statusBarItemsLeft === newState.statusBarItemsLeft && oldState.statusBarItemsRight === newState.statusBarItemsRight;
+  return oldState.layout === newState.layout;
 };
 
 const RenderItems = 4;
@@ -1239,65 +1228,15 @@ const diff2 = uid => {
   const {
     newState,
     oldState
-  } = get$1(uid);
+  } = get(uid);
   const result = diff(oldState, newState);
   return result;
 };
 
-const getMatchingItem = (itemsLeft, itemsRight, name) => {
-  for (const item of itemsLeft) {
-    if (item.name === name) {
-      return item;
-    }
-  }
-  for (const item of itemsRight) {
-    if (item.name === name) {
-      return item;
-    }
-  }
-  return undefined;
-};
-
-const handleClickExtensionStatusBarItem = async name => {
-  // @ts-ignore
-  await invoke$1(`ExtensionHostStatusBar.executeCommand`, name);
-};
-
-const handleClickNotification = async () => {
-  // TODO toggle notifications
-};
-
-const handleClickProblems = async () => {
-  // @ts-ignore
-  await invoke('Layout.showPanel');
-  // @ts-ignore
-  await invoke('Panel.toggleView', 'Problems');
-};
-
-const Notifications = 'Notifications';
-const Problems = 'Problems';
-
 const handleClick = async (state, name) => {
   if (!name) {
     return state;
   }
-  const {
-    statusBarItemsLeft,
-    statusBarItemsRight
-  } = state;
-  const item = getMatchingItem(statusBarItemsLeft, statusBarItemsRight, name);
-  if (!item) {
-    return state;
-  }
-  if (item.name === Notifications) {
-    await handleClickNotification();
-  } else if (item.name === Problems) {
-    await handleClickProblems();
-  } else {
-    await handleClickExtensionStatusBarItem(name);
-  }
-  // TODO
-  // sendExtensionWorker([/* statusBarItemHandleClick */ 7657, /* name */ name])
   return state;
 };
 
@@ -1323,282 +1262,14 @@ const initialize = async () => {
   set$2(rpc);
 };
 
-const getIndex = (items, item) => {
-  for (let i = 0; i < items.length; i++) {
-    if (items[i].name === item.name) {
-      return i;
-    }
-  }
-  return -1;
-};
-
-const updateArray = (items, newItem) => {
-  const index = getIndex(items, newItem);
-  const before = items.slice(0, index);
-  const after = items.slice(index + 1);
-  return [...before, newItem, ...after];
-};
-
-const itemLeftUpdate = (state, newItem) => {
-  return {
-    ...state,
-    statusBarItemsLeft: updateArray([...state.statusBarItemsLeft], newItem)
-  };
-};
-
-const itemRightCreate = (state, newItem) => {
-  const {
-    statusBarItemsRight
-  } = state;
-  const newStatusBarItemsRight = [...statusBarItemsRight, newItem];
-  return {
-    ...state,
-    statusBarItemsRight: newStatusBarItemsRight
-  };
-};
-
-const itemRightUpdate = (state, newItem) => {
-  const {
-    statusBarItemsRight
-  } = state;
-  const newStatusBarItemsRight = updateArray([...statusBarItemsRight], newItem);
-  return {
-    ...state,
-    statusBarItemsRight: newStatusBarItemsRight
-  };
-};
-
-const ProblemsErrorIcon = 'ProblemsErrorIcon';
-const ProblemsWarningIcon = 'ProblemsWarningIcon';
-const StatusBarItem = 'StatusBarItem';
-const StatusBarItemsLeft = 'StatusBarItemsLeft';
-const StatusBarItemsRight = 'StatusBarItemsRight';
-
-const OnStatusBarItem = 'onStatusBarItem';
-
-const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
-
-const activateByEvent = (event, assetDir, platform) => {
-  // @ts-ignore
-  return activateByEvent$1(event, assetDir, platform);
-};
-
-const executeProviders = async ({
-  assetDir,
-  combineResults,
-  event,
-  method,
-  noProviderFoundMessage = 'No provider found',
-  noProviderFoundResult,
-  params,
-  platform
-}) => {
-  await activateByEvent(event, assetDir, platform);
-  // @ts-ignore
-  const result = await invoke$1(method, ...params);
-  return result;
-};
-
-const combineResults = results => {
-  return results.flat();
-};
-const getStatusBarItems$1 = (assetDir, platform) => {
-  return executeProviders({
-    assetDir,
-    combineResults,
-    event: OnStatusBarItem,
-    method: GetStatusBarItems,
-    noProviderFoundMessage: 'No status bar item provider found',
-    noProviderFoundResult: [],
-    params: [],
-    platform
-  });
-};
-
-const toStatusBarItem = uiStatusBarItem => {
-  const elements = [];
-  if (uiStatusBarItem.icon) {
-    elements.push({
-      type: 'icon',
-      value: uiStatusBarItem.icon
-    });
-  }
-  if (uiStatusBarItem.text) {
-    elements.push({
-      type: 'text',
-      value: uiStatusBarItem.text
-    });
-  }
-  if (elements.length === 0) {
-    elements.push({
-      type: 'text',
-      value: ''
-    });
-  }
-  return {
-    command: uiStatusBarItem.command || undefined,
-    elements,
-    name: uiStatusBarItem.name,
-    tooltip: uiStatusBarItem.tooltip
-  };
-};
-
-const toUiStatusBarItem = extensionHostStatusBarItem => {
-  return {
-    command: extensionHostStatusBarItem.command || '',
-    icon: extensionHostStatusBarItem.icon || '',
-    name: extensionHostStatusBarItem.id || extensionHostStatusBarItem.name || '',
-    text: extensionHostStatusBarItem.text || '',
-    tooltip: extensionHostStatusBarItem.tooltip || ''
-  };
-};
-
-const toUiStatusBarItems = statusBarItems => {
-  if (!statusBarItems) {
-    return [];
-  }
-  return statusBarItems.map(toUiStatusBarItem);
-};
-
-const getStatusBarItems = async (showItems, assetDir, platform) => {
-  if (!showItems) {
-    return [];
-  }
-  await activateByEvent('onSourceControl', assetDir, platform);
-  const extensionStatusBarItems = await getStatusBarItems$1(assetDir, platform);
-  const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
-  const extraItems = [{
-    command: undefined,
-    elements: [{
-      type: 'text',
-      value: 'Notifications'
-    }],
-    name: Notifications,
-    tooltip: ''
-  }, {
-    command: undefined,
-    elements: [{
-      type: 'icon',
-      value: ProblemsErrorIcon
-    }, {
-      type: 'text',
-      value: '0'
-    }, {
-      type: 'icon',
-      value: ProblemsWarningIcon
-    }, {
-      type: 'text',
-      value: '0'
-    }],
-    name: Problems,
-    tooltip: ''
-  }];
-  return [...uiStatusBarItems.map(toStatusBarItem), ...extraItems];
-};
-
-const get = async key => {
-  return getPreference(key);
-};
-
-const itemsVisible = async () => {
-  const statusBarItemsPreference = (await get('statusBar.itemsVisible')) ?? true;
-  return statusBarItemsPreference;
-};
-
 const loadContent = async state => {
-  const {
-    assetDir,
-    platform
-  } = state;
-  const statusBarItemsPreference = await itemsVisible();
-  const statusBarItems = await getStatusBarItems(statusBarItemsPreference, assetDir, platform);
-  return {
-    ...state,
-    statusBarItemsLeft: [...statusBarItems],
-    statusBarItemsRight: []
-  };
-};
-
-const text = data => {
   return {
-    childCount: 0,
-    text: data,
-    type: Text
+    ...state
   };
 };
 
-const HandleClick = 11;
-
-const getElementVirtualDom = element => {
-  if (element.type === 'text') {
-    return [text(element.value)];
-  }
-  if (element.type === 'icon') {
-    return [{
-      childCount: 0,
-      className: element.value,
-      type: Div
-    }];
-  }
-  return [];
-};
-const getStatusBarItemVirtualDom = statusBarItem => {
-  const {
-    elements,
-    name,
-    tooltip
-  } = statusBarItem;
-  const elementNodes = elements.flatMap(getElementVirtualDom);
-  return [{
-    childCount: elementNodes.length,
-    className: StatusBarItem,
-    name,
-    role: Button$1,
-    tabIndex: -1,
-    title: tooltip,
-    type: Button
-  }, ...elementNodes];
-};
-
-const getStatusBarItemsVirtualDom = (items, className) => {
-  if (items.length === 0) {
-    return [];
-  }
-  return [{
-    childCount: items.length,
-    className,
-    type: Div
-  }, ...items.flatMap(getStatusBarItemVirtualDom)];
-};
-
-const getChildCount = (leftCount, rightCount) => {
-  let count = 0;
-  if (leftCount > 0) {
-    count++;
-  }
-  if (rightCount > 0) {
-    count++;
-  }
-  return count;
-};
-const getStatusBarVirtualDom = (statusBarItemsLeft, statusBarItemsRight) => {
-  const dom = [{
-    childCount: getChildCount(statusBarItemsLeft.length, statusBarItemsRight.length),
-    className: 'StatusBar',
-    onClick: HandleClick,
-    type: Div
-  }, ...getStatusBarItemsVirtualDom(statusBarItemsLeft, StatusBarItemsLeft), ...getStatusBarItemsVirtualDom(statusBarItemsRight, StatusBarItemsRight)];
-  return dom;
-};
-
 const renderItems = (oldState, newState) => {
-  const {
-    statusBarItemsLeft,
-    statusBarItemsRight,
-    uid
-  } = newState;
-  const dom = getStatusBarVirtualDom(statusBarItemsLeft, statusBarItemsRight);
-  return [SetDom2, uid, dom];
+  return [SetDom2, newState.uid, []];
 };
 
 const getRenderer = diffType => {
@@ -1626,12 +1297,14 @@ const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
-  } = get$1(uid);
+  } = get(uid);
   set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
+const HandleClick = 11;
+
 const renderEventListeners = () => {
   return [{
     name: HandleClick,
@@ -1648,7 +1321,7 @@ const resize = (state, dimensions) => {
 
 const saveState = uid => {
   number(uid);
-  const value = get$1(uid);
+  const value = get(uid);
   const {
     newState
   } = value;
@@ -1663,24 +1336,21 @@ const saveState = uid => {
 };
 
 const commandMap = {
-  'StatusBar.create': create,
-  'StatusBar.diff2': diff2,
-  'StatusBar.getCommandIds': getCommandIds$1,
-  'StatusBar.handleClick': wrapCommand$1(handleClick),
-  'StatusBar.initialize': initialize,
-  'StatusBar.itemLeftUpdate': wrapCommand$1(itemLeftUpdate),
-  'StatusBar.itemRightCreate': wrapCommand$1(itemRightCreate),
-  'StatusBar.itemRightUpdate': wrapCommand$1(itemRightUpdate),
-  'StatusBar.loadContent': wrapCommand$1(loadContent),
-  'StatusBar.render2': render2,
-  'StatusBar.renderEventListeners': renderEventListeners,
-  'StatusBar.resize': wrapCommand$1(resize),
-  'StatusBar.saveState': saveState,
-  'StatusBar.terminate': terminate
+  'MainArea.create': create,
+  'MainArea.diff2': diff2,
+  'MainArea.getCommandIds': getCommandIds,
+  'MainArea.handleClick': wrapCommand(handleClick),
+  'MainArea.initialize': initialize,
+  'MainArea.loadContent': wrapCommand(loadContent),
+  'MainArea.render2': render2,
+  'MainArea.renderEventListeners': renderEventListeners,
+  'MainArea.resize': wrapCommand(resize),
+  'MainArea.saveState': saveState,
+  'MainArea.terminate': terminate
 };
 
 const listen = async () => {
-  registerCommands$1(commandMap);
+  registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
@@ -2176,11 +1846,6 @@ const endTabDrag = (state, dragState) => {
   return state;
 };
 
-const {
-  getCommandIds,
-  registerCommands,
-  wrapCommand} = create$1();
-
 const openTab = (state, groupId, tab) => {
   const newTab = {
     ...tab,

package/package.json

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