@lvce-editor/about-view 7.1.0 → 7.2.0

package/dist/aboutWorkerMain.js

@@ -369,12 +369,33 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$e
 };
 
+class CommandNotFoundError extends Error {
+  constructor(command) {
+    super(`Command not found ${command}`);
+    this.name = 'CommandNotFoundError';
+  }
+}
+const commands = Object.create(null);
+const register = commandMap => {
+  Object.assign(commands, commandMap);
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new CommandNotFoundError(command);
+  }
+  return fn(...args);
+};
+
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -393,12 +414,12 @@ const getErrorConstructor = (message, type) => {
     switch (type) {
       case DomException:
         return DOMException;
-      case TypeError$1:
-        return TypeError;
-      case SyntaxError$1:
-        return SyntaxError;
       case ReferenceError$1:
         return ReferenceError;
+      case SyntaxError$1:
+        return SyntaxError;
+      case TypeError$1:
+        return TypeError;
       default:
         return Error;
     }
@@ -527,7 +548,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -554,56 +575,56 @@ const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
       code: MethodNotFound,
-      message: error.message,
-      data: error.stack
+      data: error.stack,
+      message: error.message
     };
   }
   return {
     code: Custom,
-    message: prettyError.message,
     data: {
-      stack: getStack(prettyError),
-      codeFrame: prettyError.codeFrame,
-      type: getErrorType(prettyError),
       code: prettyError.code,
-      name: prettyError.name
-    }
+      codeFrame: prettyError.codeFrame,
+      name: prettyError.name,
+      stack: getStack(prettyError),
+      type: getErrorType(prettyError)
+    },
+    message: prettyError.message
   };
 };
-const create$1$2 = (id, error) => {
+const create$1$1 = (id, error) => {
   return {
-    jsonrpc: Two$1,
+    error,
     id,
-    error
+    jsonrpc: Two$1
   };
 };
 const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$2(id, errorProperty);
+  return create$1$1(id, errorProperty);
 };
-const create$3 = (message, result) => {
+const create$7 = (message, result) => {
   return {
-    jsonrpc: Two$1,
     id: message.id,
+    jsonrpc: Two$1,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$3(message, resultProperty);
+  return create$7(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two$1,
-    id,
     error: {
       code: Custom,
+      data: error,
       // @ts-ignore
-      message: error.message,
-      data: error
-    }
+      message: error.message
+    },
+    id,
+    jsonrpc: Two$1
   };
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
@@ -633,35 +654,35 @@ const normalizeParams = args => {
   if (args.length === 1) {
     const options = args[0];
     return {
+      execute: options.execute,
       ipc: options.ipc,
+      logError: options.logError || defaultLogError,
       message: options.message,
-      execute: options.execute,
-      resolve: options.resolve || defaultResolve,
       preparePrettyError: options.preparePrettyError || defaultPreparePrettyError,
-      logError: options.logError || defaultLogError,
-      requiresSocket: options.requiresSocket || defaultRequiresSocket
+      requiresSocket: options.requiresSocket || defaultRequiresSocket,
+      resolve: options.resolve || defaultResolve
     };
   }
   return {
+    execute: args[2],
     ipc: args[0],
+    logError: args[5],
     message: args[1],
-    execute: args[2],
-    resolve: args[3],
     preparePrettyError: args[4],
-    logError: args[5],
-    requiresSocket: args[6]
+    requiresSocket: args[6],
+    resolve: args[3]
   };
 };
 const handleJsonRpcMessage = async (...args) => {
   const options = normalizeParams(args);
   const {
-    message,
-    ipc,
     execute,
-    resolve,
-    preparePrettyError,
+    ipc,
     logError,
-    requiresSocket
+    message,
+    preparePrettyError,
+    requiresSocket,
+    resolve
   } = options;
   if ('id' in message) {
     if ('method' in message) {
@@ -684,36 +705,17 @@ const handleJsonRpcMessage = async (...args) => {
   throw new JsonRpcError('unexpected message');
 };
 
-class CommandNotFoundError extends Error {
-  constructor(command) {
-    super(`Command not found ${command}`);
-    this.name = 'CommandNotFoundError';
-  }
-}
-const commands = Object.create(null);
-const register = commandMap => {
-  Object.assign(commands, commandMap);
-};
-const getCommand = key => {
-  return commands[key];
-};
-const execute = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new CommandNotFoundError(command);
-  }
-  return fn(...args);
-};
-
 const Two = '2.0';
-const create$o = (method, params) => {
+
+const create$6 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$n = (id, method, params) => {
+
+const create$5 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -722,15 +724,14 @@ const create$n = (id, method, params) => {
   };
   return message;
 };
+
 let id = 0;
-const create$m = () => {
+const create$4 = () => {
   return ++id;
 };
 
-/* eslint-disable n/no-unsupported-features/es-syntax */
-
 const registerPromise = map => {
-  const id = create$m();
+  const id = create$4();
   const {
     promise,
     resolve
@@ -742,13 +743,12 @@ const registerPromise = map => {
   };
 };
 
-// @ts-ignore
 const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
   const {
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$n(id, method, params);
+  const message = create$5(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -784,12 +784,13 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$o(method, params);
+      const message = create$6(method, params);
       ipc.send(message);
     }
   };
   return rpc;
 };
+
 const requiresSocket = () => {
   return false;
 };
@@ -804,6 +805,7 @@ const handleMessage = event => {
   const actualExecute = event?.target?.execute || execute;
   return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
+
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
     ipc.addEventListener('message', handleMessage);
@@ -812,6 +814,7 @@ const handleIpc = ipc => {
     ipc.on('message', handleMessage);
   }
 };
+
 const listen$1 = async (module, options) => {
   const rawIpc = await module.listen(options);
   if (module.signal) {
@@ -820,7 +823,8 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$1$1 = async ({
+
+const create$3 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -830,14 +834,26 @@ const create$1$1 = async ({
   const rpc = createRpc(ipc);
   return rpc;
 };
-const WebWorkerRpcClient = {
-  __proto__: null,
-  create: create$1$1
-};
-
-const TargetName = 'event.target.name';
 
-const RendererWorker = 1;
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
 
 const rpcs = Object.create(null);
 const set$2 = (id, rpc) => {
@@ -846,7 +862,11 @@ const set$2 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$2 = rpcId => {
   return {
     async dispose() {
@@ -865,12 +885,38 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$2(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$2(rpcId, rpc);
     }
   };
 };
 
+const Button$2 = 1;
+const Div = 4;
+const Text = 12;
+const Br = 55;
+
+const TargetName = 'event.target.name';
+
+const Tab = 2;
+const Escape = 8;
+
+const Shift = 1 << 10 >>> 0;
+
+const RendererWorker = 1;
+
 const {
   invoke,
   set: set$1
@@ -914,42 +960,68 @@ const create$1 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
-    get(uid) {
-      return states[uid];
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
     },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
+    diff(uid, modules, numbers) {
+      const {
+        newState,
+        oldState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     },
     dispose(uid) {
       delete states[uid];
     },
+    get(uid) {
+      return states[uid];
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
     getKeys() {
       return Object.keys(states).map(key => {
-        return Number.parseInt(key);
+        return Number.parseFloat(key);
       });
     },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
-          oldState,
-          newState
+          newState,
+          oldState
         } = states[uid];
         const newerState = await fn(newState, ...args);
         if (oldState === newerState || newState === newerState) {
           return;
         }
-        const latest = states[uid];
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
         states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
+          newState: latestNew,
+          oldState: latestOld.oldState
         };
       };
       return wrapped;
@@ -963,27 +1035,36 @@ const create$1 = () => {
       };
       return wrapped;
     },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
+    wrapLoadContent(fn) {
+      const wrapped = async (uid, ...args) => {
+        const {
+          newState,
+          oldState
+        } = states[uid];
+        const result = await fn(newState, ...args);
+        const {
+          error,
+          state
+        } = result;
+        if (oldState === state || newState === state) {
+          return {
+            error
+          };
         }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...state
+        };
+        states[uid] = {
+          newState: latestNew,
+          oldState: latestOld.oldState
+        };
+        return {
+          error
+        };
+      };
+      return wrapped;
     }
   };
 };
@@ -1099,25 +1180,15 @@ const focusPrevious = state => {
   };
 };
 
-const Button$2 = 1;
-const Div = 4;
-const Text = 12;
-const Br = 55;
-
-const Tab = 2;
-const Escape = 8;
-
-const Shift = 1 << 10 >>> 0;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 
@@ -1369,6 +1440,22 @@ const inSomeYears = years => {
   });
 };
 
+const formatRelativeDateRange = (seconds, range) => {
+  const value = Math.floor(seconds / range.divisor);
+  if (value === 1) {
+    return range.one();
+  }
+  return range.some(value);
+};
+const formatRelativeDate = (seconds, ranges) => {
+  for (const range of ranges) {
+    if (seconds < range.limit) {
+      return formatRelativeDateRange(seconds, range);
+    }
+  }
+  throw new Error('unreachable');
+};
+
 const minute = 60;
 const hour = minute * 60;
 const day = hour * 24;
@@ -1377,103 +1464,85 @@ const month = day * 30;
 const year = day * 365;
 
 // based on https://github.com/microsoft/vscode/blob/bd782eb059e133d3a20fdb446b8feb0010a278ad/src/vs/base/common/date.ts (License MIT)
+const ranges$1 = [{
+  divisor: 1,
+  limit: minute,
+  one: inOneSecond,
+  some: inSomeSeconds
+}, {
+  divisor: minute,
+  limit: hour,
+  one: inOneMinute,
+  some: inSomeMinutes
+}, {
+  divisor: hour,
+  limit: day,
+  one: inOneHour,
+  some: inSomeHours
+}, {
+  divisor: day,
+  limit: week,
+  one: inOneDay,
+  some: inSomeDays
+}, {
+  divisor: week,
+  limit: month,
+  one: inOneWeek,
+  some: inSomeWeeks
+}, {
+  divisor: month,
+  limit: year,
+  one: inOneMonth,
+  some: inSomeMonths
+}, {
+  divisor: year,
+  limit: Number.POSITIVE_INFINITY,
+  one: inOneYear,
+  some: inSomeYears
+}];
 const formatDateFuture = seconds => {
-  if (seconds < minute) {
-    if (seconds === 1) {
-      return inOneSecond();
-    }
-    return inSomeSeconds(seconds);
-  }
-  if (seconds < hour) {
-    const minutes = Math.floor(seconds / minute);
-    if (minutes === 1) {
-      return inOneMinute();
-    }
-    return inSomeMinutes(minutes);
-  }
-  if (seconds < day) {
-    const days = Math.floor(seconds / hour);
-    if (days === 1) {
-      return inOneHour();
-    }
-    return inSomeHours(days);
-  }
-  if (seconds < week) {
-    const days = Math.floor(seconds / day);
-    if (days === 1) {
-      return inOneDay();
-    }
-    return inSomeDays(days);
-  }
-  if (seconds < month) {
-    const weeks = Math.floor(seconds / week);
-    if (weeks === 1) {
-      return inOneWeek();
-    }
-    return inSomeWeeks(weeks);
-  }
-  if (seconds < year) {
-    const months = Math.floor(seconds / month);
-    if (months === 1) {
-      return inOneMonth();
-    }
-    return inSomeMonths(months);
-  }
-  const years = Math.floor(seconds / year);
-  if (years === 1) {
-    return inOneYear();
-  }
-  return inSomeYears(years);
+  return formatRelativeDate(seconds, ranges$1);
 };
 
 // based on https://github.com/microsoft/vscode/blob/bd782eb059e133d3a20fdb446b8feb0010a278ad/src/vs/base/common/date.ts (License MIT)
+const ranges = [{
+  divisor: 1,
+  limit: minute,
+  one: oneSecondAgo,
+  some: someSecondsAgo
+}, {
+  divisor: minute,
+  limit: hour,
+  one: oneMinuteAgo,
+  some: someMinutesAgo
+}, {
+  divisor: hour,
+  limit: day,
+  one: oneHourAgo,
+  some: someHoursAgo
+}, {
+  divisor: day,
+  limit: week,
+  one: oneDayAgo,
+  some: someDaysAgo
+}, {
+  divisor: week,
+  limit: month,
+  one: oneWeekAgo,
+  some: someWeeksAgo
+}, {
+  divisor: month,
+  limit: year,
+  one: oneMonthAgo,
+  some: someMonthsAgo
+}, {
+  divisor: year,
+  limit: Number.POSITIVE_INFINITY,
+  one: oneYearAgo,
+  some: someYearsAgo
+}];
 const formatDatePast = seconds => {
-  if (seconds < minute) {
-    if (seconds === 1) {
-      return oneSecondAgo();
-    }
-    return someSecondsAgo(seconds);
-  }
-  if (seconds < hour) {
-    const minutes = Math.floor(seconds / minute);
-    if (minutes === 1) {
-      return oneMinuteAgo();
-    }
-    return someMinutesAgo(minutes);
-  }
-  if (seconds < day) {
-    const days = Math.floor(seconds / hour);
-    if (days === 1) {
-      return oneHourAgo();
-    }
-    return someHoursAgo(days);
-  }
-  if (seconds < week) {
-    const days = Math.floor(seconds / day);
-    if (days === 1) {
-      return oneDayAgo();
-    }
-    return someDaysAgo(days);
-  }
-  if (seconds < month) {
-    const weeks = Math.floor(seconds / week);
-    if (weeks === 1) {
-      return oneWeekAgo();
-    }
-    return someWeeksAgo(weeks);
-  }
-  if (seconds < year) {
-    const months = Math.floor(seconds / month);
-    if (months === 1) {
-      return oneMonthAgo();
-    }
-    return someMonthsAgo(months);
-  }
-  const years = Math.floor(seconds / year);
-  if (years === 1) {
-    return oneYearAgo();
-  }
-  return someYearsAgo(years);
+  return formatRelativeDate(seconds, ranges);
 };
 
 // based on https://github.com/microsoft/vscode/blob/bd782eb059e133d3a20fdb446b8feb0010a278ad/src/vs/base/common/date.ts (License MIT)
@@ -1880,7 +1949,7 @@ const commandMap = {
 
 const listen = async () => {
   registerCommands(commandMap);
-  const rpc = await WebWorkerRpcClient.create({
+  const rpc = await create$3({
     commandMap: commandMap
   });
   set$1(rpc);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/about-view",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "About View Worker",
   "keywords": [
     "about-view"