@lvce-editor/find-widget-worker 1.0.0 → 1.2.0

package/dist/findWidgetWorkerMain.js

@@ -378,26 +378,26 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$1 = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
-const get$1 = id => {
+const get$2 = id => {
   return callbacks[id];
 };
 const remove = id => {
   delete callbacks[id];
 };
 let id = 0;
-const create$3 = () => {
+const create$3$1 = () => {
   return ++id;
 };
 const registerPromise = () => {
-  const id = create$3();
+  const id = create$3$1();
   const {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$1(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -554,7 +554,7 @@ const warn = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$1(id);
+  const fn = get$2(id);
   if (!fn) {
     console.log(response);
     warn(`callback ${id} may already be disposed`);
@@ -708,7 +708,7 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke = (ipc, method, ...params) => {
+const invoke$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -741,7 +741,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke(ipc, method, ...params);
+      return invoke$1(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -782,7 +782,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$2 = async ({
+const create$3 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -794,10 +794,10 @@ const create$2 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$2
+  create: create$3
 };
 
-const create$1 = () => {
+const create$2 = () => {
   const states = Object.create(null);
   return {
     get(uid) {
@@ -857,14 +857,14 @@ const create$1 = () => {
 };
 
 const {
-  get,
-  set,
+  get: get$1,
+  set: set$1,
   wrapCommand
-} = create$1();
+} = create$2();
 
 const Unknown = 0;
 
-const create = (uid, x, y, width, height, parentUid) => {
+const create$1 = (uid, x, y, width, height, parentUid) => {
   const state = {
     uid,
     value: '',
@@ -877,7 +877,7 @@ const create = (uid, x, y, width, height, parentUid) => {
     matchCase: false,
     matchWholeWord: false,
     replacement: '',
-    editorUid: 0,
+    editorUid: parentUid,
     x: 0,
     y: 0,
     width: 0,
@@ -885,14 +885,46 @@ const create = (uid, x, y, width, height, parentUid) => {
     focused: false,
     focusSource: Unknown,
     focus: 0,
-    version: 0
+    version: 0,
+    lines: [],
+    selections: [],
+    editorX: x,
+    editorY: y,
+    editorWidth: width,
+    editorHeight: height
   };
-  set(uid, state, state);
+  set$1(uid, state, state);
   return state;
 };
 
-const modules = [];
-const numbers = [];
+const isEqual$4 = (oldState, newState) => {
+  return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
+};
+
+const isEqual$3 = (oldState, newState) => {
+  return oldState.version === newState.version;
+};
+
+const isEqual$2 = (oldState, newState) => {
+  return oldState.version === newState.version;
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return oldState.version === newState.version;
+};
+
+const isEqual = (oldState, newState) => {
+  return oldState.version === newState.version;
+};
+
+const RenderBounds = 8;
+const RenderEventListeners = 11;
+const RenderUid = 12;
+const RenderContent = 13;
+const RenderFocusContext = 14;
+
+const modules = [isEqual$3, isEqual$1, isEqual$4, isEqual, isEqual$2];
+const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -909,25 +941,280 @@ const diff2 = uid => {
   const {
     oldState,
     newState
-  } = get(uid);
+  } = get$1(uid);
   const diffResult = diff(oldState, newState);
   return diffResult;
 };
 
+// TODO don't call renderer worker, set editor state
+// TODO this function should be synchronous
+const focusIndex = (state, index) => {
+  const {
+    matchIndex
+  } = state;
+  if (index === matchIndex) {
+    return state;
+  }
+  // TODO update editor
+  // const { widgets } = editor
+  // const childIndex = widgets.findIndex(isFind)
+  // const childWidget = widgets[childIndex]
+
+  // // TODO find next match and highlight it
+  // const matchRowIndex = matches[index * 2]
+  // const matchColumnIndex = matches[index * 2 + 1]
+  // const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length])
+  // const newState: FindWidgetState = {
+  //   ...findState,
+  //   matchIndex: index,
+  // }
+  // const newWidget = {
+  //   ...childWidget,
+  //   newState,
+  // }
+  // const newWidgets = [...widgets.slice(0, childIndex), newWidget, ...widgets.slice(childIndex + 1)]
+  return state;
+};
+const focusFirst = state => {
+  return focusIndex(state, 0);
+};
+const focusLast = state => {
+  const {
+    matchCount
+  } = state;
+  return focusIndex(state, matchCount - 1);
+};
+const focusNext = state => {
+  const {
+    matchIndex,
+    matchCount
+  } = state;
+  if (matchIndex === matchCount - 1) {
+    return focusFirst(state);
+  }
+  return focusIndex(state, matchIndex + 1);
+};
+const focusPrevious = state => {
+  const {
+    matchIndex
+  } = state;
+  if (matchIndex === 0) {
+    return focusLast(state);
+  }
+  return focusIndex(state, matchIndex - 1);
+};
+
+const handleBlur = async state => {
+  return {
+    ...state,
+    focus: 0,
+    focused: false
+  };
+};
+
+const findRegexMatches = (lines, regex) => {
+  if (!regex.global) {
+    throw new Error('regex must be global');
+  }
+  const {
+    length
+  } = lines;
+  const matches = [];
+  for (let i = 0; i < length; i++) {
+    const line = lines[i];
+    let lastMatch;
+    do {
+      lastMatch = regex.exec(line);
+      if (!lastMatch) {
+        break;
+      }
+      matches.push(i, lastMatch.index);
+    } while (true);
+  }
+  return new Uint32Array(matches);
+};
+
+// copied from https://github.com/microsoft/vscode/tree/main/src/vs/base/common/strings.ts by Microsoft (License MIT)
+
+const RE_ESCAPE = /[\\\{\}\*\+\?\|\^\$\.\[\]\(\)]/g;
+const escapeRegExpCharacters = value => {
+  return value.replaceAll(RE_ESCAPE, String.raw`\$&`);
+};
+
+const regexFlags = 'gi';
+const getSearchRegex = searchString => {
+  const escaped = escapeRegExpCharacters(searchString);
+  return new RegExp(escaped, regexFlags);
+};
+
+const findMatchesCaseInsensitive = (lines, searchString) => {
+  if (searchString.length === 0) {
+    return new Uint32Array([]);
+  }
+  const regex = getSearchRegex(searchString);
+  return findRegexMatches(lines, regex);
+};
+
+const getMatchCount = matches => {
+  return matches.length / 2;
+};
+
+const refresh$1 = (state, value) => {
+  const {
+    lines
+  } = state;
+  const matches = findMatchesCaseInsensitive(lines, value);
+  const matchCount = getMatchCount(matches);
+  return {
+    ...state,
+    matches,
+    matchIndex: 0,
+    matchCount,
+    value
+  };
+};
+
+const refresh = (state, value = state.value) => {
+  return refresh$1(state, value);
+};
+
+const handleInput = (state, value) => {
+  return refresh(state, value);
+};
+
 const commandIds = ['handleSliderPointerDown', 'handleSliderPointerMove'];
 
 const getCommandIds = () => {
   return commandIds;
 };
 
-const loadContent = state => {
+const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
+  const width = 300;
+  const height = 30;
+  const paddingTop = 10;
+  const paddingRight = 20;
+  const x = editorX + editorWidth - width - paddingRight;
+  const y = editorY + paddingTop;
+  return {
+    y,
+    x,
+    width,
+    height
+  };
+};
+
+const rpcs = Object.create(null);
+const set$a = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get = id => {
+  return rpcs[id];
+};
+
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
+
+const create = rpcId => {
+  return {
+    // @ts-ignore
+    invoke(method, ...params) {
+      const rpc = get(rpcId);
+      // @ts-ignore
+      return rpc.invoke(method, ...params);
+    },
+    // @ts-ignore
+    invokeAndTransfer(method, ...params) {
+      const rpc = get(rpcId);
+      // @ts-ignore
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    set(rpc) {
+      set$a(rpcId, rpc);
+    }
+  };
+};
+const EditorWorker$1 = 99;
+const {
+  invoke: invoke$9,
+  set: set$9
+} = create(EditorWorker$1);
+const EditorWorker = {
+  __proto__: null,
+  invoke: invoke$9,
+  set: set$9
+};
+
+const {
+  invoke,
+  set} = EditorWorker;
+
+const getLines = async editorUid => {
+  // @ts-ignore
+  const lines = await invoke('Editor.getLines2', editorUid);
+  // @ts-ignore
+  return lines;
+};
+
+const getSelections = async editorUid => {
+  // @ts-ignore
+  const selections = await invoke('Editor.getSelections2', editorUid);
+  // @ts-ignore
+  return selections;
+};
+
+const loadContent = async state => {
+  const {
+    editorUid,
+    editorWidth,
+    editorX,
+    editorY
+  } = state;
+  const lines = await getLines(editorUid);
+  const selections = await getSelections(editorUid);
+  const {
+    x,
+    y,
+    width,
+    height
+  } = getFindWidgetPosition(editorX, editorY, editorWidth);
+  if (lines.length === 0) {
+    return state;
+  }
+  const startRowIndex = selections[0];
+  const startColumnIndex = selections[1];
+  const endColumnIndex = selections[3];
+  const line = lines[startRowIndex];
+  const value = line.slice(startColumnIndex, endColumnIndex);
+  const matches = findMatchesCaseInsensitive(lines, value);
+  const matchCount = getMatchCount(matches);
   return {
     ...state,
-    version: 1
+    value,
+    matches,
+    matchIndex: 0,
+    matchCount,
+    version: 1,
+    x,
+    y,
+    width,
+    height
   };
 };
 
-const RenderContent = 13;
+const SetBounds = 'Viewlet.setBounds';
+const SetDom2 = 'Viewlet.setDom2';
+const SetUid = 'Viewlet.setUid';
+const SetEventListeners = 'Viewlet.registerEventListeners';
+
+const renderBounds = (oldState, newState) => {
+  const {
+    x,
+    y,
+    width,
+    height,
+    uid
+  } = newState;
+  return [SetBounds, uid, x, y, width, height];
+};
 
 const HandleClickClose = 'handleClickClose';
 const HandleClickNextMatch = 'handleClickNextMatch';
@@ -1253,8 +1540,6 @@ const getMatchCountText = (matchIndex, matchCount) => {
   return matchOf(matchIndex + 1, matchCount);
 };
 
-const SetDom2 = 'Viewlet.setDom2';
-
 const renderContent = (oldState, newState) => {
   const {
     uid
@@ -1272,10 +1557,44 @@ const renderContent = (oldState, newState) => {
   return [SetDom2, uid, dom];
 };
 
+const getEventListeners = uid => {
+  return [];
+};
+
+const renderEventListeners = state => {
+  const {
+    uid
+  } = state;
+  const eventListeners = getEventListeners();
+  return [SetEventListeners, uid, eventListeners];
+};
+
+const FocusFindWidget = 16;
+
+const renderFocusContext = (oldState, newState) => {
+  return [/* method */'Viewlet.setFocusContext', FocusFindWidget];
+};
+
+const renderUid = (oldState, newState) => {
+  const {
+    uid,
+    editorUid
+  } = newState;
+  return [SetUid, uid, editorUid];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderContent:
       return renderContent;
+    case RenderBounds:
+      return renderBounds;
+    case RenderEventListeners:
+      return renderEventListeners;
+    case RenderUid:
+      return renderUid;
+    case RenderFocusContext:
+      return renderFocusContext;
     default:
       throw new Error('unknown renderer');
   }
@@ -1294,8 +1613,8 @@ const render2 = (uid, diffResult) => {
   const {
     oldState,
     newState
-  } = get(uid);
-  set(uid, newState, newState);
+  } = get$1(uid);
+  set$1(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -1305,26 +1624,26 @@ const terminate = () => {
 };
 
 const commandMap = {
-  'ColorPicker.create': create,
-  'ColorPicker.diff2': diff2,
-  'ColorPicker.getCommandIds': getCommandIds,
-  'ColorPicker.loadContent': wrapCommand(loadContent),
-  'ColorPicker.render2': render2,
-  'ColorPicker.terminate': terminate
-};
-
-const RendererWorker = 1;
-
-const rpcs = Object.create(null);
-const set$6 = (id, rpc) => {
-  rpcs[id] = rpc;
+  'FindWidget.create': create$1,
+  'FindWidget.diff2': diff2,
+  'FindWidget.focusFirst': focusFirst,
+  'FindWidget.focusIndex': focusIndex,
+  'FindWidget.focusLast': focusLast,
+  'FindWidget.focusNext': focusNext,
+  'FindWidget.focusPrevious': focusPrevious,
+  'FindWidget.getCommandIds': getCommandIds,
+  'FindWidget.handleBlur': handleBlur,
+  'FindWidget.handleInput': handleInput,
+  'FindWidget.loadContent': wrapCommand(loadContent),
+  'FindWidget.render2': render2,
+  'FindWidget.terminate': terminate
 };
 
 const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set$6(RendererWorker, rpc);
+  set(rpc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/find-widget-worker",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",