@lvce-editor/extension-search-view 1.2.0 → 1.4.0

package/README.md

@@ -1 +1,7 @@
-# extension-search-view
+# Extension Search View
+
+Webworker for the extension search view in Lvce Editor.
+
+## Gitpod
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/lvce-editor/extension-search-view)

package/dist/extensionSearchViewWorkerMain.js

@@ -1,11 +1,6 @@
 const commands = Object.create(null);
-const registerCommand = (key, fn) => {
-  commands[key] = fn;
-};
 const register = commandMap => {
-  for (const [key, value] of Object.entries(commandMap)) {
-    registerCommand(key, value);
-  }
+  Object.assign(commands, commandMap);
 };
 const getCommand = key => {
   return commands[key];
@@ -74,13 +69,13 @@ const getFinalDeltaY = (height, itemHeight, itemsLength) => {
   return finalDeltaY;
 };
 
-let AssertionError$1 = class AssertionError extends Error {
+class AssertionError extends Error {
   constructor(message) {
     super(message);
     this.name = 'AssertionError';
   }
-};
-const getType$2 = value => {
+}
+const getType = value => {
   switch (typeof value) {
     case 'number':
       return 'number';
@@ -102,17 +97,17 @@ const getType$2 = value => {
       return 'unknown';
   }
 };
-const number$1 = value => {
-  const type = getType$2(value);
+const number = value => {
+  const type = getType(value);
   if (type !== 'number') {
-    throw new AssertionError$1('expected value to be of type number');
+    throw new AssertionError('expected value to be of type number');
   }
 };
 
 const getListHeight$1 = (itemsLength, itemHeight, maxHeight) => {
-  number$1(itemsLength);
-  number$1(itemHeight);
-  number$1(maxHeight);
+  number(itemsLength);
+  number(itemHeight);
+  number(maxHeight);
   if (itemsLength === 0) {
     return itemHeight;
   }
@@ -196,6 +191,46 @@ const parseValue = value => {
 
 const assetDir = '';
 
+const Web = 1;
+const Electron = 2;
+const Remote = 3;
+const Test = 4;
+
+// TODO treeshake this function out
+
+/**
+ * @returns {number}
+ */
+const getPlatform = () => {
+  // @ts-ignore
+  if (typeof PLATFORM !== 'undefined') {
+    // @ts-ignore
+    return PLATFORM;
+  }
+  if (typeof process !== 'undefined' && process.env.NODE_ENV === 'test') {
+    return Test;
+  }
+  // TODO find a better way to pass runtime environment
+  if (typeof name !== 'undefined' && name.endsWith('(Electron)')) {
+    return Electron;
+  }
+  if (typeof name !== 'undefined' && name.endsWith('(Web)')) {
+    return Web;
+  }
+  return Remote;
+};
+const platform = getPlatform();
+
+const getRemoteUrl = extension => {
+  if (platform === Remote || platform === Electron) {
+    if (extension.builtin) {
+      return `${assetDir}/extensions/${extension.id}/${extension.icon}`;
+    }
+    return `/remote/${extension.path}/${extension.icon}`; // TODO support windows paths
+  }
+  return '';
+};
+
 const ExtensionDefaultIcon = `${assetDir}/icons/extensionDefaultIcon.png`;
 const ExtensionLanguageBasics = `${assetDir}/icons/language-icon.svg`;
 const ExtensionTheme = `${assetDir}/icons/theme-icon.png`;
@@ -219,7 +254,7 @@ const getIcon = extension => {
     }
     return ExtensionDefaultIcon;
   }
-  return '';
+  return getRemoteUrl(extension);
 };
 const RE_PUBLISHER = /^[a-z\d\-]+/;
 
@@ -300,10 +335,10 @@ const getExtensions = async (extensions, parsedValue) => {
 
 const normalizeLine$1 = line => {
   if (line.startsWith('Error: ')) {
-    return line.slice(`Error: `.length);
+    return line.slice('Error: '.length);
   }
   if (line.startsWith('VError: ')) {
-    return line.slice(`VError: `.length);
+    return line.slice('VError: '.length);
   }
   return line;
 };
@@ -429,6 +464,63 @@ const clearSearchResults = state => {
   return handleInput(state, '');
 };
 
+const Enter = 3;
+const Space = 9;
+const PageUp = 10;
+const PageDown = 11;
+const End = 255;
+const Home = 12;
+const UpArrow = 14;
+const DownArrow = 16;
+
+const CtrlCmd = 1 << 11 >>> 0;
+
+const FocusExtensions = 15;
+
+const getKeyBindings = () => {
+  return [{
+    key: Home,
+    command: 'Extensions.focusFirst',
+    when: FocusExtensions
+  }, {
+    key: End,
+    command: 'Extensions.focusLast',
+    when: FocusExtensions
+  }, {
+    key: PageUp,
+    command: 'Extensions.focusPreviousPage',
+    when: FocusExtensions
+  }, {
+    key: PageDown,
+    command: 'Extensions.focusNextPage',
+    when: FocusExtensions
+  }, {
+    key: UpArrow,
+    command: 'Extensions.focusPrevious',
+    when: FocusExtensions
+  }, {
+    key: DownArrow,
+    command: 'Extensions.focusNext',
+    when: FocusExtensions
+  }, {
+    key: Space,
+    command: 'Extensions.handleClickCurrentButKeepFocus',
+    when: FocusExtensions
+  }, {
+    key: Enter,
+    command: 'Extensions.handleClickCurrent',
+    when: FocusExtensions
+  }, {
+    key: CtrlCmd | Space,
+    command: 'Extensions.toggleSuggest',
+    when: FocusExtensions
+  }, {
+    key: CtrlCmd | DownArrow,
+    command: 'Extensions.scrollDown',
+    when: FocusExtensions
+  }];
+};
+
 const Button = 1;
 
 const ExtensionActions = 'ExtensionActions';
@@ -750,67 +842,33 @@ const doRender = (oldState, newState) => {
 };
 
 const commandMap = {
-  'SearchExtensions.searchExtensions': searchExtensions,
+  'SearchExtensions.clearSearchResults': clearSearchResults,
+  'SearchExtensions.getKeyBindings': getKeyBindings,
   'SearchExtensions.render': doRender,
-  'SearchExtensions.clearSearchResults': clearSearchResults
+  'SearchExtensions.searchExtensions': searchExtensions
 };
 
 const Two = '2.0';
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const getType$1 = value => {
-  switch (typeof value) {
-    case 'number':
-      return 'number';
-    case 'function':
-      return 'function';
-    case 'string':
-      return 'string';
-    case 'object':
-      if (value === null) {
-        return 'null';
-      }
-      if (Array.isArray(value)) {
-        return 'array';
-      }
-      return 'object';
-    case 'boolean':
-      return 'boolean';
-    default:
-      return 'unknown';
-  }
-};
-const number = value => {
-  const type = getType$1(value);
-  if (type !== 'number') {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-const state$1 = {
+const state = {
   callbacks: Object.create(null)
 };
 const get = id => {
-  return state$1.callbacks[id];
+  return state.callbacks[id];
 };
 const remove = id => {
-  delete state$1.callbacks[id];
+  delete state.callbacks[id];
 };
 const warn = (...args) => {
   console.warn(...args);
 };
-const resolve = (id, args) => {
-  number(id);
+const resolve = (id, response) => {
   const fn = get(id);
   if (!fn) {
-    console.log(args);
+    console.log(response);
     warn(`callback ${id} may already be disposed`);
     return;
   }
-  fn(args);
+  fn(response);
   remove(id);
 };
 class JsonRpcError extends Error {
@@ -822,7 +880,7 @@ class JsonRpcError extends Error {
 const MethodNotFound = -32601;
 const Custom = -32001;
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
-const getType = prettyError => {
+const getErrorType = prettyError => {
   if (prettyError && prettyError.type) {
     return prettyError.type;
   }
@@ -845,7 +903,7 @@ const getErrorProperty = (error, prettyError) => {
     data: {
       stack: prettyError.stack,
       codeFrame: prettyError.codeFrame,
-      type: getType(prettyError),
+      type: getErrorType(prettyError),
       code: prettyError.code,
       name: prettyError.name
     }
@@ -893,32 +951,42 @@ const defaultRequiresSocket = () => {
   return false;
 };
 const defaultResolve = resolve;
-const handleJsonRpcMessage = async (...args) => {
-  let message;
-  let ipc;
-  let execute;
-  let preparePrettyError;
-  let logError;
-  let resolve;
-  let requiresSocket;
+
+// TODO maybe remove this in v6 or v7, only accept options object to simplify the code
+const normalizeParams = args => {
   if (args.length === 1) {
-    const arg = args[0];
-    message = arg.message;
-    ipc = arg.ipc;
-    execute = arg.execute;
-    preparePrettyError = arg.preparePrettyError || defaultPreparePrettyError;
-    logError = arg.logError || defaultLogError;
-    requiresSocket = arg.requiresSocket || defaultRequiresSocket;
-    resolve = arg.resolve || defaultResolve;
-  } else {
-    ipc = args[0];
-    message = args[1];
-    execute = args[2];
-    resolve = args[3];
-    preparePrettyError = args[4];
-    logError = args[5];
-    requiresSocket = args[6];
+    const options = args[0];
+    return {
+      ipc: options.ipc,
+      message: options.message,
+      execute: options.execute,
+      resolve: options.resolve || defaultResolve,
+      preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
+      logError: options.logError || defaultLogError,
+      requiresSocket: options.requiresSocket || defaultRequiresSocket
+    };
   }
+  return {
+    ipc: args[0],
+    message: args[1],
+    execute: args[2],
+    resolve: args[3],
+    preparePrettyError: args[4],
+    logError: args[5],
+    requiresSocket: args[6]
+  };
+};
+const handleJsonRpcMessage = async (...args) => {
+  const options = normalizeParams(args);
+  const {
+    message,
+    ipc,
+    execute,
+    resolve,
+    preparePrettyError,
+    logError,
+    requiresSocket
+  } = options;
   if ('id' in message) {
     if ('method' in message) {
       const response = await getResponse(message, ipc, execute, preparePrettyError, logError, requiresSocket);
@@ -976,6 +1044,27 @@ const Auto = () => {
 const getData$1 = event => {
   return event.data;
 };
+const attachEvents = that => {
+  const handleMessage = (...args) => {
+    const data = that.getData(...args);
+    that.dispatchEvent(new MessageEvent('message', {
+      data
+    }));
+  };
+  that.onMessage(handleMessage);
+  const handleClose = event => {
+    that.dispatchEvent(new Event('close'));
+  };
+  that.onClose(handleClose);
+};
+class Ipc extends EventTarget {
+  constructor(rawIpc) {
+    super();
+    this._rawIpc = rawIpc;
+    attachEvents(this);
+  }
+}
+const readyMessage = 'ready';
 const walkValue = (value, transferrables, isTransferrable) => {
   if (!value) {
     return;
@@ -1026,35 +1115,14 @@ const getTransferrables = value => {
   walkValue(value, transferrables, isTransferrable);
   return transferrables;
 };
-const attachEvents = that => {
-  const handleMessage = (...args) => {
-    const data = that.getData(...args);
-    that.dispatchEvent(new MessageEvent('message', {
-      data
-    }));
-  };
-  that.onMessage(handleMessage);
-  const handleClose = event => {
-    that.dispatchEvent(new Event('close'));
-  };
-  that.onClose(handleClose);
-};
-class Ipc extends EventTarget {
-  constructor(rawIpc) {
-    super();
-    this._rawIpc = rawIpc;
-    attachEvents(this);
-  }
-}
-const readyMessage = 'ready';
-const listen$4 = () => {
+const listen$2 = () => {
   // @ts-ignore
   if (typeof WorkerGlobalScope === 'undefined') {
     throw new TypeError('module is not in web worker scope');
   }
   return globalThis;
 };
-const signal$3 = global => {
+const signal$2 = global => {
   global.postMessage(readyMessage);
 };
 class IpcChildWithModuleWorker extends Ipc {
@@ -1080,14 +1148,14 @@ class IpcChildWithModuleWorker extends Ipc {
     this._rawIpc.addEventListener('message', callback);
   }
 }
-const wrap$6 = global => {
+const wrap$5 = global => {
   return new IpcChildWithModuleWorker(global);
 };
 const IpcChildWithModuleWorker$1 = {
   __proto__: null,
-  listen: listen$4,
-  signal: signal$3,
-  wrap: wrap$6
+  listen: listen$2,
+  signal: signal$2,
+  wrap: wrap$5
 };
 const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE';
 const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON';
@@ -1204,10 +1272,10 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
 };
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
-    return line.slice(`Error: `.length);
+    return line.slice('Error: '.length);
   }
   if (line.startsWith('VError: ')) {
-    return line.slice(`VError: `.length);
+    return line.slice('VError: '.length);
   }
   return line;
 };
@@ -1305,10 +1373,10 @@ const waitForFirstMessage = async port => {
   // @ts-ignore
   return event.data;
 };
-const listen$3 = async () => {
-  const parentIpcRaw = listen$4();
-  signal$3(parentIpcRaw);
-  const parentIpc = wrap$6(parentIpcRaw);
+const listen$1$1 = async () => {
+  const parentIpcRaw = listen$2();
+  signal$2(parentIpcRaw);
+  const parentIpc = wrap$5(parentIpcRaw);
   const firstMessage = await waitForFirstMessage(parentIpc);
   if (firstMessage.method !== 'initialize') {
     throw new IpcError('unexpected first message');
@@ -1353,13 +1421,13 @@ class IpcChildWithModuleWorkerAndMessagePort extends Ipc {
     this._rawIpc.start();
   }
 }
-const wrap$5 = port => {
+const wrap$4 = port => {
   return new IpcChildWithModuleWorkerAndMessagePort(port);
 };
 const IpcChildWithModuleWorkerAndMessagePort$1 = {
   __proto__: null,
-  listen: listen$3,
-  wrap: wrap$5
+  listen: listen$1$1,
+  wrap: wrap$4
 };
 
 const getModule = method => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-search-view",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "",
   "main": "dist/extensionSearchViewWorkerMain.js",
   "type": "module",