@odoo/o-spreadsheet 15.0.5 → 15.0.7

package/dist/o-spreadsheet.cjs.js

@@ -6595,7 +6595,7 @@ const POW = {
       base (number) ${_lt("The number to raise to the exponent power.")}
       exponent (number) ${_lt("The exponent to raise base to.")}
     `),
-    returns: ["BOOLEAN"],
+    returns: ["NUMBER"],
     compute: function (base, exponent) {
         return POWER.compute(base, exponent);
     },
@@ -21322,13 +21322,9 @@ class Session extends EventBus {
     }
     loadInitialMessages(messages) {
         this.isReplayingInitialRevisions = true;
-        this.on("unexpected-revision-id", this, ({ revisionId }) => {
-            throw new Error(`The spreadsheet could not be loaded. Revision ${revisionId} is corrupted.`);
-        });
         for (const message of messages) {
             this.onMessageReceived(message);
         }
-        this.off("unexpected-revision-id", this);
         this.isReplayingInitialRevisions = false;
     }
     /**
@@ -21400,6 +21396,10 @@ class Session extends EventBus {
     onMessageReceived(message) {
         if (this.isAlreadyProcessed(message))
             return;
+        if (this.isWrongServerRevisionId(message)) {
+            this.trigger("unexpected-revision-id");
+            return;
+        }
         switch (message.type) {
             case "CLIENT_MOVED":
                 this.onClientMoved(message);
@@ -21426,10 +21426,6 @@ class Session extends EventBus {
                 });
                 break;
             case "REMOTE_REVISION":
-                if (message.serverRevisionId !== this.serverRevisionId) {
-                    this.trigger("unexpected-revision-id", { revisionId: message.serverRevisionId });
-                    return;
-                }
                 const { clientId, commands } = message;
                 const revision = new Revision(message.nextRevisionId, clientId, commands);
                 if (revision.clientId !== this.clientId) {
@@ -21558,6 +21554,17 @@ class Session extends EventBus {
                 return false;
         }
     }
+    isWrongServerRevisionId(message) {
+        switch (message.type) {
+            case "REMOTE_REVISION":
+            case "REVISION_REDONE":
+            case "REVISION_UNDONE":
+            case "SNAPSHOT_CREATED":
+                return message.serverRevisionId !== this.serverRevisionId;
+            default:
+                return false;
+        }
+    }
     dropPendingHistoryMessages() {
         this.waitingUndoRedoAck = false;
         this.pendingMessages = this.pendingMessages.filter(({ type }) => type !== "REVISION_REDONE" && type !== "REVISION_UNDONE");
@@ -24782,12 +24789,9 @@ function addFormula(cell) {
     else {
         // Shouldn't we always output the value then ?
         const value = cell.value;
-        // what if value = 0? Is this condition correct?
-        if (value) {
-            const type = getCellType(value);
-            attrs.push(["t", type]);
-            node = escapeXml /*xml*/ `<v>${value}</v>`;
-        }
+        const type = getCellType(value);
+        attrs.push(["t", type]);
+        node = escapeXml /*xml*/ `<v>${value}</v>`;
         return { attrs, node };
     }
 }
@@ -31399,6 +31403,6 @@ exports.registries = registries;
 exports.setTranslationMethod = setTranslationMethod;
 
 
-__info__.version = '15.0.5';
-__info__.date = '2023-04-21T07:27:19.753Z';
-__info__.hash = 'ef69cc7';
+__info__.version = '15.0.7';
+__info__.date = '2023-05-12T10:54:58.735Z';
+__info__.hash = 'd538be3';

package/dist/o-spreadsheet.d.ts

@@ -640,7 +640,6 @@ interface CollaborativeEventReceived {
 }
 interface UnexpectedRevisionIdEvent {
     type: "unexpected-revision-id";
-    revisionId: UID;
 }
 interface NewLocalStateUpdateEvent {
     type: "new-local-state-update";
@@ -2044,6 +2043,7 @@ declare class Session extends EventBus<CollaborativeEvent> {
     private sendPendingMessage;
     private acknowledge;
     private isAlreadyProcessed;
+    isWrongServerRevisionId(message: CollaborationMessage): boolean;
     private dropPendingHistoryMessages;
 }
 

package/dist/o-spreadsheet.esm.js

@@ -6572,7 +6572,7 @@ const POW = {
       base (number) ${_lt("The number to raise to the exponent power.")}
       exponent (number) ${_lt("The exponent to raise base to.")}
     `),
-    returns: ["BOOLEAN"],
+    returns: ["NUMBER"],
     compute: function (base, exponent) {
         return POWER.compute(base, exponent);
     },
@@ -21299,13 +21299,9 @@ class Session extends EventBus {
     }
     loadInitialMessages(messages) {
         this.isReplayingInitialRevisions = true;
-        this.on("unexpected-revision-id", this, ({ revisionId }) => {
-            throw new Error(`The spreadsheet could not be loaded. Revision ${revisionId} is corrupted.`);
-        });
         for (const message of messages) {
             this.onMessageReceived(message);
         }
-        this.off("unexpected-revision-id", this);
         this.isReplayingInitialRevisions = false;
     }
     /**
@@ -21377,6 +21373,10 @@ class Session extends EventBus {
     onMessageReceived(message) {
         if (this.isAlreadyProcessed(message))
             return;
+        if (this.isWrongServerRevisionId(message)) {
+            this.trigger("unexpected-revision-id");
+            return;
+        }
         switch (message.type) {
             case "CLIENT_MOVED":
                 this.onClientMoved(message);
@@ -21403,10 +21403,6 @@ class Session extends EventBus {
                 });
                 break;
             case "REMOTE_REVISION":
-                if (message.serverRevisionId !== this.serverRevisionId) {
-                    this.trigger("unexpected-revision-id", { revisionId: message.serverRevisionId });
-                    return;
-                }
                 const { clientId, commands } = message;
                 const revision = new Revision(message.nextRevisionId, clientId, commands);
                 if (revision.clientId !== this.clientId) {
@@ -21535,6 +21531,17 @@ class Session extends EventBus {
                 return false;
         }
     }
+    isWrongServerRevisionId(message) {
+        switch (message.type) {
+            case "REMOTE_REVISION":
+            case "REVISION_REDONE":
+            case "REVISION_UNDONE":
+            case "SNAPSHOT_CREATED":
+                return message.serverRevisionId !== this.serverRevisionId;
+            default:
+                return false;
+        }
+    }
     dropPendingHistoryMessages() {
         this.waitingUndoRedoAck = false;
         this.pendingMessages = this.pendingMessages.filter(({ type }) => type !== "REVISION_REDONE" && type !== "REVISION_UNDONE");
@@ -24759,12 +24766,9 @@ function addFormula(cell) {
     else {
         // Shouldn't we always output the value then ?
         const value = cell.value;
-        // what if value = 0? Is this condition correct?
-        if (value) {
-            const type = getCellType(value);
-            attrs.push(["t", type]);
-            node = escapeXml /*xml*/ `<v>${value}</v>`;
-        }
+        const type = getCellType(value);
+        attrs.push(["t", type]);
+        node = escapeXml /*xml*/ `<v>${value}</v>`;
         return { attrs, node };
     }
 }
@@ -31354,6 +31358,6 @@ const helpers = {
 export { CommandResult, CorePlugin, DATETIME_FORMAT, DataSource, DispatchResult, Model, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, DEBUG as __DEBUG__, __info__, astToFormula, cellTypes, convertAstNodes, coreTypes, functionCache, helpers, invalidateEvaluationCommands, normalize, parse, readonlyAllowedCommands, registries, setTranslationMethod };
 
 
-__info__.version = '15.0.5';
-__info__.date = '2023-04-21T07:27:19.753Z';
-__info__.hash = 'ef69cc7';
+__info__.version = '15.0.7';
+__info__.date = '2023-05-12T10:54:58.735Z';
+__info__.hash = 'd538be3';

package/dist/o-spreadsheet.iife.js

@@ -6592,7 +6592,7 @@
       base (number) ${_lt("The number to raise to the exponent power.")}
       exponent (number) ${_lt("The exponent to raise base to.")}
     `),
-      returns: ["BOOLEAN"],
+      returns: ["NUMBER"],
       compute: function (base, exponent) {
           return POWER.compute(base, exponent);
       },
@@ -21319,13 +21319,9 @@
       }
       loadInitialMessages(messages) {
           this.isReplayingInitialRevisions = true;
-          this.on("unexpected-revision-id", this, ({ revisionId }) => {
-              throw new Error(`The spreadsheet could not be loaded. Revision ${revisionId} is corrupted.`);
-          });
           for (const message of messages) {
               this.onMessageReceived(message);
           }
-          this.off("unexpected-revision-id", this);
           this.isReplayingInitialRevisions = false;
       }
       /**
@@ -21397,6 +21393,10 @@
       onMessageReceived(message) {
           if (this.isAlreadyProcessed(message))
               return;
+          if (this.isWrongServerRevisionId(message)) {
+              this.trigger("unexpected-revision-id");
+              return;
+          }
           switch (message.type) {
               case "CLIENT_MOVED":
                   this.onClientMoved(message);
@@ -21423,10 +21423,6 @@
                   });
                   break;
               case "REMOTE_REVISION":
-                  if (message.serverRevisionId !== this.serverRevisionId) {
-                      this.trigger("unexpected-revision-id", { revisionId: message.serverRevisionId });
-                      return;
-                  }
                   const { clientId, commands } = message;
                   const revision = new Revision(message.nextRevisionId, clientId, commands);
                   if (revision.clientId !== this.clientId) {
@@ -21555,6 +21551,17 @@
                   return false;
           }
       }
+      isWrongServerRevisionId(message) {
+          switch (message.type) {
+              case "REMOTE_REVISION":
+              case "REVISION_REDONE":
+              case "REVISION_UNDONE":
+              case "SNAPSHOT_CREATED":
+                  return message.serverRevisionId !== this.serverRevisionId;
+              default:
+                  return false;
+          }
+      }
       dropPendingHistoryMessages() {
           this.waitingUndoRedoAck = false;
           this.pendingMessages = this.pendingMessages.filter(({ type }) => type !== "REVISION_REDONE" && type !== "REVISION_UNDONE");
@@ -24779,12 +24786,9 @@
       else {
           // Shouldn't we always output the value then ?
           const value = cell.value;
-          // what if value = 0? Is this condition correct?
-          if (value) {
-              const type = getCellType(value);
-              attrs.push(["t", type]);
-              node = escapeXml /*xml*/ `<v>${value}</v>`;
-          }
+          const type = getCellType(value);
+          attrs.push(["t", type]);
+          node = escapeXml /*xml*/ `<v>${value}</v>`;
           return { attrs, node };
       }
   }
@@ -31398,9 +31402,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.0.5';
-  __info__.date = '2023-04-21T07:27:19.753Z';
-  __info__.hash = 'ef69cc7';
+  __info__.version = '15.0.7';
+  __info__.date = '2023-05-12T10:54:58.735Z';
+  __info__.hash = 'd538be3';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);