@lvce-editor/extension-host-worker 4.6.0 → 4.8.0

package/dist/extensionHostWorkerMain.js

@@ -614,7 +614,7 @@ const create$a = ({
 };
 
 const Array$1 = 'array';
-const Boolean = 'boolean';
+const Boolean$1 = 'boolean';
 const Number = 'number';
 const Object$1 = 'object';
 const String$1 = 'string';
@@ -626,7 +626,7 @@ const {
 } = create$a({
   name: 'BraceCompletion',
   resultShape: {
-    type: Boolean
+    type: Boolean$1
   }
 });
 
@@ -1068,7 +1068,9 @@ const getPosition = (textDocument, offset) => {
   let index = 0;
   let rowIndex = 0;
   let newLineIndex = 0;
-  const text = textDocument.text;
+  const {
+    text
+  } = textDocument;
   while (index < offset) {
     newLineIndex = text.indexOf('\n', index);
     if (newLineIndex === -1) {
@@ -2713,7 +2715,7 @@ const {
   }
 });
 
-const RE_PROTOCOL = /^([a-z\-]+):\/\//;
+const RE_PROTOCOL = /^([a-z-]+):\/\//;
 const getProtocol = uri => {
   const protocolMatch = uri.match(RE_PROTOCOL);
   if (protocolMatch) {
@@ -3073,7 +3075,7 @@ const setup = ({
   setStackTraceLimit(errorConstructor, 20);
   global.onerror ||= handleUnhandledError;
   global.onunhandledrejection ||= handleUnhandledRejection;
-  if ('SecurityPolicyViolationEvent' in self) {
+  if ('SecurityPolicyViolationEvent' in globalThis) {
     global.addEventListener('securitypolicyviolation', handleContentSecurityPolicyViolation);
   }
   // @ts-ignore
@@ -3197,7 +3199,9 @@ const createColorThemeFromJson = (colorThemeId, colorThemeJson) => {
     warn(`color theme json for "${colorThemeId}" cannot be converted to css, it must be of type object but was of type array`);
     return '';
   }
-  const colors = colorThemeJson.colors;
+  const {
+    colors
+  } = colorThemeJson;
   if (!colors) {
     return '';
   }
@@ -3849,7 +3853,7 @@ const create$1 = () => {
   return ++state$3.id;
 };
 
-const commandMap$1 = {
+const iframeWorkerCommandMap = {
   'WebView.compatExtensionHostWorkerInvoke': (...args) => invoke$2('WebView.compatExtensionHostWorkerInvoke', ...args),
   'WebView.compatExtensionHostWorkerInvokeAndTransfer': (...args) => invokeAndTransfer$1('WebView.compatExtensionHostWorkerInvokeAndTransfer', ...args),
   'WebView.compatRendererProcessInvoke': (...args) => invoke$2('WebView.compatRendererProcessInvoke', ...args),
@@ -3866,6 +3870,7 @@ const commandMap$1 = {
   'ExtensionHostManagement.activateByEvent': (...args) => invoke$2('ExtensionHostManagement.activateByEvent', ...args),
   'WebView.getRemoteUrl': options => getRemoteUrlForWebView(options.uri, options)
 };
+
 const launchIframeWorker = async () => {
   const configuredWorkerUrl = await getConfiguredIframeWorkerUrl();
   const name = 'Iframe Worker';
@@ -3875,7 +3880,7 @@ const launchIframeWorker = async () => {
     name,
     url: configuredWorkerUrl,
     id,
-    commandMap: commandMap$1
+    commandMap: iframeWorkerCommandMap
   });
   return rpc;
 };
@@ -3887,6 +3892,9 @@ const ensureWorker = () => {
   }
   return workerPromise;
 };
+const isActive = () => {
+  return Boolean(workerPromise);
+};
 const invoke = async (method, ...params) => {
   const rpc = await ensureWorker();
   return rpc.invoke(method, ...params);
@@ -4034,13 +4042,9 @@ class ContentSecurityPolicyError extends Error {
   constructor(violatedDirective, sourceFile, lineNumber, columnNumber) {
     super(`Content Security Policy Violation: ${violatedDirective}`);
     this.name = 'ContentSecurityPolicyError';
-    if (sourceFile) {
-      this.stack = `Content Security Policy Violation
-    at ${sourceFile}:${lineNumber}:${columnNumber}`;
-    } else {
-      this.stack = `Content Security Policy Violation
+    this.stack = sourceFile ? `Content Security Policy Violation
+    at ${sourceFile}:${lineNumber}:${columnNumber}` : `Content Security Policy Violation
     at <unknown>`;
-    }
   }
 }
 
@@ -4061,15 +4065,17 @@ const isImportError = error => {
 };
 
 const sleep = duration => {
-  const promiseCallback = (resolve, reject) => {
-    setTimeout(resolve, duration);
-  };
-  return new Promise(promiseCallback);
+  const {
+    resolve,
+    promise
+  } = Promise.withResolvers();
+  setTimeout(resolve, duration);
+  return promise;
 };
 
 const NotFound = 404;
 
-const RE_LINE_COLUMN = /(.*)(?:\(\d+\:\d+\))/;
+const RE_LINE_COLUMN = /(.*)(?:\(\d+:\d+\))/;
 const getBabelErrorMessage = message => {
   const match = message.match(RE_LINE_COLUMN);
   if (match) {
@@ -4083,7 +4089,9 @@ class BabelParseError extends SyntaxError {
     super(message);
     this.name = 'BabelParseError';
     // @ts-ignore
-    const line = error.loc.line;
+    const {
+      line
+    } = error.loc;
     // @ts-ignore
     const column = error.loc.column + 1;
     this.stack = `${message}
@@ -4201,8 +4209,12 @@ const getBabelAstDependencies = (code, ast) => {
   for (const node of body) {
     if (node.type === ImportDeclaration || node.type === ExportAllDeclaration) {
       const relativePath = node.source.extra.rawValue;
-      const start = node.source.start;
-      const end = node.source.end;
+      const {
+        start
+      } = node.source;
+      const {
+        end
+      } = node.source;
       // @ts-ignore
       dependencies.push({
         relativePath,
@@ -4212,8 +4224,12 @@ const getBabelAstDependencies = (code, ast) => {
       });
     } else if (node.type === VariableDeclaration && node.declarations && node.declarations[0] && node.declarations[0].type === VariableDeclarator && node.declarations[0].init && node.declarations[0].init.type === AwaitExpression && node.declarations[0].init.argument && node.declarations[0].init.argument.type === CallExpression && node.declarations[0].init.argument.callee && node.declarations[0].init.argument.callee.type === Import && node.declarations[0].init.argument.arguments && node.declarations[0].init.argument.arguments[0] && node.declarations[0].init.argument.arguments[0].type === StringLiteral) {
       const relativePath = node.declarations[0].init.argument.arguments[0].extra.rawValue;
-      const start = node.declarations[0].init.argument.arguments[0].start;
-      const end = node.declarations[0].init.argument.arguments[0].end;
+      const {
+        start
+      } = node.declarations[0].init.argument.arguments[0];
+      const {
+        end
+      } = node.declarations[0].init.argument.arguments[0];
       // @ts-ignore
       dependencies.push({
         relativePath,
@@ -4226,8 +4242,12 @@ const getBabelAstDependencies = (code, ast) => {
   const visitor = node => {
     if (node && node.type === CallExpression && node.callee && node.callee.type === Import && node.arguments && node.arguments[0] && node.arguments[0].type === StringLiteral) {
       const relativePath = node.arguments[0].extra.rawValue;
-      const start = node.arguments[0].start;
-      const end = node.arguments[0].end;
+      const {
+        start
+      } = node.arguments[0];
+      const {
+        end
+      } = node.arguments[0];
       // @ts-ignore
       dependencies.push({
         relativePath,
@@ -4301,7 +4321,7 @@ const tryToGetActualErrorMessage = async (error, url, response, seenUrls = []) =
   let text;
   try {
     text = await response.text();
-  } catch (error) {
+  } catch {
     return `Failed to import ${url}: Unknown Network Error`;
   }
   let ast;
@@ -4743,6 +4763,16 @@ const getColorThemeNames = async () => {
   return colorThemeNames;
 };
 
+const getExtension = async id => {
+  const allExtensions = await getExtensions();
+  for (const extension of allExtensions) {
+    if (extension.id === id) {
+      return extension;
+    }
+  }
+  return undefined;
+};
+
 const findMatchingIconThemeExtension = (extensions, iconThemeId) => {
   for (const extension of extensions) {
     if (extension && extension.iconThemes) {
@@ -4819,7 +4849,9 @@ const getWebViewsFromExtensions = extensions => {
   for (const extension of extensions) {
     if (extension && extension.webViews) {
       for (const webView of extension.webViews) {
-        let path = extension.path;
+        let {
+          path
+        } = extension;
         if (webView && webView.path) {
           path = `${extension.path}/${webView.path}`;
         }
@@ -5069,9 +5101,12 @@ const serializeWebViews = async webViews => {
   }
   return serialized;
 };
-const getAdditional = () => {
+const getAdditional = async () => {
+  if (!isActive()) {
+    return [];
+  }
   try {
-    return invoke('WebView.saveState');
+    return await invoke('WebView.saveState');
   } catch {
     return [];
   }
@@ -5216,30 +5251,43 @@ const getLineMatchRegex = (line, lineNumber, query, matchCase) => {
   return [];
 };
 
-const getLineMatchText = (line, lineNumber, query, queryLower, matchCase) => {
+const doesMatchWord = (line, index, wordBoundaries) => {
+  if (index === 0) {
+    return true;
+  }
+  const char = line.charAt(index - 1);
+  return wordBoundaries.includes(char);
+};
+const getLineMatchText = (line, lineNumber, query, queryLower, matchCase, matchWholeWord) => {
+  // TODO support multiple matches per line
   const lineToQuery = matchCase ? line : line.toLowerCase();
   const actualQuery = matchCase ? query : queryLower;
   const index = lineToQuery.indexOf(actualQuery);
-  if (index !== -1) {
-    return [{
-      type: Match,
-      text: line,
-      start: index,
-      end: index + query.length,
-      lineNumber
-    }];
+  if (index === -1) {
+    return [];
   }
-  return [];
+  const wordBoundaries = [' ', '\t', '-'];
+  if (matchWholeWord && !doesMatchWord(line, index, wordBoundaries)) {
+    return [];
+  }
+  return [{
+    type: Match,
+    text: line,
+    start: index,
+    end: index + query.length,
+    lineNumber
+  }];
 };
 
-const getLineMatch = (line, lineNumber, query, queryLower, useRegularExpression, matchCase) => {
+const getLineMatch = (line, lineNumber, query, queryLower, useRegularExpression, matchCase, matchWholeWord) => {
   if (useRegularExpression) {
     return getLineMatchRegex(line, lineNumber, query, matchCase);
   }
-  return getLineMatchText(line, lineNumber, query, queryLower, matchCase);
+  return getLineMatchText(line, lineNumber, query, queryLower, matchCase, matchWholeWord);
 };
 
 const UseRegularExpression = 1 << 1; // 2
+const MatchWholeWord = 1 << 3; // 8
 const MatchCase = 1 << 4; // 16
  // 128
 
@@ -5250,9 +5298,10 @@ const splitLines = lines => {
 const textSearchInText = (file, content, query, flags = 0) => {
   const matchCase = flags & MatchCase;
   const useRegularExpression = flags & UseRegularExpression;
+  const matchWholeWord = flags & MatchWholeWord;
   const lines = splitLines(content);
   const queryLower = query.toLowerCase();
-  const results = lines.flatMap((line, i) => getLineMatch(line, i, query, queryLower, useRegularExpression, matchCase));
+  const results = lines.flatMap((line, i) => getLineMatch(line, i, query, queryLower, useRegularExpression, matchCase, matchWholeWord));
   if (results.length > 0) {
     return [{
       type: File$3,
@@ -5371,6 +5420,7 @@ const matchesUri = (uri, relativeRoot, include, exclude) => {
   }
   return true;
 };
+
 const textSearch = async (scheme, root, query, options, assetDir) => {
   string(scheme);
   string(root);
@@ -5402,6 +5452,7 @@ const commandMap = {
   'ExtensionHostRename.executeprepareRenameProvider': executeprepareRenameProvider,
   'ExtensionHostRename.executeRenameProvider': executeRenameProvider,
   'Extensions.getExtensions': getExtensions,
+  'Extensions.getExtension': getExtension,
   'Extensions.addWebExtension': addWebExtension,
   'FileSystemFetch.chmod': chmod$1,
   'FileSystemFetch.getBlob': getBlob$1,

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "4.6.0",
+  "version": "4.8.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
-  "main": "dist/extensionHostWorkerMain.js",
-  "type": "module",
   "keywords": [
     "web-worker"
   ],
+  "license": "MIT",
   "author": "Lvce Editor",
-  "license": "MIT"
+  "type": "module",
+  "main": "dist/extensionHostWorkerMain.js"
 }