@lvce-editor/about-view 7.9.0 → 7.11.0

package/dist/aboutWorkerMain.js

@@ -3,9 +3,18 @@ const toCommandId = key => {
   return key.slice(dotIndex + 1);
 };
 const create$a = () => {
+  const commandQueues = new Map();
+  const generations = Object.create(null);
   const states = Object.create(null);
   const commandMapRef = {};
-  const updateState = (uid, updater) => {
+  const getGeneration = uid => generations[uid] || 0;
+  const isCurrentGeneration = (uid, generation) => {
+    return states[uid] !== undefined && getGeneration(uid) === generation;
+  };
+  const updateState = (uid, generation, fallbackState, updater) => {
+    if (!isCurrentGeneration(uid, generation)) {
+      return Promise.resolve(fallbackState);
+    }
     const current = states[uid];
     const updatedState = updater(current.newState);
     if (updatedState !== current.newState) {
@@ -17,8 +26,44 @@ const create$a = () => {
     }
     return Promise.resolve(updatedState);
   };
+  const createAsyncCommandContext = (uid, generation) => {
+    let latestState = states[uid].newState;
+    return {
+      getState: () => {
+        if (isCurrentGeneration(uid, generation)) {
+          latestState = states[uid].newState;
+        }
+        return latestState;
+      },
+      updateState: async updater => {
+        latestState = await updateState(uid, generation, latestState, updater);
+        return latestState;
+      }
+    };
+  };
+  const enqueueCommand = async (uid, command) => {
+    const previous = commandQueues.get(uid) || Promise.resolve();
+    const run = async () => {
+      try {
+        await previous;
+      } catch {
+        // The previous caller receives its error; later commands must still run.
+      }
+      await command();
+    };
+    const current = run();
+    commandQueues.set(uid, current);
+    try {
+      await current;
+    } finally {
+      if (commandQueues.get(uid) === current) {
+        commandQueues.delete(uid);
+      }
+    }
+  };
   return {
     clear() {
+      commandQueues.clear();
       for (const key of Object.keys(states)) {
         delete states[key];
       }
@@ -38,6 +83,7 @@ const create$a = () => {
       return diffResult;
     },
     dispose(uid) {
+      commandQueues.delete(uid);
       delete states[uid];
     },
     get(uid) {
@@ -55,6 +101,10 @@ const create$a = () => {
       Object.assign(commandMapRef, commandMap);
     },
     set(uid, oldState, newState, scheduledState) {
+      const current = states[uid];
+      if (!current || oldState === newState && newState !== current.newState) {
+        generations[uid] = getGeneration(uid) + 1;
+      }
       states[uid] = {
         newState,
         oldState,
@@ -63,16 +113,15 @@ const create$a = () => {
     },
     wrapAsyncCommand(fn) {
       const wrapped = async (uid, ...args) => {
-        const context = {
-          getState: () => states[uid].newState,
-          updateState: updater => updateState(uid, updater)
-        };
+        const generation = getGeneration(uid);
+        const context = createAsyncCommandContext(uid, generation);
         await fn(context, ...args);
       };
       return wrapped;
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -81,6 +130,9 @@ const create$a = () => {
         if (oldState === newerState || newState === newerState) {
           return;
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return;
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -105,6 +157,7 @@ const create$a = () => {
     },
     wrapLoadContent(fn) {
       const wrapped = async (uid, ...args) => {
+        const generation = getGeneration(uid);
         const {
           newState,
           oldState
@@ -119,6 +172,11 @@ const create$a = () => {
             error
           };
         }
+        if (!isCurrentGeneration(uid, generation)) {
+          return {
+            error
+          };
+        }
         const latestOld = states[uid];
         const latestNew = {
           ...latestOld.newState,
@@ -134,6 +192,51 @@ const create$a = () => {
         };
       };
       return wrapped;
+    },
+    wrapSerialAsyncCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        await enqueueCommand(uid, async () => {
+          if (!states[uid]) {
+            return;
+          }
+          const generation = getGeneration(uid);
+          const context = createAsyncCommandContext(uid, generation);
+          await fn(context, ...args);
+        });
+      };
+      return wrapped;
+    },
+    wrapSerialCommand(fn) {
+      const wrapped = async (uid, ...args) => {
+        await enqueueCommand(uid, async () => {
+          if (!states[uid]) {
+            return;
+          }
+          const generation = getGeneration(uid);
+          const {
+            newState,
+            oldState
+          } = states[uid];
+          const newerState = await fn(newState, ...args);
+          if (oldState === newerState || newState === newerState) {
+            return;
+          }
+          if (!isCurrentGeneration(uid, generation)) {
+            return;
+          }
+          const latestOld = states[uid];
+          const latestNew = {
+            ...latestOld.newState,
+            ...newerState
+          };
+          states[uid] = {
+            newState: latestNew,
+            oldState: latestOld.oldState,
+            scheduledState: latestNew
+          };
+        });
+      };
+      return wrapped;
     }
   };
 };
@@ -2171,6 +2274,32 @@ const joinBySpace = (...items) => {
 
 const Focusable = -1;
 
+const dialogToolBarRow = {
+  childCount: 1,
+  className: DialogToolBarRow,
+  type: Div
+};
+const dialogMessageRow = {
+  childCount: 2,
+  className: DialogMessageRow,
+  type: Div
+};
+const dialogContentRight = {
+  childCount: 2,
+  className: DialogContentRight,
+  type: Div
+};
+const dialogHeading = {
+  childCount: 1,
+  className: DialogHeading$1,
+  id: DialogHeading,
+  type: Div
+};
+const dialogButtonsRow = {
+  childCount: 2,
+  className: DialogButtonsRow,
+  type: Div
+};
 const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copyMessage, productName) => {
   const dom = [{
     ariaLabelledBy: joinBySpace(DialogIcon, DialogHeading),
@@ -2181,11 +2310,7 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     role: Dialog,
     tabIndex: Focusable,
     type: Div
-  }, {
-    childCount: 1,
-    className: DialogToolBarRow,
-    type: Div
-  }, {
+  }, dialogToolBarRow, {
     ariaLabel: closeMessage,
     childCount: 1,
     className: DialogClose,
@@ -2195,30 +2320,13 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     childCount: 0,
     className: mergeClassNames(MaskIcon, MaskIconClose),
     type: Div
-  }, {
-    childCount: 2,
-    className: DialogMessageRow,
-    type: Div
-  }, {
+  }, dialogMessageRow, {
     ariaLabel: infoMessage,
     childCount: 0,
     className: mergeClassNames(DialogIcon$1, DialogInfoIcon, MaskIcon, MaskIconInfo),
     id: DialogIcon,
     type: Div
-  }, {
-    childCount: 2,
-    className: DialogContentRight,
-    type: Div
-  }, {
-    childCount: 1,
-    className: DialogHeading$1,
-    id: DialogHeading,
-    type: Div
-  }, text(productName), ...content, {
-    childCount: 2,
-    className: DialogButtonsRow,
-    type: Div
-  }, ...getSecondaryButtonVirtualDom(okMessage, Ok$1), ...getPrimaryButtonVirtualDom(copyMessage, Copy$1)];
+  }, dialogContentRight, dialogHeading, text(productName), ...content, dialogButtonsRow, ...getSecondaryButtonVirtualDom(okMessage, Ok$1), ...getPrimaryButtonVirtualDom(copyMessage, Copy$1)];
   return dom;
 };
 
@@ -2262,7 +2370,7 @@ const renderFocus = (oldState, newState) => {
 };
 
 const renderFocusContext = (oldState, newState) => {
-  return ['Viewlet.setFocusContext', FocusAbout];
+  return ['Viewlet.setFocusContext', newState.uid, FocusAbout];
 };
 
 const getRenderer = diffType => {

package/package.json

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