@odoo/o-spreadsheet 15.2.5 → 15.2.7

package/dist/o-spreadsheet.cjs.js

@@ -6613,7 +6613,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);
     },
@@ -21297,13 +21297,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;
     }
     /**
@@ -21375,6 +21371,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);
@@ -21401,10 +21401,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) {
@@ -21533,6 +21529,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");
@@ -24694,12 +24701,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 };
     }
 }
@@ -31332,6 +31336,6 @@ exports.registries = registries;
 exports.setTranslationMethod = setTranslationMethod;
 
 
-__info__.version = '15.2.5';
-__info__.date = '2023-04-21T07:27:24.954Z';
-__info__.hash = '0896859';
+__info__.version = '15.2.7';
+__info__.date = '2023-05-12T10:54:29.220Z';
+__info__.hash = 'd33fde8';

package/dist/o-spreadsheet.d.ts

@@ -603,7 +603,6 @@ interface CollaborativeEventReceived {
 }
 interface UnexpectedRevisionIdEvent {
     type: "unexpected-revision-id";
-    revisionId: UID;
 }
 interface NewLocalStateUpdateEvent {
     type: "new-local-state-update";
@@ -2018,6 +2017,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

@@ -6590,7 +6590,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);
     },
@@ -21274,13 +21274,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;
     }
     /**
@@ -21352,6 +21348,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);
@@ -21378,10 +21378,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) {
@@ -21510,6 +21506,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");
@@ -24671,12 +24678,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 };
     }
 }
@@ -31286,6 +31290,6 @@ const helpers = {
 export { CommandResult, CorePlugin, DATETIME_FORMAT, DataSource, DispatchResult, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, DEBUG as __DEBUG__, __info__, astToFormula, cellTypes, compile, convertAstNodes, coreTypes, functionCache, helpers, invalidateEvaluationCommands, parse, readonlyAllowedCommands, registries, setTranslationMethod };
 
 
-__info__.version = '15.2.5';
-__info__.date = '2023-04-21T07:27:24.954Z';
-__info__.hash = '0896859';
+__info__.version = '15.2.7';
+__info__.date = '2023-05-12T10:54:29.220Z';
+__info__.hash = 'd33fde8';

package/dist/o-spreadsheet.iife.js

@@ -6610,7 +6610,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);
       },
@@ -21294,13 +21294,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;
       }
       /**
@@ -21372,6 +21368,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);
@@ -21398,10 +21398,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) {
@@ -21530,6 +21526,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");
@@ -24691,12 +24698,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 };
       }
   }
@@ -31331,9 +31335,9 @@
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '15.2.5';
-  __info__.date = '2023-04-21T07:27:24.954Z';
-  __info__.hash = '0896859';
+  __info__.version = '15.2.7';
+  __info__.date = '2023-05-12T10:54:29.220Z';
+  __info__.hash = 'd33fde8';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);