@lvce-editor/file-search-worker 6.5.0 → 6.7.0

package/dist/fileSearchWorkerMain.js

@@ -429,6 +429,100 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   listen: listen$6,
   wrap: wrap$e
 };
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
+const getFirstEvent = (eventEmitter, eventMap) => {
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
+    }
+    resolve(value);
+  };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        type,
+        event
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
+  }
+  return promise;
+};
+const Message$1 = 3;
+const create$5$1 = async ({
+  messagePort,
+  isMessagePortOpen
+}) => {
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1
+  });
+  messagePort.start();
+  const {
+    type,
+    event
+  } = await eventPromise;
+  if (type !== Message$1) {
+    throw new IpcError('Failed to wait for ipc message');
+  }
+  if (event.data !== readyMessage) {
+    throw new IpcError('unexpected first message');
+  }
+  return messagePort;
+};
+const signal$1 = messagePort => {
+  messagePort.start();
+};
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+  onClose(callback) {}
+}
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
+};
+const IpcParentWithMessagePort$1 = {
+  __proto__: null,
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
+};
 
 const Two = '2.0';
 const create$4$1 = (method, params) => {
@@ -439,7 +533,7 @@ const create$4$1 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$4 = (id, fn) => {
+const set$5 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -449,16 +543,16 @@ const remove = id => {
   delete callbacks[id];
 };
 let id = 0;
-const create$3$1 = () => {
+const create$3$2 = () => {
   return ++id;
 };
 const registerPromise = () => {
-  const id = create$3$1();
+  const id = create$3$2();
   const {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$4(id, resolve);
+  set$5(id, resolve);
   return {
     id,
     promise
@@ -686,7 +780,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$6 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -695,7 +789,7 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$6(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -803,7 +897,7 @@ const send = (transport, method, ...params) => {
   const message = create$4$1(method, params);
   transport.send(message);
 };
-const invoke$3 = (ipc, method, ...params) => {
+const invoke$4 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer$1 = (ipc, method, ...params) => {
@@ -823,7 +917,7 @@ const register$1 = commandMap => {
 const getCommand = key => {
   return commands[key];
 };
-const execute$1 = (command, ...args) => {
+const execute = (command, ...args) => {
   const fn = getCommand(command);
   if (!fn) {
     throw new CommandNotFoundError(command);
@@ -842,7 +936,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$3(ipc, method, ...params);
+      return invoke$4(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer$1(ipc, method, ...params);
@@ -864,7 +958,7 @@ const logError = () => {
 };
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
-  const actualExecute = event?.target?.execute || execute$1;
+  const actualExecute = event?.target?.execute || execute;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
@@ -883,6 +977,40 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+const create$5 = async ({
+  commandMap,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register$1(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    messagePort,
+    isMessagePortOpen: true
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
+const create$3$1 = async ({
+  commandMap,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$5({
+    commandMap,
+    messagePort: port2
+  });
+};
+const TransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3$1
+};
 const create$4 = async ({
   commandMap
 }) => {
@@ -926,10 +1054,11 @@ const Img = 17;
 const Script$1 = 2;
 
 const DebugWorker = 55;
+const EditorWorker = 99;
 const RendererWorker$1 = 1;
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -951,7 +1080,7 @@ const create$3 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$4(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$1(rpcId);
@@ -960,6 +1089,14 @@ const create$3 = rpcId => {
   };
 };
 
+const {
+  invoke: invoke$3,
+  set: set$3} = create$3(EditorWorker);
+const getLines = async editorUid => {
+  const lines = await invoke$3('Editor.getLines2', editorUid);
+  return lines;
+};
+
 const {
   invoke: invoke$2,
   invokeAndTransfer,
@@ -2251,15 +2388,26 @@ const getFilterValueEverything = value => {
   const prefixLength = prefix.length;
   return value.slice(prefixLength).trim();
 };
+const getValueGoToLine = value => {
+  if (value.startsWith('::')) {
+    return value.slice(2);
+  }
+  return value.slice(1);
+};
 const getFn$1 = id => {
   switch (id) {
     case EveryThing$1:
       return getFilterValueEverything;
+    case GoToLine$2:
+      return getValueGoToLine;
     default:
       return noop;
   }
 };
-const getFilterValue = (id, value) => {
+const getFilterValue = (id, subId, value) => {
+  if (subId === GoToLine$2) {
+    return getValueGoToLine(value);
+  }
   const fn = getFn$1(id);
   const filterValue = fn(value);
   return filterValue;
@@ -2500,7 +2648,31 @@ const getPicks$9 = async searchValue => {
   return picks;
 };
 
-const getPicks$8 = async () => {
+const getText = async () => {
+  // TODO
+  const id = await getActiveEditorId();
+  const lines = await getLines(id);
+  return lines.join('\n');
+};
+
+const toPick = column => {
+  return {
+    description: '',
+    direntType: None$2,
+    fileIcon: '',
+    icon: '',
+    label: `${column}`,
+    matches: [],
+    uri: ''
+  };
+};
+const getPicks$8 = async value => {
+  if (value.startsWith('::')) {
+    const text = await getText();
+    const columns = [...Array(text.length).fill(0)].map((item, index) => index);
+    const picks = columns.map(toPick);
+    return picks;
+  }
   const picks = [{
     description: '',
     direntType: None$2,
@@ -2785,18 +2957,44 @@ const selectPick$6 = async pick => {
   };
 };
 
-const execute = async (method, ...params) => {
-  // TODO
+const setCursor = async (rowIndex, columnIndex) => {
+  await invoke$2('Editor.cursorSet', rowIndex, columnIndex);
 };
 
-const selectPick$5 = async item => {
-  const rowIndex = Number.parseInt(item.label);
-  const position = {
-    columnIndex: 5,
-    rowIndex
+const getPosition = (text, wantedColumn) => {
+  let row = 0;
+  let column = 0;
+  for (let i = 0; i < wantedColumn; i++) {
+    if (text[i] === '\n') {
+      row++;
+      column = 0;
+    } else {
+      column++;
+    }
+  }
+  return {
+    column,
+    row
   };
-  await execute(/* EditorSetCursor.editorSetCursor */'TODO', /* position */position);
-  // TODO put cursor onto that line
+};
+const goToPositionAndFocus = async (rowIndex, columnIndex) => {
+  await setCursor(rowIndex, columnIndex);
+  await invoke$2('Editor.handleFocus');
+};
+const selectPick$5 = async (item, value) => {
+  if (value.startsWith('::')) {
+    const columnString = value.slice(2);
+    const wantedColumn = Number.parseInt(columnString, 10);
+    const text = await getText();
+    const position = getPosition(text, wantedColumn);
+    await goToPositionAndFocus(position.row, position.column);
+    return {
+      command: Hide
+    };
+  }
+  const rowIndex = Number.parseInt(item.label);
+  const columnIndex = 0;
+  await goToPositionAndFocus(rowIndex, columnIndex);
   return {
     command: Hide
   };
@@ -2902,7 +3100,7 @@ const setValue = async (state, newValue) => {
   const prefix = getQuickPickPrefix(newValue);
   const subId = getQuickPickSubProviderId(providerId, prefix);
   const newPicks = await getPicks(subId, newValue, args);
-  const filterValue = getFilterValue(providerId, newValue);
+  const filterValue = getFilterValue(providerId, subId, newValue);
   const items = filterQuickPickItems(newPicks, filterValue);
   const focusedIndex = items.length === 0 ? -1 : 0;
   const sliced = items.slice(minLineY, maxLineY);
@@ -2993,7 +3191,7 @@ const selectIndex = async (state, index, button = /* left */0) => {
   const prefix = getQuickPickPrefix(value);
   const subId = getQuickPickSubProviderId(providerId, prefix);
   const fn = getSelect(subId);
-  const selectPickResult = await fn(pick);
+  const selectPickResult = await fn(pick, value);
   object(selectPickResult);
   string(selectPickResult.command);
   const {
@@ -3037,6 +3235,17 @@ const handleFocus = async state => {
   return state;
 };
 
+const initialize = async () => {
+  // TODO
+  const rpc = await TransferMessagePortRpcParent.create({
+    commandMap: {},
+    async send(port) {
+      await sendMessagePortToEditorWorker(port, 0);
+    }
+  });
+  set$3(rpc);
+};
+
 const getDefaultValue = id => {
   switch (id) {
     case EveryThing$1:
@@ -3092,7 +3301,7 @@ const loadContent = async state => {
   const subId = getQuickPickSubProviderId(id, prefix);
   const newPicks = await getPicks(subId, value, args);
   array(newPicks);
-  const filterValue = getFilterValue(id, value);
+  const filterValue = getFilterValue(id, subId, value);
   const items = filterQuickPickItems(newPicks, filterValue);
   const minLineY = 0;
   const maxLineY = Math.min(minLineY + state.maxVisibleItems, newPicks.length);
@@ -3617,6 +3826,7 @@ const commandMap = {
   'QuickPick.handleFocus': wrapCommand(handleFocus),
   'QuickPick.handleInput': wrapCommand(handleInput),
   'QuickPick.handleWheel': wrapCommand(handleWheel),
+  'QuickPick.initialize': initialize,
   'QuickPick.loadContent': wrapCommand(loadContent),
   'QuickPick.render2': render2,
   'QuickPick.renderEventListeners': renderEventListeners,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-search-worker",
-  "version": "6.5.0",
+  "version": "6.7.0",
   "keywords": [
     "text-search"
   ],