docxmlater 12.0.1 → 12.1.0

package/dist/esm/core/Document.js

@@ -35,7 +35,7 @@ import { UNITS } from '../utils/units.js';
 function getLogger() {
     return createScopedLogger(getGlobalLogger(), 'Document');
 }
-import { acceptAllRevisions, cleanupRevisionMetadata } from '../processors/acceptRevisions.js';
+import { acceptAllRevisions, rejectAllRevisions, cleanupRevisionMetadata, } from '../processors/acceptRevisions.js';
 import { acceptRevisionsInMemory } from '../processors/InMemoryRevisionAcceptor.js';
 import { stripTrackedChanges } from '../processors/stripTrackedChanges.js';
 import { diffText, diffHasUnchangedParts } from '../utils/textDiff.js';
@@ -360,12 +360,20 @@ export class Document {
     static async initializeFromZip(zipHandler, options) {
         const logger = getLogger();
         const useInMemoryAccept = options?.acceptRevisions === true;
+        if (useInMemoryAccept && options?.revisionHandling === 'reject') {
+            throw new Error("Conflicting load options: 'acceptRevisions: true' (in-memory accept) cannot be combined " +
+                'with \'revisionHandling: "reject"\'. Use \'revisionHandling: "reject"\' on its own to ' +
+                'revert the document to its original pre-edit state.');
+        }
         const revisionHandling = useInMemoryAccept
             ? 'preserve'
             : (options?.revisionHandling ?? 'accept');
         if (revisionHandling === 'accept') {
             await acceptAllRevisions(zipHandler);
         }
+        else if (revisionHandling === 'reject') {
+            await rejectAllRevisions(zipHandler);
+        }
         else if (revisionHandling === 'strip') {
             await stripTrackedChanges(zipHandler);
         }