@lvce-editor/editor-worker 8.2.0 → 8.4.0

package/dist/editorWorkerMain.js

@@ -545,7 +545,7 @@ const set$d = (id, fn) => {
 const get$7 = id => {
   return callbacks[id];
 };
-const remove$8 = id => {
+const remove$9 = id => {
   delete callbacks[id];
 };
 let id = 0;
@@ -730,7 +730,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove$8(id);
+  remove$9(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -1063,12 +1063,6 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const DebugWorker = 55;
-const EditorWorker = 99;
-const ExtensionHostWorker = 44;
-const MarkdownWorker = 300;
-const RendererWorker$1 = 1;
-
 const CodeGenerator = 1;
 const ColorPicker$1 = 2;
 const Completion = 3;
@@ -1078,6 +1072,12 @@ const Hover = 6;
 const Rename$1 = 7;
 const SourceAction$1 = 8;
 
+const DebugWorker = 55;
+const EditorWorker = 99;
+const ExtensionHostWorker = 44;
+const MarkdownWorker = 300;
+const RendererWorker$1 = 1;
+
 const rpcs = Object.create(null);
 const set$c = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1085,6 +1085,9 @@ const set$c = (id, rpc) => {
 const get$6 = id => {
   return rpcs[id];
 };
+const remove$8 = id => {
+  delete rpcs[id];
+};
 
 const create$9 = rpcId => {
   return {
@@ -1114,7 +1117,7 @@ const {
   invoke: invoke$b,
   invokeAndTransfer: invokeAndTransfer$3,
   set: set$b,
-  dispose: dispose$2
+  dispose: dispose$3
 } = create$9(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
@@ -1138,7 +1141,7 @@ const registerMockRpc$1 = commandMap => {
 
 const ExtensionHost = {
   __proto__: null,
-  dispose: dispose$2,
+  dispose: dispose$3,
   executeFileReferenceProvider,
   executeReferenceProvider,
   getRuntimeStatus,
@@ -1152,7 +1155,7 @@ const {
   invoke: invoke$a,
   invokeAndTransfer: invokeAndTransfer$2,
   set: set$a,
-  dispose: dispose$1
+  dispose: dispose$2
 } = create$9(RendererWorker$1);
 const searchFileHtml = async uri => {
   return invoke$a('ExtensionHost.searchFileWithHtml', uri);
@@ -1424,7 +1427,7 @@ const RendererWorker = {
   closeWidget,
   confirm,
   disableExtension,
-  dispose: dispose$1,
+  dispose: dispose$2,
   enableExtension,
   getActiveEditorId,
   getAllExtensions,
@@ -1501,12 +1504,12 @@ const {
   invoke: invoke$9,
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$9,
-  dispose
+  dispose: dispose$1
 } = create$9(MarkdownWorker);
 
 const SyntaxHighlightingWorker = {
   __proto__: null,
-  dispose,
+  dispose: dispose$1,
   invoke: invoke$9,
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$9
@@ -1573,15 +1576,15 @@ const launchColorPickerWorker = async () => {
   return launchWorker(name, url);
 };
 
-let workerPromise$4;
-const getOrCreate$5 = () => {
-  if (!workerPromise$4) {
-    workerPromise$4 = launchColorPickerWorker();
+let workerPromise$3;
+const getOrCreate$4 = () => {
+  if (!workerPromise$3) {
+    workerPromise$3 = launchColorPickerWorker();
   }
-  return workerPromise$4;
+  return workerPromise$3;
 };
 const invoke$7 = async (method, ...params) => {
-  const worker = await getOrCreate$5();
+  const worker = await getOrCreate$4();
   return await worker.invoke(method, ...params);
 };
 
@@ -2005,7 +2008,7 @@ const createMeasureContext = () => {
 const state$8 = {
   ctx: undefined
 };
-const getOrCreate$4 = createCtx => {
+const getOrCreate$3 = createCtx => {
   if (state$8.ctx) {
     return state$8.ctx;
   }
@@ -2014,7 +2017,7 @@ const getOrCreate$4 = createCtx => {
 };
 
 const getContext = () => {
-  const ctx = getOrCreate$4(createMeasureContext);
+  const ctx = getOrCreate$3(createMeasureContext);
   return ctx;
 };
 
@@ -3338,15 +3341,15 @@ const launchRenameWorker = async () => {
   return rpc;
 };
 
-let workerPromise$3;
-const getOrCreate$3 = () => {
-  if (!workerPromise$3) {
-    workerPromise$3 = launchRenameWorker();
+let workerPromise$2;
+const getOrCreate$2 = () => {
+  if (!workerPromise$2) {
+    workerPromise$2 = launchRenameWorker();
   }
-  return workerPromise$3;
+  return workerPromise$2;
 };
 const invoke$5 = async (method, ...params) => {
-  const worker = await getOrCreate$3();
+  const worker = await getOrCreate$2();
   return await worker.invoke(method, ...params);
 };
 
@@ -5605,15 +5608,15 @@ const launchCompletionWorker = async () => {
   return rpc;
 };
 
-let workerPromise$2;
-const getOrCreate$2 = () => {
-  if (!workerPromise$2) {
-    workerPromise$2 = launchCompletionWorker();
+let workerPromise$1;
+const getOrCreate$1 = () => {
+  if (!workerPromise$1) {
+    workerPromise$1 = launchCompletionWorker();
   }
-  return workerPromise$2;
+  return workerPromise$1;
 };
 const invoke$4 = async (method, ...params) => {
-  const worker = await getOrCreate$2();
+  const worker = await getOrCreate$1();
   return await worker.invoke(method, ...params);
 };
 
@@ -5677,16 +5680,29 @@ const launchFindWidgetWorker = async () => {
   return launchWorker(name, url);
 };
 
-let workerPromise$1;
-const getOrCreate$1 = () => {
-  if (!workerPromise$1) {
-    workerPromise$1 = launchFindWidgetWorker();
+const rpcId = 9002;
+const launch = async () => {
+  // TODO race condition
+  if (get$6(rpcId)) {
+    return;
   }
-  return workerPromise$1;
+  const rpc = await launchFindWidgetWorker();
+  set$c(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
-  const worker = await getOrCreate$1();
-  return await worker.invoke(method, ...params);
+  const rpc = get$6(rpcId);
+  return await rpc.invoke(method, ...params);
+};
+const dispose = async () => {
+  const rpc = get$6(rpcId);
+  remove$8(rpcId);
+  if (rpc) {
+    await rpc.dispose();
+  }
+  // const oldPromise = workerPromise
+  // workerPromise = undefined
+  // const rpc = await oldPromise
+  // await rpc.dispose()
 };
 
 const getEditor = editorUid => {
@@ -5711,6 +5727,7 @@ const loadContent$1 = async (state, parentUid) => {
     width,
     height
   } = editor;
+  await launch();
   await invoke$3('FindWidget.create', uid, x, y, width, height, parentUid);
   await invoke$3('FindWidget.loadContent', uid);
   const diff = await invoke$3('FindWidget.diff2', uid);
@@ -5726,7 +5743,7 @@ const newStateGenerator$3 = (state, parentUid) => {
 };
 const openFind2 = async editor => {
   const fullFocus = true;
-  return addWidgetToEditor(ColorPicker$1, FindWidget, editor, create$3, newStateGenerator$3, fullFocus);
+  return addWidgetToEditor(Find, FindWidget, editor, create$3, newStateGenerator$3, fullFocus);
 };
 
 const openFind = async state => {
@@ -8092,9 +8109,12 @@ const {
   replace,
   replaceAll,
   toggleMatchCase,
+  toggleMatchWholeWord,
   toggleReplace,
-  toggleUseRegularExpression
-} = createFns(['close', 'focusCloseButton', 'focusFind', 'focusNext', 'focusNextMatchButton', 'focusPrevious', 'focusPreviousMatchButton', 'focusReplace', 'focusReplaceAllButton', 'focusReplaceButton', 'focusToggleReplace', 'handleBlur', 'handleClickButton', 'handleFocus', 'handleInput', 'handleReplaceFocus', 'handleReplaceInput', 'handleToggleReplaceFocus', 'replace', 'replaceAll', 'toggleMatchCase', 'toggleReplace', 'toggleUseRegularExpression'], 'FindWidget', Find);
+  toggleUseRegularExpression,
+  focusNextElement,
+  focusPreviousElement
+} = createFns(['close', 'focusCloseButton', 'focusFind', 'focusNext', 'focusNextMatchButton', 'focusPrevious', 'focusPreviousMatchButton', 'focusReplace', 'focusReplaceAllButton', 'focusReplaceButton', 'focusToggleReplace', 'handleBlur', 'handleClickButton', 'handleFocus', 'handleInput', 'handleReplaceFocus', 'handleReplaceInput', 'handleToggleReplaceFocus', 'replace', 'replaceAll', 'toggleMatchCase', 'toggleMatchWholeWord', 'toggleReplace', 'toggleUseRegularExpression', 'focusNextElement', 'focusPreviousElement'], 'FindWidget', Find);
 
 const EditorFindWidget = {
   __proto__: null,
@@ -8103,8 +8123,10 @@ const EditorFindWidget = {
   focusCloseButton,
   focusFind,
   focusNext: focusNext$2,
+  focusNextElement,
   focusNextMatchButton,
   focusPrevious: focusPrevious$1,
+  focusPreviousElement,
   focusPreviousMatchButton,
   focusReplace,
   focusReplaceAllButton,
@@ -8122,6 +8144,7 @@ const EditorFindWidget = {
   replace,
   replaceAll,
   toggleMatchCase,
+  toggleMatchWholeWord,
   toggleReplace,
   toggleUseRegularExpression
 };
@@ -9209,6 +9232,97 @@ const handleTab = async editor => {
   return applyTabCompletion(editor, result);
 };
 
+const relaunchWorkers = async () => {
+  await dispose();
+  await launch();
+};
+
+const getWidgetName = widgetId => {
+  switch (widgetId) {
+    case Find:
+      return `FindWidget`;
+    default:
+      return '';
+  }
+};
+const saveWidgetState = async keys => {
+  const savedStates = Object.create(null);
+  for (const key of keys) {
+    const editor = get$4(parseInt(key));
+    const {
+      widgets
+    } = editor.newState;
+    for (const widget of widgets) {
+      const invoke = getWidgetInvoke(widget.id);
+      const fullKey = `${key}:${widget.newState.uid}`;
+      const name = getWidgetName(widget.id);
+      const savedState = await invoke(`${name}.saveState`, widget.newState.uid);
+      savedStates[fullKey] = savedState;
+    }
+  }
+  return savedStates;
+};
+
+const restoreWidgetState = async (keys, savedStates) => {
+  const newEditors = [];
+  for (const key of keys) {
+    const editorUid = parseInt(key);
+    const editor = get$4(editorUid);
+    const {
+      widgets
+    } = editor.newState;
+    const newWidgets = [];
+    for (const widget of widgets) {
+      const invoke = getWidgetInvoke(widget.id);
+      const fullKey = `${key}:${widget.newState.uid}`;
+      const savedState = savedStates[fullKey] || {};
+      const name = getWidgetName(widget.id);
+      await invoke(`${name}.create`, widget.newState.uid, widget.newState.x, widget.newState.y, widget.newState.width, widget.newState.height, editorUid);
+      await invoke(`${name}.loadContent`, widget.newState.uid, savedState);
+      const diffResult = await invoke(`${name}.diff2`, widget.newState.uid);
+      const commands = await invoke(`${name}.render2`, widget.newState.uid, diffResult);
+      const newWidget = {
+        ...widget,
+        newState: {
+          ...widget.newState,
+          commands
+        }
+      };
+      newWidgets.push(newWidget);
+    }
+    newEditors.push({
+      ...editor,
+      newState: {
+        ...editor.newState,
+        widgets: newWidgets
+      }
+    });
+  }
+  return newEditors;
+};
+
+let isReloading = false;
+const hotReload = async () => {
+  if (isReloading) {
+    return;
+  }
+  isReloading = true;
+
+  // TODO use getEditors
+  const keys = getKeys$1();
+  const savedStates = await saveWidgetState(keys);
+  await relaunchWorkers();
+  const newEditors = await restoreWidgetState(keys, savedStates);
+  for (const editor of newEditors) {
+    set$6(editor.newState.uid, editor.oldState, editor.newState);
+  }
+
+  // TODO ask renderer worker to rerender all editors
+  // @ts-ignore
+  await invoke$8(`Editor.rerender`);
+  isReloading = false;
+};
+
 const sendMessagePortToExtensionHostWorker2 = async (port, initialCommand, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, initialCommand, rpcId);
 };
@@ -10272,7 +10386,7 @@ const editorDiagnosticEffect = {
   }
 };
 
-const keep = ['ActivateByEvent.activateByEvent', 'ExtensionHostManagement.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getSourceActions', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.getSelections2', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Editor.getKeys', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
+const keep = ['ActivateByEvent.activateByEvent', 'ExtensionHostManagement.activateByEvent', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.create', 'Editor.getKeyBindings', 'Editor.getSourceActions', 'Editor.getLines2', 'Editor.getPositionAtCursor', 'Editor.getOffsetAtCursor', 'Editor.getQuickPickMenuEntries', 'Editor.getSelections', 'Editor.hotReload', 'Editor.getSelections2', 'Editor.getText', 'Editor.getWordAt', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getUri', 'Editor.getWordBefore', 'Editor.getWordBefore2', 'Editor.offsetAt', 'Editor.render', 'Editor.setSelections2', 'Editor.updateDebugInfo', 'Editor.getLanguageId', 'Editor.getProblems', 'Editor.getKeys', 'Font.ensure', 'HandleMessagePort.handleMessagePort', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker'
 // 'ColorPicker.handleSliderPointerDown',
 // 'ColorPicker.handleSliderPointerMove',
 // 'ColorPicker.loadContent',
@@ -10487,6 +10601,7 @@ const commandMap = {
   'Editor.toggleComment': toggleComment,
   'Editor.toggleLineComment': editorToggleLineComment,
   'Editor.type': type,
+  'Editor.hotReload': hotReload,
   'Editor.typeWithAutoClosing': typeWithAutoClosing,
   'Editor.undo': undo,
   'Editor.unIndent': editorUnindent,
@@ -10543,8 +10658,12 @@ const commandMap = {
   'FindWidget.handleReplaceInput': handleReplaceInput,
   'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
   'FindWidget.toggleMatchCase': toggleMatchCase,
+  'FindWidget.toggleMatchWholeWord': toggleMatchWholeWord,
   'FindWidget.loadContent': loadContent$1,
   'FindWidget.toggleReplace': toggleReplace,
+  'FindWidget.toggleUseRegularExpression': toggleUseRegularExpression,
+  'FindWidget.focusNextElement': focusNextElement,
+  'FindWidget.focusPreviousElement': focusPreviousElement,
   'Font.ensure': ensure,
   'HandleMessagePort.handleMessagePort': handleMessagePort,
   'Hover.getHoverInfo': getEditorHoverInfo,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "8.2.0",
+  "version": "8.4.0",
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",
   "main": "dist/editorWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/constants": "^1.9.0"
+    "@lvce-editor/constants": "^1.14.0"
   }
 }