@lvce-editor/about-view 1.3.0 → 1.5.0

package/dist/aboutWorkerMain.js

@@ -225,109 +225,114 @@ const inSomeYears = years => {
   });
 };
 
-// based on https://github.com/microsoft/vscode/blob/bd782eb059e133d3a20fdb446b8feb0010a278ad/src/vs/base/common/date.ts (License MIT)
 const minute = 60;
 const hour = minute * 60;
 const day = hour * 24;
 const week = day * 7;
 const month = day * 30;
 const year = day * 365;
-const formatDatePast = seconds => {
+
+// based on https://github.com/microsoft/vscode/blob/bd782eb059e133d3a20fdb446b8feb0010a278ad/src/vs/base/common/date.ts (License MIT)
+const formatDateFuture = seconds => {
   if (seconds < minute) {
     if (seconds === 1) {
-      return oneSecondAgo();
+      return inOneSecond();
     }
-    return someSecondsAgo(seconds);
+    return inSomeSeconds(seconds);
   }
   if (seconds < hour) {
     const minutes = Math.floor(seconds / minute);
     if (minutes === 1) {
-      return oneMinuteAgo();
+      return inOneMinute();
     }
-    return someMinutesAgo(minutes);
+    return inSomeMinutes(minutes);
   }
   if (seconds < day) {
     const days = Math.floor(seconds / hour);
     if (days === 1) {
-      return oneHourAgo();
+      return inOneHour();
     }
-    return someHoursAgo(days);
+    return inSomeHours(days);
   }
   if (seconds < week) {
     const days = Math.floor(seconds / day);
     if (days === 1) {
-      return oneDayAgo();
+      return inOneDay();
     }
-    return someDaysAgo(days);
+    return inSomeDays(days);
   }
   if (seconds < month) {
     const weeks = Math.floor(seconds / week);
     if (weeks === 1) {
-      return oneWeekAgo();
+      return inOneWeek();
     }
-    return someWeeksAgo(weeks);
+    return inSomeWeeks(weeks);
   }
   if (seconds < year) {
     const months = Math.floor(seconds / month);
     if (months === 1) {
-      return oneMonthAgo();
+      return inOneMonth();
     }
-    return someMonthsAgo(months);
+    return inSomeMonths(months);
   }
   const years = Math.floor(seconds / year);
   if (years === 1) {
-    return oneYearAgo();
+    return inOneYear();
   }
-  return someYearsAgo(years);
+  return inSomeYears(years);
 };
-const formatDateFuture = seconds => {
+
+// based on https://github.com/microsoft/vscode/blob/bd782eb059e133d3a20fdb446b8feb0010a278ad/src/vs/base/common/date.ts (License MIT)
+const formatDatePast = seconds => {
   if (seconds < minute) {
     if (seconds === 1) {
-      return inOneSecond();
+      return oneSecondAgo();
     }
-    return inSomeSeconds(seconds);
+    return someSecondsAgo(seconds);
   }
   if (seconds < hour) {
     const minutes = Math.floor(seconds / minute);
     if (minutes === 1) {
-      return inOneMinute();
+      return oneMinuteAgo();
     }
-    return inSomeMinutes(minutes);
+    return someMinutesAgo(minutes);
   }
   if (seconds < day) {
     const days = Math.floor(seconds / hour);
     if (days === 1) {
-      return inOneHour();
+      return oneHourAgo();
     }
-    return inSomeHours(days);
+    return someHoursAgo(days);
   }
   if (seconds < week) {
     const days = Math.floor(seconds / day);
     if (days === 1) {
-      return inOneDay();
+      return oneDayAgo();
     }
-    return inSomeDays(days);
+    return someDaysAgo(days);
   }
   if (seconds < month) {
     const weeks = Math.floor(seconds / week);
     if (weeks === 1) {
-      return inOneWeek();
+      return oneWeekAgo();
     }
-    return inSomeWeeks(weeks);
+    return someWeeksAgo(weeks);
   }
   if (seconds < year) {
     const months = Math.floor(seconds / month);
     if (months === 1) {
-      return inOneMonth();
+      return oneMonthAgo();
     }
-    return inSomeMonths(months);
+    return someMonthsAgo(months);
   }
   const years = Math.floor(seconds / year);
   if (years === 1) {
-    return inOneYear();
+    return oneYearAgo();
   }
-  return inSomeYears(years);
+  return someYearsAgo(years);
 };
+
+// based on https://github.com/microsoft/vscode/blob/bd782eb059e133d3a20fdb446b8feb0010a278ad/src/vs/base/common/date.ts (License MIT)
 const formatDate = (date, now) => {
   const difference = now - date;
   const seconds = Math.round(difference / 1000);
@@ -337,7 +342,7 @@ const formatDate = (date, now) => {
   return formatDateFuture(-seconds);
 };
 
-const formatAboutDate = isoDate => {
+const formatAboutDate = (isoDate, now) => {
   if (!isoDate) {
     return 'unknown';
   }
@@ -345,7 +350,6 @@ const formatAboutDate = isoDate => {
   if (isNaN(date)) {
     return `Invalid Date: ${isoDate}`;
   }
-  const now = Date.now();
   const ago = formatDate(date, now);
   return `${isoDate} (${ago})`;
 };
@@ -384,7 +388,8 @@ const productNameLong = 'Lvce Editor - OSS';
 
 const getDetailString = async () => {
   const [electronVersion, nodeVersion, chromeVersion, version, commit, v8Version, date] = await Promise.all([getElectronVersion(), getNodeVersion(), getChromeVersion(), getVersion(), getCommit(), getV8Version(), getDate()]);
-  const formattedDate = formatAboutDate(date);
+  const now = Date.now();
+  const formattedDate = formatAboutDate(date, now);
   const lines = [`Version: ${version}`, `Commit: ${commit}`, `Date: ${formattedDate}`, `Electron: ${electronVersion}`, `Chromium: ${chromeVersion}`, `Node: ${nodeVersion}`, `V8: ${v8Version}`];
   return joinLines$1(lines);
 };
@@ -397,7 +402,8 @@ const getDetailStringWeb = () => {
   const version$1 = version;
   const commit$1 = commit;
   const date$1 = date;
-  const formattedDate = formatAboutDate(date$1);
+  const now = Date.now();
+  const formattedDate = formatAboutDate(date$1, now);
   const browser = getBrowser();
   const lines = [`Version: ${version$1}`, `Commit: ${commit$1}`, `Date: ${formattedDate}`, `Browser: ${browser}`];
   return lines;
@@ -456,10 +462,14 @@ const getAboutContentVirtualDom = lines => {
 const Button = 'button';
 const Dialog = 'dialog';
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
 const getPrimaryButtonVirtualDom = (message, onClick) => {
   return [{
     type: Button$2,
-    className: `${Button$1} ${ButtonPrimary}`,
+    className: mergeClassNames(Button$1, ButtonPrimary),
     onClick,
     childCount: 1
   }, text(message)];
@@ -467,7 +477,7 @@ const getPrimaryButtonVirtualDom = (message, onClick) => {
 const getSecondaryButtonVirtualDom = (message, onClick) => {
   return [{
     type: Button$2,
-    className: `${Button$1} ${ButtonSecondary}`,
+    className: mergeClassNames(Button$1, ButtonSecondary),
     onClick,
     childCount: 1
   }, text(message)];
@@ -634,7 +644,7 @@ class AssertionError extends Error {
     this.name = 'AssertionError';
   }
 }
-const getType$1 = value => {
+const getType = value => {
   switch (typeof value) {
     case 'number':
       return 'number';
@@ -657,7 +667,7 @@ const getType$1 = value => {
   }
 };
 const number = value => {
-  const type = getType$1(value);
+  const type = getType(value);
   if (type !== 'number') {
     throw new AssertionError('expected value to be of type number');
   }
@@ -694,7 +704,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;
   }
@@ -717,7 +727,7 @@ const getErrorProperty = (error, prettyError) => {
     data: {
       stack: prettyError.stack,
       codeFrame: prettyError.codeFrame,
-      type: getType(prettyError),
+      type: getErrorType(prettyError),
       code: prettyError.code,
       name: prettyError.name
     }

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@lvce-editor/about-view",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "",
   "main": "dist/aboutWorkerMain.js",
   "type": "module",
-  "keywords": [],
-  "author": "",
+  "keywords": [
+    "about"
+  ],
+  "author": "Lvce Editor",
   "license": "MIT"
 }