@manuscripts/transform 2.1.6 → 2.1.7-LEAN-3467-0

package/dist/cjs/jats/importer/jats-body-transformations.js

@@ -202,34 +202,20 @@ exports.jatsBodyTransformations = {
         }
     },
     moveFootnotes(doc, group, createElement) {
-        const footnotes = [
-            ...doc.querySelectorAll('fn:not(table-wrap-foot fn, author-notes fn)'),
-        ];
-        const footnotesSection = doc.querySelector('sec[sec-type="endnotes"]');
-        const footnotesSectionGroup = footnotesSection === null || footnotesSection === void 0 ? void 0 : footnotesSection.querySelector('fn-group');
-        const containingGroup = footnotesSectionGroup || createElement('fn-group');
-        for (const footnote of footnotes) {
-            const type = footnote.getAttribute('fn-type');
-            if (!type) {
+        var _a;
+        const footnotes = Array.from(doc.querySelectorAll('fn:not(table-wrap-foot fn, author-notes fn)'));
+        let footnotesSection = doc.querySelector('sec[sec-type="endnotes"]');
+        const containingGroup = (footnotesSection === null || footnotesSection === void 0 ? void 0 : footnotesSection.querySelector('fn-group')) || createElement('fn-group');
+        footnotes.forEach((footnote) => {
+            if (!footnote.getAttribute('fn-type')) {
                 containingGroup.appendChild(footnote);
             }
-        }
+        });
         if (!footnotesSection && containingGroup.innerHTML) {
-            const section = this.createFootnotesSection([containingGroup], createElement);
-            group.append(section);
+            footnotesSection = this.createFootnotesSection([containingGroup], createElement);
         }
-        let regularFootnoteGroups = [
-            ...doc.querySelectorAll('back > fn-group:not([fn-type])'),
-        ];
-        regularFootnoteGroups = regularFootnoteGroups.filter((group) => {
-            return group.childElementCount === 0
-                ? false
-                : !group.querySelector('fn[fn-type]');
-        });
-        if (regularFootnoteGroups.length > 0) {
-            regularFootnoteGroups.map((g) => removeNodeFromParent(g));
-            const footnotes = this.createFootnotesSection(regularFootnoteGroups, createElement);
-            group.appendChild(footnotes);
+        if (footnotesSection) {
+            group.insertBefore(footnotesSection, ((_a = group.firstChild) === null || _a === void 0 ? void 0 : _a.nextSibling) || group.firstChild);
         }
     },
     moveCaptionsToEnd(body) {

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

@@ -154,6 +154,7 @@ class JATSExporter {
                 this.moveFloatsGroup(body, article);
                 this.removeBackContainer(body);
                 this.updateFootnoteTypes(front, back);
+                this.fillEmptyFootnotes(article);
             }
             await this.rewriteIDs(idGenerator);
             if (mediaPathGenerator) {
@@ -1706,5 +1707,9 @@ class JATSExporter {
             }
         });
     }
+    fillEmptyFootnotes(articleElement) {
+        const emptyFootnotes = Array.from(articleElement.querySelectorAll('fn')).filter((fn) => { var _a; return !((_a = fn.textContent) === null || _a === void 0 ? void 0 : _a.trim()); });
+        emptyFootnotes.forEach((fn) => fn.appendChild(this.document.createElement('p')));
+    }
 }
 exports.JATSExporter = JATSExporter;

package/dist/es/jats/importer/jats-body-transformations.js

@@ -199,34 +199,20 @@ export const jatsBodyTransformations = {
         }
     },
     moveFootnotes(doc, group, createElement) {
-        const footnotes = [
-            ...doc.querySelectorAll('fn:not(table-wrap-foot fn, author-notes fn)'),
-        ];
-        const footnotesSection = doc.querySelector('sec[sec-type="endnotes"]');
-        const footnotesSectionGroup = footnotesSection === null || footnotesSection === void 0 ? void 0 : footnotesSection.querySelector('fn-group');
-        const containingGroup = footnotesSectionGroup || createElement('fn-group');
-        for (const footnote of footnotes) {
-            const type = footnote.getAttribute('fn-type');
-            if (!type) {
+        var _a;
+        const footnotes = Array.from(doc.querySelectorAll('fn:not(table-wrap-foot fn, author-notes fn)'));
+        let footnotesSection = doc.querySelector('sec[sec-type="endnotes"]');
+        const containingGroup = (footnotesSection === null || footnotesSection === void 0 ? void 0 : footnotesSection.querySelector('fn-group')) || createElement('fn-group');
+        footnotes.forEach((footnote) => {
+            if (!footnote.getAttribute('fn-type')) {
                 containingGroup.appendChild(footnote);
             }
-        }
+        });
         if (!footnotesSection && containingGroup.innerHTML) {
-            const section = this.createFootnotesSection([containingGroup], createElement);
-            group.append(section);
+            footnotesSection = this.createFootnotesSection([containingGroup], createElement);
         }
-        let regularFootnoteGroups = [
-            ...doc.querySelectorAll('back > fn-group:not([fn-type])'),
-        ];
-        regularFootnoteGroups = regularFootnoteGroups.filter((group) => {
-            return group.childElementCount === 0
-                ? false
-                : !group.querySelector('fn[fn-type]');
-        });
-        if (regularFootnoteGroups.length > 0) {
-            regularFootnoteGroups.map((g) => removeNodeFromParent(g));
-            const footnotes = this.createFootnotesSection(regularFootnoteGroups, createElement);
-            group.appendChild(footnotes);
+        if (footnotesSection) {
+            group.insertBefore(footnotesSection, ((_a = group.firstChild) === null || _a === void 0 ? void 0 : _a.nextSibling) || group.firstChild);
         }
     },
     moveCaptionsToEnd(body) {

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

@@ -16,7 +16,7 @@
 import { getModelsByType, ObjectTypes, } from '@manuscripts/json-schema';
 import { CitationProvider } from '@manuscripts/library';
 import debug from 'debug';
-import { DOMParser as ProseMirrorDOMParser, DOMSerializer, } from 'prosemirror-model';
+import { DOMParser as ProsemirrorDOMParser, DOMSerializer, } from 'prosemirror-model';
 import serializeToXML from 'w3c-xmlserializer';
 import { nodeFromHTML, textFromHTML } from '../lib/html';
 import { normalizeStyleName } from '../lib/styled-content';
@@ -32,7 +32,7 @@ import { selectVersionIds } from './jats-versions';
 const warn = debug('manuscripts-transform');
 const XLINK_NAMESPACE = 'http://www.w3.org/1999/xlink';
 const normalizeID = (id) => id.replace(/:/g, '_');
-const parser = ProseMirrorDOMParser.fromSchema(schema);
+const parser = ProsemirrorDOMParser.fromSchema(schema);
 const findChildNodeOfType = (node, nodeType) => {
     for (const child of iterateChildren(node)) {
         if (child.type === nodeType) {
@@ -146,6 +146,7 @@ export class JATSExporter {
                 this.moveFloatsGroup(body, article);
                 this.removeBackContainer(body);
                 this.updateFootnoteTypes(front, back);
+                this.fillEmptyFootnotes(article);
             }
             await this.rewriteIDs(idGenerator);
             if (mediaPathGenerator) {
@@ -1698,4 +1699,8 @@ export class JATSExporter {
             }
         });
     }
+    fillEmptyFootnotes(articleElement) {
+        const emptyFootnotes = Array.from(articleElement.querySelectorAll('fn')).filter((fn) => { var _a; return !((_a = fn.textContent) === null || _a === void 0 ? void 0 : _a.trim()); });
+        emptyFootnotes.forEach((fn) => fn.appendChild(this.document.createElement('p')));
+    }
 }

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

@@ -104,5 +104,6 @@ export declare class JATSExporter {
     private buildContributorName;
     private moveCoiStatementToAuthorNotes;
     private updateFootnoteTypes;
+    private fillEmptyFootnotes;
 }
 export {};

package/package.json

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