@manuscripts/transform 2.1.3-LEAN-3376-6 → 2.1.3-LEAN-3376-7

package/dist/cjs/jats/importer/jats-front-parser.js

@@ -201,7 +201,6 @@ exports.jatsFrontParser = {
         ]);
         const authorNotes = [
             (0, transformer_1.buildAuthorNotes)([
-                ...correspondingIDs.values(),
                 ...footnoteIDs.values(),
                 ...authorNotesParagraphs.map((p) => p._id),
             ]),

package/dist/cjs/jats/jats-exporter.js

@@ -1278,9 +1278,16 @@ class JATSExporter {
                         }
                     });
                 }
+                const authorNotesEl = this.document.createElement('author-notes');
+                const usedCorrespodings = this.getUsedCorrespondings([
+                    ...authorContributors,
+                    ...otherContributors,
+                ]);
+                usedCorrespodings.forEach((corresp) => {
+                    this.appendCorrespondingToElement(corresp, authorNotesEl);
+                });
                 const authorNotes = (_a = (0, json_schema_1.getModelsByType)(this.modelMap, json_schema_1.ObjectTypes.AuthorNotes)) === null || _a === void 0 ? void 0 : _a[0];
                 if (authorNotes) {
-                    const authorNotesEl = this.document.createElement('author-notes');
                     authorNotes.containedObjectIDs.forEach((id) => {
                         const model = this.modelMap.get(id);
                         if (!model) {
@@ -1292,13 +1299,10 @@ class JATSExporter {
                         else if (id.startsWith('MPFootnote')) {
                             this.appendFootnoteToElement(model, authorNotesEl);
                         }
-                        else if (id.startsWith('MPCorresponding')) {
-                            this.appendCorrespondingToElement(model, authorNotesEl);
-                        }
                     });
-                    if (authorNotesEl.childNodes.length > 0) {
-                        articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
-                    }
+                }
+                if (authorNotesEl.childNodes.length > 0) {
+                    articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
                 }
             }
         };
@@ -1313,6 +1317,16 @@ class JATSExporter {
             correspondingEl.append(corresponding.contents);
             element.appendChild(correspondingEl);
         };
+        this.getUsedCorrespondings = (contributors) => {
+            const correspodings = (0, json_schema_1.getModelsByType)(this.modelMap, json_schema_1.ObjectTypes.Corresponding);
+            const ids = [];
+            contributors.forEach((contributor) => {
+                if (contributor.corresp) {
+                    ids.push(...contributor.corresp.map((corresp) => corresp.correspID));
+                }
+            });
+            return correspodings.filter((corresp) => ids.includes(corresp._id));
+        };
         this.appendParagraphToElement = (paragraph, element) => {
             const paragraphEl = this.document.createElement('p');
             paragraphEl.setAttribute('id', normalizeID(paragraph._id));

package/dist/cjs/transformer/decode.js

@@ -499,9 +499,7 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.AuthorNotes]: (data) => {
                 const model = data;
-                const content = model.containedObjectIDs
-                    .filter((id) => !id.startsWith('MPCorresponding'))
-                    .map((id) => this.decode(this.modelMap.get(id)));
+                const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
                 return schema_1.schema.nodes.author_notes.create({
                     id: model._id,
                 }, content);

package/dist/es/jats/importer/jats-front-parser.js

@@ -195,7 +195,6 @@ export const jatsFrontParser = {
         ]);
         const authorNotes = [
             buildAuthorNotes([
-                ...correspondingIDs.values(),
                 ...footnoteIDs.values(),
                 ...authorNotesParagraphs.map((p) => p._id),
             ]),

package/dist/es/jats/jats-exporter.js

@@ -1270,9 +1270,16 @@ export class JATSExporter {
                         }
                     });
                 }
+                const authorNotesEl = this.document.createElement('author-notes');
+                const usedCorrespodings = this.getUsedCorrespondings([
+                    ...authorContributors,
+                    ...otherContributors,
+                ]);
+                usedCorrespodings.forEach((corresp) => {
+                    this.appendCorrespondingToElement(corresp, authorNotesEl);
+                });
                 const authorNotes = (_a = getModelsByType(this.modelMap, ObjectTypes.AuthorNotes)) === null || _a === void 0 ? void 0 : _a[0];
                 if (authorNotes) {
-                    const authorNotesEl = this.document.createElement('author-notes');
                     authorNotes.containedObjectIDs.forEach((id) => {
                         const model = this.modelMap.get(id);
                         if (!model) {
@@ -1284,13 +1291,10 @@ export class JATSExporter {
                         else if (id.startsWith('MPFootnote')) {
                             this.appendFootnoteToElement(model, authorNotesEl);
                         }
-                        else if (id.startsWith('MPCorresponding')) {
-                            this.appendCorrespondingToElement(model, authorNotesEl);
-                        }
                     });
-                    if (authorNotesEl.childNodes.length > 0) {
-                        articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
-                    }
+                }
+                if (authorNotesEl.childNodes.length > 0) {
+                    articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
                 }
             }
         };
@@ -1305,6 +1309,16 @@ export class JATSExporter {
             correspondingEl.append(corresponding.contents);
             element.appendChild(correspondingEl);
         };
+        this.getUsedCorrespondings = (contributors) => {
+            const correspodings = getModelsByType(this.modelMap, ObjectTypes.Corresponding);
+            const ids = [];
+            contributors.forEach((contributor) => {
+                if (contributor.corresp) {
+                    ids.push(...contributor.corresp.map((corresp) => corresp.correspID));
+                }
+            });
+            return correspodings.filter((corresp) => ids.includes(corresp._id));
+        };
         this.appendParagraphToElement = (paragraph, element) => {
             const paragraphEl = this.document.createElement('p');
             paragraphEl.setAttribute('id', normalizeID(paragraph._id));

package/dist/es/transformer/decode.js

@@ -490,9 +490,7 @@ export class Decoder {
             },
             [ObjectTypes.AuthorNotes]: (data) => {
                 const model = data;
-                const content = model.containedObjectIDs
-                    .filter((id) => !id.startsWith('MPCorresponding'))
-                    .map((id) => this.decode(this.modelMap.get(id)));
+                const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
                 return schema.nodes.author_notes.create({
                     id: model._id,
                 }, content);

package/dist/types/jats/jats-exporter.d.ts

@@ -87,6 +87,7 @@ export declare class JATSExporter {
     private validateContributor;
     private buildContributors;
     private appendCorrespondingToElement;
+    private getUsedCorrespondings;
     private appendParagraphToElement;
     private appendFootnoteToElement;
     private buildKeywords;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.1.3-LEAN-3376-6",
+  "version": "2.1.3-LEAN-3376-7",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",