@lvce-editor/main-area-worker 1.3.0 → 1.5.0

package/dist/mainAreaWorkerMain.js

@@ -90,12 +90,24 @@ const getType = value => {
       return Unknown;
   }
 };
+const object = value => {
+  const type = getType(value);
+  if (type !== Object$1) {
+    throw new AssertionError('expected value to be of type object');
+  }
+};
 const number = value => {
   const type = getType(value);
   if (type !== Number$1) {
     throw new AssertionError('expected value to be of type number');
   }
 };
+const string = value => {
+  const type = getType(value);
+  if (type !== String) {
+    throw new AssertionError('expected value to be of type string');
+  }
+};
 
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
@@ -450,7 +462,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5 = async ({
+const create$5$1 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -501,7 +513,7 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5,
+  create: create$5$1,
   signal: signal$1,
   wrap: wrap$5
 };
@@ -720,7 +732,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$2(id, errorProperty);
 };
-const create$3 = (message, result) => {
+const create$5 = (message, result) => {
   return {
     jsonrpc: Two$1,
     id: message.id,
@@ -729,7 +741,7 @@ const create$3 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$3(message, resultProperty);
+  return create$5(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -1053,7 +1065,7 @@ const remove = id => {
 };
 
 /* eslint-disable  @typescript-eslint/explicit-function-return-type */
-const create$2 = rpcId => {
+const create$3 = rpcId => {
   return {
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1091,12 +1103,12 @@ const create$2 = rpcId => {
 
 const {
   set: set$2
-} = create$2(ExtensionHostWorker);
+} = create$3(ExtensionHostWorker);
 
 const {
   invokeAndTransfer,
   set: set$1
-} = create$2(RendererWorker);
+} = create$3(RendererWorker);
 const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
@@ -1106,7 +1118,7 @@ const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
 };
-const create$1 = () => {
+const create$2 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
@@ -1192,14 +1204,17 @@ const {
   getCommandIds,
   registerCommands,
   set,
-  wrapCommand} = create$1();
+  wrapCommand} = create$2();
 
-const create = (uid, uri, x, y, width, height, platform, assetDir) => {
+const create$1 = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
     assetDir,
+    layout: {
+      activeGroupId: '',
+      direction: 'horizontal',
+      groups: []
+    },
     platform,
-    statusBarItemsLeft: [],
-    statusBarItemsRight: [],
     uid
   };
   set(uid, state, state);
@@ -1241,6 +1256,11 @@ const handleClick = async (state, name) => {
   return state;
 };
 
+const handleClickCloseTab = (state, groupId, tabId) => {
+  // TODO
+  return state;
+};
+
 const id = 7201;
 const sendMessagePortToExtensionHostWorker = async port => {
   await sendMessagePortToExtensionHostWorker$1(port, id);
@@ -1294,6 +1314,266 @@ const loadContent = async state => {
   };
 };
 
+let idCounter = 0;
+const create = () => {
+  idCounter++;
+  return idCounter;
+};
+
+const getTitle = (uri, homeDir) => {
+  if (!uri) {
+    return '';
+  }
+  return uri;
+};
+const getLabel = uri => {
+  if (uri.startsWith('settings://')) {
+    return 'Settings';
+  }
+  if (uri.startsWith('simple-browser://')) {
+    return 'Simple Browser';
+  }
+  return uri;
+  // return Workspace.pathBaseName(uri)
+};
+
+/**
+ *
+ * @param {string} uri
+ * @returns
+ */
+const getFileIcon = uri => {
+  if (uri === 'app://keybindings') {
+    return `MaskIconRecordKey`;
+  }
+  if (uri.startsWith('extension-detail://')) {
+    return `MaskIconExtensions`;
+  }
+  return '';
+};
+
+const Preview = 1 << 4;
+
+// @ts-nocheck
+
+const focusIndex = async (state, index) => {
+  const {
+    activeGroupIndex,
+    groups,
+    tabHeight,
+    uid
+  } = state;
+  const group = groups[activeGroupIndex];
+  const {
+    editors
+  } = group;
+  const oldActiveIndex = group.activeIndex;
+  if (index === oldActiveIndex) {
+    return {
+      commands: [],
+      newState: state
+    };
+  }
+  const newGroup = {
+    ...group,
+    activeIndex: index
+  };
+  const newGroups = [...groups.slice(0, activeGroupIndex), newGroup, ...groups.slice(activeGroupIndex + 1)];
+  const newState = {
+    ...state,
+    groups: newGroups
+  };
+  const editor = editors[index];
+  const {
+    x
+  } = group;
+  const y = group.y + tabHeight;
+  const {
+    width
+  } = group;
+  const contentHeight = group.height - tabHeight;
+  const id = await ViewletMap.getModuleId(editor.uri);
+  const oldEditor = editors[oldActiveIndex];
+  const oldId = await ViewletMap.getModuleId(oldEditor.uri);
+  // @ts-ignore
+  ViewletStates.getInstance(oldId);
+  const previousUid = oldEditor.uid;
+  number(previousUid);
+  const disposeCommands = Viewlet.disposeFunctional(previousUid);
+  const maybeHiddenEditorInstance = ViewletStates.getInstance(editor.uid);
+  if (maybeHiddenEditorInstance) {
+    const commands = Viewlet.showFunctional(editor.uid);
+    const allCommands = [...disposeCommands, ...commands];
+    return {
+      commands: allCommands,
+      newState
+    };
+  }
+  const instanceUid = create();
+  const instance = ViewletManager.create(ViewletModule.load, id, uid, editor.uri, x, y, width, contentHeight);
+  instance.show = false;
+  instance.setBounds = false;
+  instance.uid = instanceUid;
+  editor.uid = instanceUid;
+  const resizeCommands = ['Viewlet.setBounds', instanceUid, x, tabHeight, width, contentHeight];
+
+  // @ts-ignore
+  const commands = await ViewletManager.load(instance);
+  // @ts-ignore
+  commands.unshift(...disposeCommands);
+  // @ts-ignore
+  commands.push(resizeCommands);
+  // @ts-ignore
+  commands.push(['Viewlet.append', uid, instanceUid]);
+  return {
+    commands,
+    newState
+  };
+};
+
+// @ts-nocheck
+const openUri = async (state, uri, focus = true, {
+  preview = false,
+  ...context
+} = {}) => {
+  object(state);
+  string(uri);
+  const {
+    activeGroupIndex,
+    groups,
+    tabFontFamily,
+    tabFontSize,
+    tabFontWeight,
+    tabHeight,
+    tabLetterSpacing
+  } = state;
+  const {
+    x
+  } = state;
+  const y = state.y + tabHeight;
+  const {
+    width
+  } = state;
+  const contentHeight = state.height - tabHeight;
+  // @ts-ignore
+  const moduleId = await ViewletMap.getModuleId(uri, context.opener);
+  let activeGroup = groups[activeGroupIndex];
+  activeGroup ||= {
+    activeIndex: -1,
+    editors: [],
+    focusedIndex: -1,
+    height: state.height,
+    tabsUid: create(),
+    uid: create(),
+    width,
+    x,
+    y: 0
+  };
+  const {
+    activeIndex,
+    editors
+  } = activeGroup;
+  const previousEditor = editors[activeIndex];
+  let disposeCommands;
+  // @ts-ignore
+  if (previousEditor && previousEditor.uri === uri && previousEditor.opener === context.opener) {
+    return {
+      commands: [],
+      newState: state
+    };
+  }
+  for (let i = 0; i < editors.length; i++) {
+    const editor = editors[i];
+    if (editor.uri === uri &&
+    // @ts-ignore
+    editor.opener === context.opener) {
+      return focusIndex(state, i);
+    }
+  }
+  // TODO editor needs to be disposed when closing
+  //  other tabs and closing all tabs
+  if (previousEditor) {
+    const previousUid = previousEditor.uid;
+    disposeCommands = Viewlet.hideFunctional(previousUid);
+  }
+  const instanceUid = create();
+  const instance = ViewletManager.create(ViewletModule.load, moduleId, state.uid, uri, activeGroup.x, y, activeGroup.width, contentHeight);
+  instance.uid = instanceUid;
+  // const oldActiveIndex = state.activeIndex
+  const tabLabel = getLabel(uri);
+  const tabWidth = MeasureTabWidth.measureTabWidth(tabLabel, tabFontWeight, tabFontSize, tabFontFamily, tabLetterSpacing);
+  const tabTitle = getTitle(uri);
+  const icon = getFileIcon(uri);
+  const newEditor = {
+    flags: Preview,
+    icon,
+    label: tabLabel,
+    moduleId,
+    tabWidth,
+    title: tabTitle,
+    uid: instanceUid,
+    uri
+  };
+  const newEditors = [...activeGroup.editors, newEditor];
+  const newActiveIndex = newEditors.length - 1;
+  const newGroup = {
+    ...activeGroup,
+    activeIndex: newActiveIndex,
+    editors: newEditors
+  };
+  const newGroups = [...groups.slice(0, activeGroupIndex), newGroup, ...groups.slice(activeGroupIndex + 1)];
+  // @ts-ignore
+  instance.show = false;
+  instance.setBounds = false;
+  ViewletStates.setState(state.uid, {
+    ...state,
+    activeGroupIndex: 0,
+    groups: newGroups,
+    pendingUid: instanceUid
+  });
+  if (context) {
+    instance.args = [context];
+  }
+  // @ts-ignore
+  const commands = await ViewletManager.load(instance, focus);
+  commands.push(['Viewlet.setBounds', instanceUid, activeGroup.x, tabHeight, activeGroup.width, contentHeight]);
+  let {
+    tabsUid
+  } = state;
+  if (tabsUid === -1) {
+    tabsUid = create();
+  }
+  if (disposeCommands) {
+    commands.push(...disposeCommands);
+  }
+  commands.push(['Viewlet.append', state.uid, instanceUid]);
+  if (focus) {
+    commands.push(['Viewlet.focus', instanceUid]);
+  }
+  const latestState = ViewletStates.getState(state.uid);
+  const latestPendingUid = latestState.pendingUid;
+  if (latestPendingUid !== instanceUid) {
+    return {
+      commands: [],
+      newState: state
+    };
+  }
+  if (!ViewletStates.hasInstance(instanceUid)) {
+    return {
+      commands,
+      newState: state
+    };
+  }
+  return {
+    commands,
+    newState: {
+      ...state,
+      groups: newGroups,
+      tabsUid
+    }
+  };
+};
+
 const text = data => {
   return {
     childCount: 0,
@@ -1303,77 +1583,71 @@ const text = data => {
 };
 
 const CSS_CLASSES = {
-  CUSTOM_EDITOR: 'custom-editor',
-  EDITOR_CONTAINER: 'editor-container',
-  EDITOR_CONTENT: 'editor-content',
-  EDITOR_GROUP: 'editor-group',
-  EDITOR_GROUP_FOCUSED: 'focused',
-  EDITOR_GROUPS_CONTAINER: 'editor-groups-container',
-  MAIN_AREA: 'main-area',
-  TAB: 'tab',
-  TAB_ACTIVE: 'active',
-  TAB_BAR: 'tab-bar',
-  TAB_CLOSE: 'tab-close',
-  TAB_TITLE: 'tab-title',
-  TEXT_EDITOR: 'text-editor'
+  EDITOR_GROUPS_CONTAINER: 'editor-groups-container'};
+
+const renderEditor = tab => {
+  if (!tab) {
+    return [text('Tab not found')];
+  }
+  if (tab.editorType === 'custom') {
+    return [{
+      childCount: 1,
+      className: 'CustomEditor',
+      type: Div
+    }, text(`Custom Editor: ${tab.customEditorId}`)];
+  }
+  return [{
+    childCount: 1,
+    className: 'TextEditor',
+    type: Div
+  }, {
+    childCount: 1,
+    className: 'EditorContent',
+    type: Pre
+  }, text(tab.content || '')];
 };
 
 const renderTab = (tab, isActive) => {
   return [{
     childCount: 2,
-    className: `${CSS_CLASSES.TAB} ${isActive ? CSS_CLASSES.TAB_ACTIVE : ''}`,
+    className: isActive ? 'MainTab MainTabActive' : 'MainTab',
     type: Div
   }, {
     childCount: 1,
-    className: CSS_CLASSES.TAB_TITLE,
+    className: 'TabTitle',
     type: Span
   }, text(tab.isDirty ? `*${tab.title}` : tab.title), {
     childCount: 1,
-    className: CSS_CLASSES.TAB_CLOSE,
+    className: 'EditorTabCloseButton',
     type: Button
   }, text('×')];
 };
+
 const renderTabBar = group => {
   return [{
     childCount: group.tabs.length,
-    className: CSS_CLASSES.TAB_BAR,
+    className: 'MainTabs',
     type: Div
   }, ...group.tabs.flatMap(tab => renderTab(tab, tab.id === group.activeTabId))];
 };
-const renderEditor = tab => {
-  if (tab.editorType === 'custom') {
-    return [{
-      childCount: 1,
-      className: CSS_CLASSES.CUSTOM_EDITOR,
-      type: Div
-    }, text(`Custom Editor: ${tab.customEditorId}`)];
-  }
-  return [{
-    childCount: 1,
-    className: CSS_CLASSES.TEXT_EDITOR,
-    type: Div
-  }, {
-    childCount: 1,
-    className: CSS_CLASSES.EDITOR_CONTENT,
-    type: Pre
-  }, text(tab.content || '')];
-};
+
 const renderEditorGroup = group => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
   return [{
     childCount: 2,
-    className: `${CSS_CLASSES.EDITOR_GROUP} ${group.focused ? CSS_CLASSES.EDITOR_GROUP_FOCUSED : ''}`,
+    className: 'EditorGroup',
     type: Div
   }, ...renderTabBar(group), {
     childCount: activeTab ? 1 : 1,
-    className: CSS_CLASSES.EDITOR_CONTAINER,
+    className: 'EditorContainer',
     type: Div
   }, ...renderEditor(activeTab)];
 };
+
 const getMainAreaVirtualDom = layout => {
   return [{
     childCount: 1,
-    className: CSS_CLASSES.MAIN_AREA,
+    className: 'Main',
     type: Div
   }, {
     childCount: layout.groups.length,
@@ -1423,11 +1697,15 @@ const render2 = (uid, diffResult) => {
 };
 
 const HandleClick = 11;
+const HandleClickClose = 12;
 
 const renderEventListeners = () => {
   return [{
     name: HandleClick,
     params: ['handleClick', TargetName]
+  }, {
+    name: HandleClickClose,
+    params: ['handleClickClose', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
   }];
 };
 
@@ -1455,12 +1733,14 @@ const saveState = uid => {
 };
 
 const commandMap = {
-  'MainArea.create': create,
+  'MainArea.create': create$1,
   'MainArea.diff2': diff2,
   'MainArea.getCommandIds': getCommandIds,
   'MainArea.handleClick': wrapCommand(handleClick),
+  'MainArea.handleClickCloseTab': wrapCommand(handleClickCloseTab),
   'MainArea.initialize': initialize,
   'MainArea.loadContent': wrapCommand(loadContent),
+  'MainArea.openUri': wrapCommand(openUri),
   'MainArea.render2': render2,
   'MainArea.renderEventListeners': renderEventListeners,
   'MainArea.resize': wrapCommand(resize),

package/package.json

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