@manuscripts/transform 2.1.7-LEAN-3321 → 2.1.8

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/schema/nodes/table_col.js

@@ -19,6 +19,7 @@ exports.tableCol = exports.tableColGroup = void 0;
 exports.tableColGroup = {
     content: 'table_col+',
     group: 'block',
+    tableRole: 'colgroup',
     parseDOM: [
         {
             tag: 'colgroup',
@@ -33,6 +34,7 @@ exports.tableCol = {
         width: { default: '' },
     },
     group: 'block',
+    tableRole: 'col',
     parseDOM: [
         {
             tag: 'col',

package/dist/cjs/schema/nodes/table_element_footer.js

@@ -19,9 +19,8 @@ exports.tableElementFooter = void 0;
 exports.tableElementFooter = {
     attrs: {
         id: { default: '' },
-        dataTracked: { default: null }
     },
-    content: '(paragraph | footnotes_element)*',
+    content: '(paragraph | footnotes_element)+',
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };

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/schema/nodes/table_col.js

@@ -16,6 +16,7 @@
 export const tableColGroup = {
     content: 'table_col+',
     group: 'block',
+    tableRole: 'colgroup',
     parseDOM: [
         {
             tag: 'colgroup',
@@ -30,6 +31,7 @@ export const tableCol = {
         width: { default: '' },
     },
     group: 'block',
+    tableRole: 'col',
     parseDOM: [
         {
             tag: 'col',

package/dist/es/schema/nodes/table_element_footer.js

@@ -16,9 +16,8 @@
 export const tableElementFooter = {
     attrs: {
         id: { default: '' },
-        dataTracked: { default: null }
     },
-    content: '(paragraph | footnotes_element)*',
+    content: '(paragraph | footnotes_element)+',
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };

package/dist/types/schema/nodes/table_col.d.ts

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { NodeSpec } from 'prosemirror-model';
-import { ManuscriptNode } from '../types';
+import { ManuscriptNode, TableNodeSpec } from '../types';
+export type TableColGroupNode = ManuscriptNode;
 export interface TableColNode extends ManuscriptNode {
     attrs: {
         width: string;
     };
 }
-export declare const tableColGroup: NodeSpec;
-export declare const tableCol: NodeSpec;
+export declare const tableColGroup: TableNodeSpec;
+export declare const tableCol: TableNodeSpec;

package/package.json

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