fix: sort and ID as key options was not working with adventures

Author: DjLeChuck

CHANGELOG.md

@@ -6,6 +6,11 @@
 
 - Merged options sort document and folders
 
+### Fixed
+
+- The sorting option was not working with adventures
+- The document ID as key option was not working with adventures
+
 [12.2.0] - 2025-03-07
 
 ### Added

scripts/exporters/adventure-exporter.mjs

@@ -31,66 +31,72 @@ export class AdventureExporter extends AbstractExporter {
 
       // Scenes
       for (const document of avPack.scenes) {
-        this.dataset.entries[avPack.name].scenes[document.name] = foundry.utils.mergeObject(
+        const key = this._getExportKey(document);
+        this.dataset.entries[avPack.name].scenes[key] = foundry.utils.mergeObject(
           exporters.SceneExporter.getDocumentData(document, document),
-          (this.existingContent[avPack.name]?.scenes ?? {})[document.name] ?? {},
+          (this.existingContent[avPack.name]?.scenes ?? {})[key] ?? {},
         );
 
         this._stepProgressBar();
       }
 
       // Macros
       for (const document of avPack.macros) {
-        this.dataset.entries[avPack.name].macros[document.name] = foundry.utils.mergeObject(
+        const key = this._getExportKey(document);
+        this.dataset.entries[avPack.name].macros[key] = foundry.utils.mergeObject(
           exporters.MacroExporter.getDocumentData(document),
-          (this.existingContent[avPack.name]?.macros ?? {})[document.name] ?? {},
+          (this.existingContent[avPack.name]?.macros ?? {})[key] ?? {},
         );
 
         this._stepProgressBar();
       }
 
       // Playlists
       for (const document of avPack.playlists) {
-        this.dataset.entries[avPack.name].playlists[document.name] = foundry.utils.mergeObject(
+        const key = this._getExportKey(document);
+        this.dataset.entries[avPack.name].playlists[key] = foundry.utils.mergeObject(
           exporters.PlaylistExporter.getDocumentData(document, document),
-          (this.existingContent[avPack.name]?.playlists ?? {})[document.name] ?? {},
+          (this.existingContent[avPack.name]?.playlists ?? {})[key] ?? {},
         );
 
         this._stepProgressBar();
       }
 
       // Actors
       for (const document of avPack.actors) {
-        this.dataset.entries[avPack.name].actors[document.name] = foundry.utils.mergeObject(
+        const key = this._getExportKey(document);
+        this.dataset.entries[avPack.name].actors[key] = foundry.utils.mergeObject(
           exporters.ActorExporter.getDocumentData(
             document,
             document,
             this.options.customMapping.actor,
           ),
-          (this.existingContent[avPack.name]?.actors ?? {})[document.name] ?? {},
+          (this.existingContent[avPack.name]?.actors ?? {})[key] ?? {},
         );
 
         this._stepProgressBar();
       }
 
       // Items
       for (const document of avPack.items) {
-        this.dataset.entries[avPack.name].items[document.name] = foundry.utils.mergeObject(
+        const key = this._getExportKey(document);
+        this.dataset.entries[avPack.name].items[key] = foundry.utils.mergeObject(
           exporters.ItemExporter.getDocumentData(
             document,
             this.options.customMapping.item,
           ),
-          (this.existingContent[avPack.name]?.items ?? {})[document.name] ?? {},
+          (this.existingContent[avPack.name]?.items ?? {})[key] ?? {},
         );
 
         this._stepProgressBar();
       }
 
       // Tables
       for (const document of avPack.tables) {
-        this.dataset.entries[avPack.name].tables[document.name] = foundry.utils.mergeObject(
+        const key = this._getExportKey(document);
+        this.dataset.entries[avPack.name].tables[key] = foundry.utils.mergeObject(
           exporters.RollTableExporter.getDocumentData(document, document),
-          (this.existingContent[avPack.name]?.tables ?? {})[document.name] ?? {},
+          (this.existingContent[avPack.name]?.tables ?? {})[key] ?? {},
         );
 
         this._stepProgressBar();
@@ -105,17 +111,19 @@ export class AdventureExporter extends AbstractExporter {
 
       // Journals
       for (const document of avPack.journal) {
-        this.dataset.entries[avPack.name].journals[document.name] = foundry.utils.mergeObject(
+        const key = this._getExportKey(document);
+        this.dataset.entries[avPack.name].journals[key] = foundry.utils.mergeObject(
           exporters.JournalEntryExporter.getDocumentData(document, document),
-          (this.existingContent[avPack.name]?.journals ?? {})[document.name] ?? {},
+          (this.existingContent[avPack.name]?.journals ?? {})[key] ?? {},
         );
 
         this._stepProgressBar();
       }
 
       // Cards
       for (const document of avPack.cards) {
-        this.dataset.entries[avPack.name].cards[document.name] = foundry.utils.mergeObject(
+        const key = this._getExportKey(document);
+        this.dataset.entries[avPack.name].cards[key] = foundry.utils.mergeObject(
           exporters.CardsExporter.getDocumentData(document, document),
           (this.existingContent[avPack.name]?.cards ?? {})[document.name] ?? {},
         );
@@ -127,6 +135,8 @@ export class AdventureExporter extends AbstractExporter {
       for (const key in this.dataset.entries[avPack.name]) {
         if (0 === Object.keys(this.dataset.entries[avPack.name][key]).length) {
           delete this.dataset.entries[avPack.name][key];
+        } else if (this.options.sortEntries && !['name', 'caption', 'description'].includes(key)) {
+          this.dataset.entries[avPack.name][key] = this._sortItems(this.dataset.entries[avPack.name][key]);
         }
       }
     });