@lvce-editor/editor-worker 3.4.0 → 3.5.0

package/dist/editorWorkerMain.js

@@ -1,3 +1,16 @@
+const addWidget$1 = (widget, id, render) => {
+  const commands = render(widget);
+  // TODO how to generate a unique integer id
+  // that doesn't collide with ids created in renderer worker?
+  // @ts-ignore
+  const uid = widget.newState.uid;
+  const allCommands = [];
+  allCommands.push(['Viewlet.createFunctionalRoot', id, uid]);
+  allCommands.push(...commands);
+  allCommands.push(['Viewlet.send', uid, 'appendWidget']);
+  return allCommands;
+};
+
 const ColoredMaskIcon = 'ColoredMaskIcon';
 const ColorPicker$2 = 'ColorPicker';
 const ColorPickerBackgroundColor = 'ColorPickerBackgroundColor';
@@ -131,6 +144,11 @@ const renderFull$1 = (oldState, newState) => {
   return commands;
 };
 
+const removeWidget$1 = widget => {
+  // @ts-ignore
+  return [['Viewlet.send', widget.newState.uid, 'dispose']];
+};
+
 const render$7 = widget => {
   const commands = renderFull$1(widget.oldState, widget.newState);
   const wrappedCommands = [];
@@ -145,20 +163,9 @@ const render$7 = widget => {
   return wrappedCommands;
 };
 const add$2 = widget => {
-  const commands = render$7(widget);
-  const id = 'ColorPicker';
-  // TODO how to generate a unique integer id
-  // that doesn't collide with ids created in renderer worker?
-  const uid = widget.newState.uid;
-  const allCommands = [];
-  allCommands.push(['Viewlet.createFunctionalRoot', id, uid]);
-  allCommands.push(...commands);
-  allCommands.push(['Viewlet.send', uid, 'appendWidget']);
-  return allCommands;
-};
-const remove$3 = widget => {
-  return [['Viewlet.send', widget.newState.uid, 'dispose']];
+  return addWidget$1(widget, 'ColorPicker', render$7);
 };
+const remove$3 = removeWidget$1;
 
 const EditorColorPickerWidget = {
   __proto__: null,
@@ -197,6 +204,16 @@ const getCompletionDetailVirtualDom = content => {
   return dom;
 };
 
+const renderParts = (render, oldState, newState) => {
+  const commands = [];
+  for (const item of render) {
+    if (!item.isEqual(oldState, newState)) {
+      commands.push(item.apply(oldState, newState));
+    }
+  }
+  return commands;
+};
+
 const renderContent = {
   isEqual(oldState, newState) {
     return oldState.content === newState.content;
@@ -222,13 +239,7 @@ const renderBounds$2 = {
 };
 const render$6 = [renderContent, renderBounds$2];
 const renderFull = (oldState, newState) => {
-  const commands = [];
-  for (const item of render$6) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
-  }
-  return commands;
+  return renderParts(render$6, oldState, newState);
 };
 
 const render$5 = widget => {
@@ -245,20 +256,9 @@ const render$5 = widget => {
   return wrappedCommands;
 };
 const add$1 = widget => {
-  const commands = render$5(widget);
-  const id = 'EditorCompletionDetails';
-  // TODO how to generate a unique integer id
-  // that doesn't collide with ids created in renderer worker?
-  const uid = widget.newState.uid;
-  const allCommands = [];
-  allCommands.push(['Viewlet.createFunctionalRoot', id, uid]);
-  allCommands.push(...commands);
-  allCommands.push(['Viewlet.send', uid, 'appendWidget']);
-  return allCommands;
-};
-const remove$2 = widget => {
-  return [['Viewlet.send', widget.newState.uid, 'dispose']];
+  return addWidget$1(widget, 'EditorCompletionDetails', render$5);
 };
+const remove$2 = removeWidget$1;
 
 const EditorCompletionDetailWidget = {
   __proto__: null,
@@ -456,7 +456,7 @@ const getAccurateColumnIndexAscii = (line, guess, averageCharWidth, eventX, font
 const supported = () => {
   return 'Segmenter' in Intl;
 };
-const create$9 = () => {
+const create$a = () => {
   // @ts-ignore
   const segmenter = new Intl.Segmenter();
   return {
@@ -494,7 +494,7 @@ const create$9 = () => {
 
 // @ts-ignore
 const getAccurateColumnIndexUnicode = (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing) => {
-  const segmenter = create$9();
+  const segmenter = create$a();
   const segments = segmenter.getSegments(line);
   const isMonospaceFont = false;
   const charWidth = 0;
@@ -645,7 +645,8 @@ const UiStrings = {
   NoDefinitionFoundFor: "No definition found for '{PH1}'",
   NoTypeDefinitionFound: 'No type definition found',
   NoTypeDefinitionFoundFor: "No type definition found for '{PH1}'",
-  NoResults: 'No Results'
+  NoResults: 'No Results',
+  Replace: 'Replace'
 };
 const noDefinitionFound = () => {
   return i18nString(UiStrings.NoDefinitionFound);
@@ -1187,9 +1188,7 @@ const add = widget => {
   allCommands.push(...commands);
   return allCommands;
 };
-const remove$1 = widget => {
-  return [['Viewlet.send', widget.newState.uid, 'dispose']];
-};
+const remove$1 = removeWidget$1;
 const handleEditorType$1 = (editor, state) => {
   const {
     unfilteredItems,
@@ -1332,13 +1331,7 @@ const renderColorPickerDom = {
 };
 const render$2 = [renderColorPickerDom, renderColor, renderOffsetX];
 const renderColorPicker = async (oldState, newState) => {
-  const commands = [];
-  for (const item of render$2) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
-  }
-  return commands;
+  return renderParts(render$2, oldState, newState);
 };
 
 // TODO use numeric enum
@@ -2413,7 +2406,7 @@ const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(message, errorProperty);
 };
-const create$8 = (message, result) => {
+const create$9 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -2422,7 +2415,7 @@ const create$8 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$8(message, resultProperty);
+  return create$9(message, resultProperty);
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
@@ -2654,7 +2647,7 @@ const waitForFirstMessage$1 = async port => {
   return event;
 };
 
-const create$7 = async () => {
+const create$8 = async () => {
   const {
     port1,
     port2
@@ -2699,7 +2692,7 @@ const wrap$3 = port => {
 
 const IpcParentWithExtensionHostWorker = {
   __proto__: null,
-  create: create$7,
+  create: create$8,
   wrap: wrap$3
 };
 
@@ -2707,7 +2700,7 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
   await invokeAndTransfer('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
 };
 
-const create$6 = async () => {
+const create$7 = async () => {
   const {
     port1,
     port2
@@ -2752,7 +2745,7 @@ const wrap$1 = port => {
 
 const IpcParentWithSyntaxHighlightingWorker = {
   __proto__: null,
-  create: create$6,
+  create: create$7,
   wrap: wrap$1
 };
 
@@ -2760,7 +2753,7 @@ const sendMessagePortToRendererProcess = async port => {
   await invokeAndTransfer('SendMessagePortToRendererProcess.sendMessagePortToRendererProcess', port, 'HandleMessagePort.handleMessagePort');
 };
 
-const create$5 = async () => {
+const create$6 = async () => {
   const {
     port1,
     port2
@@ -2805,7 +2798,7 @@ const wrap = port => {
 
 const IpcParentWithRendererProcess = {
   __proto__: null,
-  create: create$5,
+  create: create$6,
   wrap
 };
 
@@ -2822,7 +2815,7 @@ const getModule$1 = method => {
   }
 };
 
-const create$4 = async ({
+const create$5 = async ({
   method,
   ...options
 }) => {
@@ -2840,7 +2833,7 @@ const create$4 = async ({
 const createRpc = method => {
   let _ipc;
   const listen = async () => {
-    const ipc = await create$4({
+    const ipc = await create$5({
       method
     });
     handleIpc(ipc);
@@ -3214,6 +3207,7 @@ const cancelSelection = editor => {
 const Completion = 'completion';
 const CompletionDetail = 'completionDetail';
 const ColorPicker$1 = 'colorPicker';
+const Find = 'find';
 
 const isCompletionWidget = widget => {
   return widget.id === Completion;
@@ -3233,6 +3227,84 @@ const closeCompletion = editor => {
   };
 };
 
+const create$4 = () => {
+  return Math.random();
+};
+
+const create$3 = () => {
+  const completionUid = create$4();
+  const widget = {
+    id: ColorPicker$1,
+    oldState: {
+      color: '',
+      offsetX: 0,
+      min: 0,
+      max: 0,
+      uid: completionUid,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    },
+    newState: {
+      color: '',
+      offsetX: 0,
+      min: 0,
+      max: 0,
+      uid: completionUid,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0
+    }
+  };
+  return widget;
+};
+
+const ColorPicker = 41;
+const FindWidget$1 = 16;
+const EditorCompletion = 9;
+
+const hasWidget = (widgets, id) => {
+  for (const widget of widgets) {
+    if (widget.id === id) {
+      return true;
+    }
+  }
+  return false;
+};
+
+const setAdditionalFocus = async focusKey => {
+  await invoke$3('Focus.setAdditionalFocus', focusKey);
+};
+
+const openColorPicker = async editor => {
+  const {
+    widgets
+  } = editor;
+  if (hasWidget(widgets, ColorPicker$1)) {
+    return editor;
+  }
+  const colorPickerWidget = create$3();
+  const newState = loadContent$3(colorPickerWidget.newState);
+  const newWidget = {
+    ...colorPickerWidget,
+    newState
+  };
+  const newWidgets = [...widgets, newWidget];
+
+  // TODO avoid side effect, apply focus shift during render
+  await setAdditionalFocus(ColorPicker);
+  const newEditor = {
+    ...editor,
+    widgets: newWidgets
+  };
+  // TODO
+  return {
+    ...newEditor
+  };
+};
+
 const state$6 = {
   isComposing: false,
   compositionText: ''
@@ -3527,7 +3599,7 @@ const characterLeft = (line, columnIndex) => {
   if (!supported()) {
     return 1;
   }
-  const segmenter = create$9();
+  const segmenter = create$a();
   const last = segmenter.at(line, columnIndex - 1);
   return columnIndex - last.index;
 };
@@ -3538,7 +3610,7 @@ const characterRight = (line, columnIndex) => {
   if (!supported()) {
     return 1;
   }
-  const segmenter = create$9();
+  const segmenter = create$a();
   const next = segmenter.at(line, columnIndex);
   return next.segment.length;
 };
@@ -5213,12 +5285,8 @@ const moveSelectionPx = (editor, x, y) => {
   return editorMoveSelection(editor, position);
 };
 
-const create$3 = () => {
-  return Math.random();
-};
-
 const create$2 = () => {
-  const completionUid = create$3();
+  const completionUid = create$4();
   const completionWidget = {
     id: Completion,
     oldState: {
@@ -5491,22 +5559,6 @@ const advance = (state, word) => {
   };
 };
 
-const ColorPicker = 41;
-const EditorCompletion = 9;
-
-const hasWidget = (widgets, id) => {
-  for (const widget of widgets) {
-    if (widget.id === id) {
-      return true;
-    }
-  }
-  return false;
-};
-
-const setAdditionalFocus = async focusKey => {
-  await invoke$3('Focus.setAdditionalFocus', focusKey);
-};
-
 const openCompletion = async editor => {
   const {
     widgets,
@@ -5540,53 +5592,62 @@ const openCompletion = async editor => {
   };
 };
 
+const FindWidget = 'FindWidget';
+const openFind = async state => {
+  await invoke$3('Viewlet.openWidget', FindWidget);
+  return state;
+};
+
 const create$1 = () => {
-  const completionUid = create$3();
+  const uid = create$4();
   const widget = {
-    id: ColorPicker$1,
+    id: Find,
     oldState: {
-      color: '',
-      offsetX: 0,
-      min: 0,
-      max: 0,
-      uid: completionUid,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0
+      value: '',
+      ariaAnnouncement: '',
+      matches: new Uint32Array(),
+      matchIndex: -1,
+      matchCount: 0,
+      uid,
+      replaceExpanded: false,
+      useRegularExpression: false,
+      matchCase: false,
+      matchWholeWord: false,
+      replacement: '',
+      editorUid: 0
     },
     newState: {
-      color: '',
-      offsetX: 0,
-      min: 0,
-      max: 0,
-      uid: completionUid,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0
+      value: '',
+      ariaAnnouncement: '',
+      matches: new Uint32Array(),
+      matchIndex: -1,
+      matchCount: 0,
+      uid,
+      replaceExpanded: false,
+      useRegularExpression: false,
+      matchCase: false,
+      matchWholeWord: false,
+      replacement: '',
+      editorUid: 0
     }
   };
   return widget;
 };
 
-const openColorPicker = async editor => {
+const openFind2 = async editor => {
   const {
     widgets
   } = editor;
-  if (hasWidget(widgets, ColorPicker$1)) {
+  if (hasWidget(widgets, Find)) {
     return editor;
   }
-  const colorPickerWidget = create$1();
-  const newState = loadContent$3(colorPickerWidget.newState);
+  const findWidget = create$1();
   const newWidget = {
-    ...colorPickerWidget,
-    newState
+    ...findWidget
   };
   const newWidgets = [...widgets, newWidget];
-
   // TODO avoid side effect, apply focus shift during render
-  await setAdditionalFocus(ColorPicker);
+  await setAdditionalFocus(FindWidget$1);
   const newEditor = {
     ...editor,
     widgets: newWidgets
@@ -5597,12 +5658,6 @@ const openColorPicker = async editor => {
   };
 };
 
-const FindWidget = 'FindWidget';
-const openFind = async state => {
-  await invoke$3('Viewlet.openWidget', FindWidget);
-  return state;
-};
-
 const organizeImports = async editor => {
   // TODO ask extension host worker directly
   const edits = await invoke$3('ExtensionHostOrganizeImports.organizeImports', editor);
@@ -7367,7 +7422,7 @@ const focusPrevious$1 = editor => {
 };
 
 const create = () => {
-  const completionUid = create$3();
+  const completionUid = create$4();
   const completionWidget = {
     id: CompletionDetail,
     oldState: {
@@ -7536,7 +7591,7 @@ const getHover = async (editor, offset) => {
 
 let _ipc;
 const listen$5 = async () => {
-  const ipc = await create$4({
+  const ipc = await create$5({
     method: RendererProcess
   });
   handleIpc(ipc);
@@ -9153,9 +9208,10 @@ const commandMap = {
   'Editor.moveSelection': editorMoveSelection,
   'Editor.moveSelectionPx': moveSelectionPx,
   'Editor.offsetAt': offsetAt,
-  'Editor.openCompletion': openCompletion,
   'Editor.openColorPicker': openColorPicker,
+  'Editor.openCompletion': openCompletion,
   'Editor.openFind': openFind,
+  'Editor.openFind2': openFind2,
   'Editor.organizeImports': organizeImports,
   'Editor.paste': paste,
   'Editor.pasteText': pasteText,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",