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

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

@@ -202,20 +202,34 @@ exports.jatsBodyTransformations = {
         }
     },
     moveFootnotes(doc, group, createElement) {
-        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')) {
+        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) {
                 containingGroup.appendChild(footnote);
             }
-        });
+        }
         if (!footnotesSection && containingGroup.innerHTML) {
-            footnotesSection = this.createFootnotesSection([containingGroup], createElement);
+            const section = this.createFootnotesSection([containingGroup], createElement);
+            group.append(section);
         }
-        if (footnotesSection) {
-            group.insertBefore(footnotesSection, ((_a = group.firstChild) === null || _a === void 0 ? void 0 : _a.nextSibling) || group.firstChild);
+        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);
         }
     },
     moveCaptionsToEnd(body) {

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

@@ -620,7 +620,7 @@ class JATSExporter {
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
-                table_element_footer: () => ['table-wrap-foot', 0],
+                table_element_footer: (node) => node.textContent ? ['table-wrap-foot', 0] : '',
                 contributor: () => '',
                 affiliation: () => '',
                 attribution: () => ['attrib', 0],

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

@@ -199,20 +199,34 @@ export const jatsBodyTransformations = {
         }
     },
     moveFootnotes(doc, group, createElement) {
-        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')) {
+        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) {
                 containingGroup.appendChild(footnote);
             }
-        });
+        }
         if (!footnotesSection && containingGroup.innerHTML) {
-            footnotesSection = this.createFootnotesSection([containingGroup], createElement);
+            const section = this.createFootnotesSection([containingGroup], createElement);
+            group.append(section);
         }
-        if (footnotesSection) {
-            group.insertBefore(footnotesSection, ((_a = group.firstChild) === null || _a === void 0 ? void 0 : _a.nextSibling) || group.firstChild);
+        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);
         }
     },
     moveCaptionsToEnd(body) {

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

@@ -612,7 +612,7 @@ export class JATSExporter {
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',
-                table_element_footer: () => ['table-wrap-foot', 0],
+                table_element_footer: (node) => node.textContent ? ['table-wrap-foot', 0] : '',
                 contributor: () => '',
                 affiliation: () => '',
                 attribution: () => ['attrib', 0],

package/package.json

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