@lvce-editor/extension-detail-view 6.6.0 → 6.8.0

package/dist/extensionDetailViewWorkerMain.js

@@ -1045,15 +1045,17 @@ const RendererWorker = 1;
 const FocusElementByName = 'Viewlet.focusElementByName';
 const SetFocusContext = 'Viewlet.setFocusContext';
 
+const FocusExtensionDetailTabs = 451;
+
 const rpcs = Object.create(null);
-const set$b = (id, rpc) => {
+const set$a = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$3 = id => {
   return rpcs[id];
 };
 
-const create$7 = rpcId => {
+const create$4 = rpcId => {
   return {
     async dispose() {
       const rpc = get$3(rpcId);
@@ -1072,7 +1074,7 @@ const create$7 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$b(rpcId, rpc);
+      set$a(rpcId, rpc);
     }
   };
 };
@@ -1591,56 +1593,14 @@ const IpcParentWithMessagePort$1 = {
   wrap: wrap$5
 };
 
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$a = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$2 = id => {
   return callbacks[id];
 };
 const remove$1 = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$a(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -1836,7 +1796,7 @@ const getErrorProperty = (error, prettyError) => {
 };
 const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -1847,20 +1807,20 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$6 = (message, result) => {
+const create$3 = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$6(message, resultProperty);
+  return create$3(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -1947,29 +1907,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
-};
-const invoke$6 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$4 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -1992,24 +1929,87 @@ const execute = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$p = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$o = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id = 0;
+const create$n = () => {
+  return ++id;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$n();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$o(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$6(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$4(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$p(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -2026,7 +2026,7 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -2044,15 +2044,16 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$5 = async ({
+const create$7 = async ({
   commandMap,
+  isMessagePortOpen = true,
   messagePort
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen: true
+    isMessagePortOpen,
+    messagePort
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
   handleIpc(ipc);
@@ -2060,8 +2061,9 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const create$3 = async ({
+const create$5 = async ({
   commandMap,
+  isMessagePortOpen,
   send
 }) => {
   const {
@@ -2069,14 +2071,15 @@ const create$3 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$5({
+  return create$7({
     commandMap,
+    isMessagePortOpen,
     messagePort: port2
   });
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$3
+  create: create$5
 };
 const create$2 = async ({
   commandMap
@@ -2105,9 +2108,9 @@ const createMockRpc = ({
     return command(...params);
   };
   const mockRpc = {
+    invocations,
     invoke,
-    invokeAndTransfer: invoke,
-    invocations
+    invokeAndTransfer: invoke
   };
   return mockRpc;
 };
@@ -2117,7 +2120,7 @@ const {
   invoke: invoke$5,
   invokeAndTransfer: invokeAndTransfer$3,
   set: set$9
-} = create$7(ExtensionHostWorker);
+} = create$4(ExtensionHostWorker);
 const executeReferenceProvider = async (id, offset) => {
   // @ts-ignore
   return invoke$5('ExtensionHostReference.executeReferenceProvider', id, offset);
@@ -2153,7 +2156,7 @@ const ExtensionHost = {
 const {
   invoke: invoke$4,
   set: set$8
-} = create$7(ExtensionManagementWorker);
+} = create$4(ExtensionManagementWorker);
 const enable2 = (id, platform) => {
   return invoke$4(`Extensions.enable2`, id, platform);
 };
@@ -2166,7 +2169,7 @@ const {
   invoke: invoke$3,
   invokeAndTransfer: invokeAndTransfer$2,
   set: set$7
-} = create$7(FileSystemWorker$1);
+} = create$4(FileSystemWorker$1);
 const remove = async dirent => {
   return invoke$3('FileSystem.remove', dirent);
 };
@@ -2254,7 +2257,7 @@ const {
   invoke: invoke$2,
   invokeAndTransfer: invokeAndTransfer$1,
   set: set$6
-} = create$7(MarkdownWorker$1);
+} = create$4(MarkdownWorker$1);
 const getVirtualDom$1 = async html => {
   // @ts-ignore
   return invoke$2('Markdown.getVirtualDom', html);
@@ -2286,7 +2289,7 @@ const {
   invoke: invoke$1,
   invokeAndTransfer,
   set: set$5
-} = create$7(RendererWorker);
+} = create$4(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -3279,16 +3282,15 @@ const focusPreviousTab = state => {
   };
 };
 
-const focusId$1 = 451;
 const getKeyBindings = () => {
   return [{
     command: 'ExtensionDetail.focusNextTab',
     key: RightArrow,
-    when: focusId$1
+    when: FocusExtensionDetailTabs
   }, {
     command: 'ExtensionDetail.focusPreviousTab',
     key: LeftArrow,
-    when: focusId$1
+    when: FocusExtensionDetailTabs
   }];
 };
 
@@ -4096,7 +4098,7 @@ const formatLastUpdated = lastUpdated => {
     return 'n/a';
   }
   try {
-    const date = new Date(lastUpdated);
+    const date = new Date(lastUpdated * 1000);
     if (Number.isNaN(date.getTime())) {
       return 'n/a';
     }
@@ -4581,13 +4583,16 @@ const handleSelectionChange = async (state, selection) => {
   return state;
 };
 
-const focusId = 451;
 const handleTabFocus = (state, name) => {
-  const tabIndex = state.tabs.findIndex(tab => tab.name === name);
-  const newFocusedTabIndex = tabIndex === -1 ? state.focusedTabIndex : tabIndex;
+  const {
+    focusedTabIndex,
+    tabs
+  } = state;
+  const tabIndex = tabs.findIndex(tab => tab.name === name);
+  const newFocusedTabIndex = tabIndex === -1 ? focusedTabIndex : tabIndex;
   return {
     ...state,
-    focus: focusId,
+    focus: FocusExtensionDetailTabs,
     focusedTabIndex: newFocusedTabIndex
   };
 };
@@ -5075,8 +5080,8 @@ const getAdditionalDetailsVirtualDom = (showAdditionalDetails, firstHeading, ent
   if (!showAdditionalDetails) {
     return [];
   }
-  const sections = [...getAdditionalDetailsEntryVirtualDom(firstHeading, entries, getMoreInfoVirtualDom), ...(secondEntries.length > 0 ? getAdditionalDetailsEntryVirtualDom(secondHeading, secondEntries, getMoreInfoVirtualDom) : []), ...getAdditionalDetailsEntryVirtualDom(thirdHeading, categories, getCategoriesDom), ...getAdditionalDetailsEntryVirtualDom(fourthHeading, resources, getResourcesVirtualDom)];
-  const childCount = secondEntries.length > 0 ? 4 : 3;
+  const sections = [...getAdditionalDetailsEntryVirtualDom(firstHeading, entries, getMoreInfoVirtualDom), ...(secondEntries.length > 0 ? getAdditionalDetailsEntryVirtualDom(secondHeading, secondEntries, getMoreInfoVirtualDom) : []), ...(categories.length > 0 ? getAdditionalDetailsEntryVirtualDom(thirdHeading, categories, getCategoriesDom) : []), ...getAdditionalDetailsEntryVirtualDom(fourthHeading, resources, getResourcesVirtualDom)];
+  const childCount = 1 + (secondEntries.length > 0 ? 1 : 0) + (categories.length > 0 ? 1 : 0) + 1;
   return [{
     childCount: 1,
     className: Aside,
@@ -5407,7 +5412,7 @@ const renderFocusContext = (oldState, newState) => {
     focus,
     uid
   } = newState;
-  if (focus === 451) {
+  if (focus === FocusExtensionDetailTabs) {
     return [SetFocusContext, uid, focus];
   }
   // TODO set focus context

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-detail-view",
-  "version": "6.6.0",
+  "version": "6.8.0",
   "description": "Extension Detail View Worker",
   "repository": {
     "type": "git",
@@ -11,6 +11,6 @@
   "type": "module",
   "main": "dist/extensionDetailViewWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/constants": "^2.4.0"
+    "@lvce-editor/constants": "^2.7.0"
   }
 }