@lvce-editor/file-search-worker 3.2.0 → 3.4.0

package/dist/fileSearchWorkerMain.js

@@ -54,27 +54,6 @@ class VError extends Error {
   }
 }
 
-const walkValue = (value, transferrables, isTransferrable) => {
-  if (!value) {
-    return;
-  }
-  if (isTransferrable(value)) {
-    transferrables.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      walkValue(item, transferrables, isTransferrable);
-    }
-    return;
-  }
-  if (typeof value === 'object') {
-    for (const property of Object.values(value)) {
-      walkValue(property, transferrables, isTransferrable);
-    }
-    return;
-  }
-};
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -99,6 +78,27 @@ const isTransferrable = value => {
   }
   return false;
 };
+const walkValue = (value, transferrables, isTransferrable) => {
+  if (!value) {
+    return;
+  }
+  if (isTransferrable(value)) {
+    transferrables.push(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      walkValue(item, transferrables, isTransferrable);
+    }
+    return;
+  }
+  if (typeof value === 'object') {
+    for (const property of Object.values(value)) {
+      walkValue(property, transferrables, isTransferrable);
+    }
+    return;
+  }
+};
 const getTransferrables = value => {
   const transferrables = [];
   walkValue(value, transferrables, isTransferrable);
@@ -131,30 +131,35 @@ const NewLine$1 = '\n';
 const joinLines$1 = lines => {
   return lines.join(NewLine$1);
 };
-const splitLines$2 = lines => {
-  return lines.split(NewLine$1);
-};
-const isModuleNotFoundMessage = line => {
-  return line.includes('[ERR_MODULE_NOT_FOUND]');
+const RE_AT = /^\s+at/;
+const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
+const isNormalStackLine = line => {
+  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
 };
-const getModuleNotFoundError = stderr => {
-  const lines = splitLines$2(stderr);
-  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
-  const message = lines[messageIndex];
+const getDetails = lines => {
+  const index = lines.findIndex(isNormalStackLine);
+  if (index === -1) {
+    return {
+      actualMessage: joinLines$1(lines),
+      rest: []
+    };
+  }
+  let lastIndex = index - 1;
+  while (++lastIndex < lines.length) {
+    if (!isNormalStackLine(lines[lastIndex])) {
+      break;
+    }
+  }
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    actualMessage: lines[index - 1],
+    rest: lines.slice(index, lastIndex)
   };
 };
-const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
-const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
+const splitLines$2 = lines => {
+  return lines.split(NewLine$1);
+};
 const RE_MESSAGE_CODE_BLOCK_START = /^Error: The module '.*'$/;
 const RE_MESSAGE_CODE_BLOCK_END = /^\s* at/;
-const RE_AT = /^\s+at/;
-const RE_AT_PROMISE_INDEX = /^\s*at async Promise.all \(index \d+\)$/;
-const isUnhelpfulNativeModuleError = stderr => {
-  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
-};
 const isMessageCodeBlockStartIndex = line => {
   return RE_MESSAGE_CODE_BLOCK_START.test(line);
 };
@@ -169,51 +174,46 @@ const getMessageCodeBlock = stderr => {
   const relevantMessage = relevantLines.join(' ').slice('Error: '.length);
   return relevantMessage;
 };
-const getNativeModuleErrorMessage = stderr => {
-  const message = getMessageCodeBlock(stderr);
+const isModuleNotFoundMessage = line => {
+  return line.includes('[ERR_MODULE_NOT_FOUND]');
+};
+const getModuleNotFoundError = stderr => {
+  const lines = splitLines$2(stderr);
+  const messageIndex = lines.findIndex(isModuleNotFoundMessage);
+  const message = lines[messageIndex];
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    message,
+    code: ERR_MODULE_NOT_FOUND
   };
 };
-const isModulesSyntaxError = stderr => {
+const isModuleNotFoundError = stderr => {
   if (!stderr) {
     return false;
   }
-  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
-};
-const getModuleSyntaxError = () => {
-  return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
-  };
+  return stderr.includes('ERR_MODULE_NOT_FOUND');
 };
-const isModuleNotFoundError = stderr => {
+const isModulesSyntaxError = stderr => {
   if (!stderr) {
     return false;
   }
-  return stderr.includes('ERR_MODULE_NOT_FOUND');
+  return stderr.includes('SyntaxError: Cannot use import statement outside a module');
 };
-const isNormalStackLine = line => {
-  return RE_AT.test(line) && !RE_AT_PROMISE_INDEX.test(line);
+const RE_NATIVE_MODULE_ERROR = /^innerError Error: Cannot find module '.*.node'/;
+const RE_NATIVE_MODULE_ERROR_2 = /was compiled against a different Node.js version/;
+const isUnhelpfulNativeModuleError = stderr => {
+  return RE_NATIVE_MODULE_ERROR.test(stderr) && RE_NATIVE_MODULE_ERROR_2.test(stderr);
 };
-const getDetails = lines => {
-  const index = lines.findIndex(isNormalStackLine);
-  if (index === -1) {
-    return {
-      actualMessage: joinLines$1(lines),
-      rest: []
-    };
-  }
-  let lastIndex = index - 1;
-  while (++lastIndex < lines.length) {
-    if (!isNormalStackLine(lines[lastIndex])) {
-      break;
-    }
-  }
+const getNativeModuleErrorMessage = stderr => {
+  const message = getMessageCodeBlock(stderr);
   return {
-    actualMessage: lines[index - 1],
-    rest: lines.slice(index, lastIndex)
+    message: `Incompatible native node module: ${message}`,
+    code: E_INCOMPATIBLE_NATIVE_MODULE
+  };
+};
+const getModuleSyntaxError = () => {
+  return {
+    message: `ES Modules are not supported in electron`,
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -232,7 +232,7 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: `${actualMessage}`,
+    message: actualMessage,
     code: '',
     stack: rest
   };
@@ -267,14 +267,14 @@ const readyMessage = 'ready';
 const getData$2 = event => {
   return event.data;
 };
-const listen$6 = () => {
+const listen$7 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
     throw new TypeError('module is not in web worker scope');
   }
   return globalThis;
 };
-const signal$6 = global => {
+const signal$8 = global => {
   global.postMessage(readyMessage);
 };
 class IpcChildWithModuleWorker extends Ipc {
@@ -300,7 +300,7 @@ class IpcChildWithModuleWorker extends Ipc {
     this._rawIpc.addEventListener('message', callback);
   }
 }
-const wrap$d = global => {
+const wrap$f = global => {
   return new IpcChildWithModuleWorker(global);
 };
 const withResolvers = () => {
@@ -309,6 +309,7 @@ const withResolvers = () => {
     _resolve = resolve;
   });
   return {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     resolve: _resolve,
     promise
   };
@@ -325,10 +326,10 @@ const waitForFirstMessage = async port => {
   // @ts-ignore
   return event.data;
 };
-const listen$5 = async () => {
-  const parentIpcRaw = listen$6();
-  signal$6(parentIpcRaw);
-  const parentIpc = wrap$d(parentIpcRaw);
+const listen$6 = async () => {
+  const parentIpcRaw = listen$7();
+  signal$8(parentIpcRaw);
+  const parentIpc = wrap$f(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
@@ -347,9 +348,6 @@ const listen$5 = async () => {
   return globalThis;
 };
 class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
-  constructor(port) {
-    super(port);
-  }
   getData(event) {
     return getData$2(event);
   }
@@ -373,13 +371,13 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
     this._rawIpc.start();
   }
 }
-const wrap$c = port => {
+const wrap$e = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
 const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
-  listen: listen$5,
-  wrap: wrap$c
+  listen: listen$6,
+  wrap: wrap$e
 };
 
 const Two = '2.0';
@@ -404,9 +402,6 @@ let id = 0;
 const create$3 = () => {
   return ++id;
 };
-const warn$1 = (...args) => {
-  console.warn(...args);
-};
 const registerPromise = () => {
   const id = create$3();
   const {
@@ -419,16 +414,6 @@ const registerPromise = () => {
     promise
   };
 };
-const resolve = (id, response) => {
-  const fn = get(id);
-  if (!fn) {
-    console.log(response);
-    warn$1(`callback ${id} may already be disposed`);
-    return;
-  }
-  fn(response);
-  remove$2(id);
-};
 const create$2 = (method, params) => {
   const {
     id,
@@ -576,6 +561,19 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
+const warn$1 = (...args) => {
+  console.warn(...args);
+};
+const resolve = (id, response) => {
+  const fn = get(id);
+  if (!fn) {
+    console.log(response);
+    warn$1(`callback ${id} may already be disposed`);
+    return;
+  }
+  fn(response);
+  remove$2(id);
+};
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
   if (prettyError && prettyError.type) {
@@ -745,6 +743,8 @@ const execute$1 = (command, ...args) => {
 
 const createRpc = ipc => {
   const rpc = {
+    // @ts-ignore
+    ipc,
     /**
      * @deprecated
      */
@@ -771,7 +771,8 @@ const logError = () => {
 };
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
-  return handleJsonRpcMessage(event.target, event.data, execute$1, resolve, preparePrettyError, logError, actualRequiresSocket);
+  const actualExecute = event?.target?.execute || execute$1;
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -811,6 +812,19 @@ const File$2 = 7;
 
 const fileMapUrl = `${assetDir}/config/fileMap.json`;
 
+const getBlob$2 = async url => {
+  try {
+    const response = await fetch(url);
+    if (!response.ok) {
+      throw new Error(response.statusText);
+    }
+    const text = await response.blob();
+    return text;
+  } catch (error) {
+    throw new VError(error, `Failed to request blob for ${url}`);
+  }
+};
+
 const getJson = async url => {
   try {
     const response = await fetch(url);
@@ -885,9 +899,9 @@ const readDirWithFileTypes$1 = async uri => {
 const chmod$1 = () => {
   throw new Error('[memfs] chmod not implemented');
 };
-const getBlob$1 = async uri => {
-  const content = await readFile$1(uri);
-  const blob = new Blob([content]);
+const getBlob$1 = async (uri, type) => {
+  const fetchUri = `${assetDir}${uri}`;
+  const blob = getBlob$2(fetchUri);
   return blob;
 };
 
@@ -1055,16 +1069,16 @@ const readDirWithFileTypes = uri => {
   }
   return dirents;
 };
-const getBlob = uri => {
+const getBlob = (uri, type) => {
   const content = readFile(uri);
-  const contentType = getContentType(uri);
+  const contentType = type || getContentType(uri);
   const blob = new Blob([content], {
     type: contentType
   });
   return blob;
 };
-const getBlobUrl = uri => {
-  const blob = getBlob(uri);
+const getBlobUrl = (uri, type) => {
+  const blob = getBlob(uri, type);
   const url = URL.createObjectURL(blob);
   return url;
 };
@@ -1654,50 +1668,6 @@ const QuickPickEntriesCustom = {
   state: state$3
 };
 
-const name$7 = 'noop';
-const getPlaceholder$8 = () => {
-  return '';
-};
-const getHelpEntries$7 = () => {
-  return [];
-};
-const getNoResults$7 = () => {
-  return noResults();
-};
-const getPicks$8 = async value => {
-  return [];
-};
-const selectPick$8 = async item => {
-  return {
-    command: Hide
-  };
-};
-const getFilterValue$7 = value => {
-  return value;
-};
-const getPickFilterValue$3 = pick => {
-  return pick;
-};
-
-const QuickPickNoop = {
-  __proto__: null,
-  getFilterValue: getFilterValue$7,
-  getHelpEntries: getHelpEntries$7,
-  getNoResults: getNoResults$7,
-  getPickFilterValue: getPickFilterValue$3,
-  getPicks: getPicks$8,
-  getPlaceholder: getPlaceholder$8,
-  name: name$7,
-  selectPick: selectPick$8
-};
-
-const Command = '>';
-const Symbol$1 = '@';
-const WorkspaceSymbol = '#';
-const GoToLine = ':';
-const View = 'view ';
-const None = '';
-
 const handleError = async (error, notify = true, prefix = '') => {
   console.error(error);
 };
@@ -1713,8 +1683,8 @@ const getAll = () => {
   return state$2.menuEntries;
 };
 
-const name$6 = 'command';
-const getPlaceholder$7 = () => {
+const name$7 = 'command';
+const getPlaceholder$8 = () => {
   return typeNameofCommandToRun();
 };
 const helpEntries = () => {
@@ -1726,7 +1696,7 @@ const helpEntries = () => {
 const getLabel$2 = () => {
   return '';
 };
-const getNoResults$6 = () => {
+const getNoResults$7 = () => {
   return {
     label: noMatchingResults()
   };
@@ -1767,7 +1737,7 @@ const getExtensionPicks = async () => {
 
 // TODO send strings to renderer process only once for next occurrence send uint16array of ids of strings
 
-const getPicks$7 = async () => {
+const getPicks$8 = async () => {
   const builtinPicks = await getBuiltinPicks();
   const extensionPicks = await getExtensionPicks();
   return [...builtinPicks, ...extensionPicks];
@@ -1804,16 +1774,16 @@ const selectPickExtension = async item => {
     command: Hide
   };
 };
-const selectPick$7 = async item => {
+const selectPick$8 = async item => {
   if (item.id.startsWith('ext.')) {
     return selectPickExtension(item);
   }
   return selectPickBuiltin(item);
 };
-const getFilterValue$6 = value => {
+const getFilterValue$7 = value => {
   return value;
 };
-const getPickFilterValue$2 = pick => {
+const getPickFilterValue$3 = pick => {
   return pick.label;
 };
 const getPickLabel$2 = pick => {
@@ -1825,17 +1795,17 @@ const getPickIcon$2 = () => {
 
 const QuickPickEntriesCommand = {
   __proto__: null,
-  getFilterValue: getFilterValue$6,
+  getFilterValue: getFilterValue$7,
   getLabel: getLabel$2,
-  getNoResults: getNoResults$6,
-  getPickFilterValue: getPickFilterValue$2,
+  getNoResults: getNoResults$7,
+  getPickFilterValue: getPickFilterValue$3,
   getPickIcon: getPickIcon$2,
   getPickLabel: getPickLabel$2,
-  getPicks: getPicks$7,
-  getPlaceholder: getPlaceholder$7,
+  getPicks: getPicks$8,
+  getPlaceholder: getPlaceholder$8,
   helpEntries,
-  name: name$6,
-  selectPick: selectPick$7
+  name: name$7,
+  selectPick: selectPick$8
 };
 
 const execute = async (method, ...params) => {
@@ -1911,6 +1881,8 @@ const fromAsync = async asyncIterable => {
  * retrieve the child handles
  *
  */
+
+// eslint-disable-next-line  @typescript-eslint/prefer-readonly-parameter-types
 const getChildHandles = async handle => {
   // @ts-ignore
   const handles = await fromAsync(handle.values());
@@ -1948,7 +1920,7 @@ function promisifyRequest(request) {
     request.addEventListener('success', success);
     request.addEventListener('error', error);
   });
-  // This mapping exists in reverseTransformCache but doesn't doesn't exist in transformCache. This
+  // This mapping exists in reverseTransformCache but doesn't exist in transformCache. This
   // is because we create many promises from a single IDBRequest.
   reverseTransformCache.set(promise, request);
   return promise;
@@ -2279,7 +2251,7 @@ const searchFile$1 = async (path, value, prepare) => {
   const options = {
     ripGrepArgs,
     searchPath: path,
-    limit: 9999999
+    limit: 9_999_999
   };
   const stdout = await invoke('SearchFile.searchFile', options);
   const lines = splitLines(stdout);
@@ -2315,8 +2287,8 @@ const searchFile = async (path, value, prepare, assetDir) => {
   return result;
 };
 
-const name$5 = 'file';
-const getPlaceholder$6 = () => {
+const name$6 = 'file';
+const getPlaceholder$7 = () => {
   return '';
 };
 const getLabel$1 = () => {
@@ -2324,23 +2296,23 @@ const getLabel$1 = () => {
 };
 
 // TODO help entries should not be here
-const getHelpEntries$6 = () => {
+const getHelpEntries$7 = () => {
   return [{
     description: goToFile(),
     category: 'global commands'
   }];
 };
-const getNoResults$5 = () => {
+const getNoResults$6 = () => {
   return {
     label: noMatchingResults()
   };
 };
-const getPicks$6 = async searchValue => {
+const getPicks$7 = async searchValue => {
   {
     return [];
   }
 };
-const selectPick$6 = async pick => {
+const selectPick$7 = async pick => {
   if (typeof pick === 'object') {
     pick = pick.pick;
   }
@@ -2351,10 +2323,10 @@ const selectPick$6 = async pick => {
     command: Hide
   };
 };
-const getFilterValue$5 = value => {
+const getFilterValue$6 = value => {
   return value;
 };
-const getPickFilterValue$1 = pick => {
+const getPickFilterValue$2 = pick => {
   if (typeof pick === 'object') {
     pick = pick.pick;
   }
@@ -2389,33 +2361,33 @@ const isPrepared$1 = () => {
 
 const QuickPickEntriesFile = {
   __proto__: null,
-  getFilterValue: getFilterValue$5,
-  getHelpEntries: getHelpEntries$6,
+  getFilterValue: getFilterValue$6,
+  getHelpEntries: getHelpEntries$7,
   getLabel: getLabel$1,
-  getNoResults: getNoResults$5,
+  getNoResults: getNoResults$6,
   getPickDescription: getPickDescription$1,
   getPickFileIcon: getPickFileIcon$1,
-  getPickFilterValue: getPickFilterValue$1,
+  getPickFilterValue: getPickFilterValue$2,
   getPickIcon: getPickIcon$1,
   getPickLabel: getPickLabel$1,
-  getPicks: getPicks$6,
-  getPlaceholder: getPlaceholder$6,
+  getPicks: getPicks$7,
+  getPlaceholder: getPlaceholder$7,
   isPrepared: isPrepared$1,
-  name: name$5,
-  selectPick: selectPick$6
+  name: name$6,
+  selectPick: selectPick$7
 };
 
-const name$4 = 'goToLine';
-const getPlaceholder$5 = () => {
+const name$5 = 'goToLine';
+const getPlaceholder$6 = () => {
   return '';
 };
-const getHelpEntries$5 = () => {
+const getHelpEntries$6 = () => {
   return [];
 };
-const getNoResults$4 = () => {
+const getNoResults$5 = () => {
   return undefined;
 };
-const getPicks$5 = async () => {
+const getPicks$6 = async () => {
   const picks = [{
     label: '1'
   }, {
@@ -2431,7 +2403,7 @@ const getPicks$5 = async () => {
   }];
   return picks;
 };
-const selectPick$5 = async item => {
+const selectPick$6 = async item => {
   const rowIndex = Number.parseInt(item.label);
   const position = {
     rowIndex,
@@ -2443,15 +2415,52 @@ const selectPick$5 = async item => {
     command: Hide
   };
 };
-const getFilterValue$4 = value => {
+const getFilterValue$5 = value => {
   return value;
 };
 
 const QuickPickEntriesGoToLine = {
+  __proto__: null,
+  getFilterValue: getFilterValue$5,
+  getHelpEntries: getHelpEntries$6,
+  getNoResults: getNoResults$5,
+  getPicks: getPicks$6,
+  getPlaceholder: getPlaceholder$6,
+  name: name$5,
+  selectPick: selectPick$6
+};
+
+const name$4 = 'noop';
+const getPlaceholder$5 = () => {
+  return '';
+};
+const getHelpEntries$5 = () => {
+  return [];
+};
+const getNoResults$4 = () => {
+  return noResults();
+};
+const getPicks$5 = async value => {
+  return [];
+};
+const selectPick$5 = async item => {
+  return {
+    command: Hide
+  };
+};
+const getFilterValue$4 = value => {
+  return value;
+};
+const getPickFilterValue$1 = pick => {
+  return pick;
+};
+
+const QuickPickNoop = {
   __proto__: null,
   getFilterValue: getFilterValue$4,
   getHelpEntries: getHelpEntries$5,
   getNoResults: getNoResults$4,
+  getPickFilterValue: getPickFilterValue$1,
   getPicks: getPicks$5,
   getPlaceholder: getPlaceholder$5,
   name: name$4,
@@ -2563,6 +2572,13 @@ const QuickPickEntriesWorkspaceSymbol = {
   selectPick: selectPick$2
 };
 
+const Command = '>';
+const Symbol$1 = '@';
+const WorkspaceSymbol = '#';
+const GoToLine = ':';
+const View = 'view ';
+const None = '';
+
 // TODO avoid global variable
 
 const state = {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@lvce-editor/file-search-worker",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "",
-  "main": "dist/fileSearchWorkerMain.js",
-  "type": "module",
   "keywords": [
     "text-search"
   ],
-  "author": "Lvce Editor",
-  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/file-search-worker.git"
-  }
+  },
+  "license": "MIT",
+  "author": "Lvce Editor",
+  "type": "module",
+  "main": "dist/fileSearchWorkerMain.js"
 }