@lvce-editor/extension-host-worker 5.29.0 → 5.31.0

package/dist/extensionHostWorkerMain.js

@@ -426,6 +426,9 @@ const getPreview = item => {
   }
 };
 const validate = (item, schema) => {
+  if (typeof schema === 'function') {
+    return schema(item);
+  }
   const actualType = getType(item);
   const expectedType = schema.type;
   if (actualType !== expectedType) {
@@ -2670,15 +2673,41 @@ const executeReferenceProvider2 = (uri, languageId, offset, position) => {
   });
 };
 
+const validateResult = renameResult => {
+  if (renameResult === null || renameResult === undefined) {
+    return '';
+  }
+  if (typeof renameResult !== 'object') {
+    return 'rename result must be of type object';
+  }
+  if (typeof renameResult.canRename !== 'boolean') {
+    return `renameResult.canRename must be of type boolean`;
+  }
+  if (!Array.isArray(renameResult.edits)) {
+    return `renameResult.edits must be of type array`;
+  }
+  for (const item of renameResult.edits) {
+    if (!item) {
+      return `renameResult item must be defined`;
+    }
+    if (typeof item !== 'object') {
+      return `renameResult item must be of type object`;
+    }
+    if (typeof item.uri !== 'string') {
+      return `renameResult item uri must be of type string`;
+    }
+    if (!Array.isArray(item.edits)) {
+      return `renameResult item edits must be of type array`;
+    }
+  }
+  return '';
+};
 const {
   registerRenameProvider,
   executeRenameProvider,
   executeprepareRenameProvider} = create$b({
   name: 'Rename',
-  resultShape: {
-    type: Object$1,
-    allowUndefined: true
-  },
+  resultShape: validateResult,
   additionalMethodNames: [
   // @ts-ignore
   {
@@ -2844,6 +2873,110 @@ const {
   }
 });
 
+const RE_PROTOCOL = /^([a-z-]+):\/\//;
+const getProtocol = uri => {
+  const protocolMatch = uri.match(RE_PROTOCOL);
+  if (protocolMatch) {
+    return protocolMatch[1];
+  }
+  return '';
+};
+
+const createWebViewIpc = async webView => {
+  const {
+    uid,
+    origin
+  } = webView;
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  const rpcPromise = MessagePortRpcParent.create({
+    messagePort: port2,
+    isMessagePortOpen: false,
+    commandMap: {}
+  });
+  const portType = 'test';
+  await invokeAndTransfer$1('WebView.setPort', uid, port1, origin, portType);
+  // TODO maybe don't send a message port only to get object url?
+  // TODO dispose rpc to avoid memory leak
+  const rpc = await rpcPromise;
+  return rpc;
+};
+
+const webViews = Object.create(null);
+const webViewProviders = Object.create(null);
+const getProvider = providerId => {
+  return webViewProviders[providerId];
+};
+const setProvider = (providerId, provider) => {
+  webViewProviders[providerId] = provider;
+};
+const getWebView = id => {
+  return webViews[id];
+};
+const setWebView = (id, webView) => {
+  webViews[id] = webView;
+};
+const getWebViews$1 = () => {
+  return webViews;
+};
+
+// TODO if webViewId is provided,
+// 1. read file as blob
+// 2. send blob to webview
+// 3. create objecturl in webview
+// 4. send back objecturl to extension host worker
+// 5. provide objectUrl to extension
+
+const getRemoteUrlForWebView = async (uri, options = {}) => {
+  // TODO webviews should be stored in iframe worker
+  const webView = getWebView(options.webViewId);
+  if (!webView) {
+    throw new Error(`webview ${options.webViewId} not found`);
+  }
+  const [rpc, blob] = await Promise.all([createWebViewIpc(webView), invoke$1('FileSystem.getBlob', uri)]);
+  const objectUrl = await rpc.invoke('createObjectUrl', blob);
+  return objectUrl;
+};
+
+const isFileProtocol = protocol => {
+  return !protocol || protocol === 'file';
+};
+const getRemoteUrlSync = uri => {
+  const protocol = getProtocol(uri);
+  const withoutPrefix = uri.startsWith('file://') ? uri.slice('file://'.length) : uri;
+  if (platform === Remote && isFileProtocol(protocol)) {
+    if (uri.startsWith('/')) {
+      return `/remote${withoutPrefix}`;
+    }
+    return `/remote/${withoutPrefix}`;
+  }
+  if (platform === Electron && isFileProtocol(protocol)) {
+    if (uri.startsWith('/')) {
+      return `/remote${withoutPrefix}`;
+    }
+    return `/remote/${withoutPrefix}`;
+  }
+  return '';
+};
+const getRemoteUrl$1 = async (uri, options = {}) => {
+  // TODO uri should always have protocol
+  // then ask file system provider for remote url, for example disk file system provider or html file system provider
+  const syncUrl = getRemoteUrlSync(uri);
+  if (syncUrl) {
+    return syncUrl;
+  }
+  if (options.webViewId) {
+    return getRemoteUrlForWebView(uri, options);
+  }
+  if (uri.startsWith('html://')) {
+    const url = await invoke$1('Blob.getSrc', uri);
+    return url;
+  }
+  throw new Error(`unsupported platform for remote url`);
+};
+
 const state$9 = {
   webExtensions: []
 };
@@ -3022,7 +3155,10 @@ const getIconDefinitions = async providerId => {
     const id = extension.id.split('.');
     const shortId = id[1];
     if (shortId === providerId && extension['source-control-icons'] && Array.isArray(extension['source-control-icons'])) {
-      return extension['source-control-icons'];
+      const baseIcons = extension['source-control-icons'];
+      const absoluteUris = baseIcons.map(icon => `${extension.uri}/${icon}`);
+      const remoteUris = absoluteUris.map(icon => getRemoteUrlSync(icon));
+      return remoteUris;
     }
   }
   // TODO return warning that no icons were found?
@@ -3089,99 +3225,6 @@ const {
   }
 });
 
-const RE_PROTOCOL = /^([a-z-]+):\/\//;
-const getProtocol = uri => {
-  const protocolMatch = uri.match(RE_PROTOCOL);
-  if (protocolMatch) {
-    return protocolMatch[1];
-  }
-  return '';
-};
-
-const createWebViewIpc = async webView => {
-  const {
-    uid,
-    origin
-  } = webView;
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  const rpcPromise = MessagePortRpcParent.create({
-    messagePort: port2,
-    isMessagePortOpen: false,
-    commandMap: {}
-  });
-  const portType = 'test';
-  await invokeAndTransfer$1('WebView.setPort', uid, port1, origin, portType);
-  // TODO maybe don't send a message port only to get object url?
-  // TODO dispose rpc to avoid memory leak
-  const rpc = await rpcPromise;
-  return rpc;
-};
-
-const webViews = Object.create(null);
-const webViewProviders = Object.create(null);
-const getProvider = providerId => {
-  return webViewProviders[providerId];
-};
-const setProvider = (providerId, provider) => {
-  webViewProviders[providerId] = provider;
-};
-const getWebView = id => {
-  return webViews[id];
-};
-const setWebView = (id, webView) => {
-  webViews[id] = webView;
-};
-const getWebViews$1 = () => {
-  return webViews;
-};
-
-// TODO if webViewId is provided,
-// 1. read file as blob
-// 2. send blob to webview
-// 3. create objecturl in webview
-// 4. send back objecturl to extension host worker
-// 5. provide objectUrl to extension
-
-const getRemoteUrlForWebView = async (uri, options = {}) => {
-  // TODO webviews should be stored in iframe worker
-  const webView = getWebView(options.webViewId);
-  if (!webView) {
-    throw new Error(`webview ${options.webViewId} not found`);
-  }
-  const [rpc, blob] = await Promise.all([createWebViewIpc(webView), invoke$1('FileSystem.getBlob', uri)]);
-  const objectUrl = await rpc.invoke('createObjectUrl', blob);
-  return objectUrl;
-};
-
-const getRemoteUrl$1 = async (uri, options = {}) => {
-  // TODO uri should always have protocol
-  // then ask file system provider for remote url, for example disk file system provider or html file system provider
-  const protocol = getProtocol(uri);
-  if (platform === Remote && !protocol) {
-    if (uri.startsWith('/')) {
-      return `/remote${uri}`;
-    }
-    return `/remote/${uri}`;
-  }
-  if (platform === Electron && !protocol) {
-    if (uri.startsWith('/')) {
-      return `/remote${uri}`;
-    }
-    return `/remote/${uri}`;
-  }
-  if (options.webViewId) {
-    return getRemoteUrlForWebView(uri, options);
-  }
-  if (uri.startsWith('html://')) {
-    const url = await invoke$1('Blob.getSrc', uri);
-    return url;
-  }
-  throw new Error(`unsupported platform for remote url`);
-};
-
 // TODO pass uuid to allow having multiple webviews open at the same time
 
 /**
@@ -4606,6 +4649,9 @@ const getColorThemeUri = (extensions, colorThemeId) => {
 const getColorThemeJson$2 = async colorThemeId => {
   const extensions = await getExtensions();
   const colorThemeUri = getColorThemeUri(extensions, colorThemeId);
+  if (!colorThemeUri) {
+    return {};
+  }
   const json = await readJson(colorThemeUri);
   return json;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-worker",
-  "version": "5.29.0",
+  "version": "5.31.0",
   "description": "Webworker for the extension host functionality in Lvce Editor.",
   "keywords": [
     "web-worker"