@manuscripts/transform 4.5.7 → 4.6.0

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

@@ -1,5 +1,5 @@
 /*!
- * © 2019 Atypon Systems LLC
+ * © 2026 Atypon Systems LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,70 +15,24 @@
  */
 import * as Citeproc from 'citeproc';
 import { DOMSerializer } from 'prosemirror-model';
-import { findChildrenByAttr, findChildrenByType } from 'prosemirror-utils';
-import serializeToXML from 'w3c-xmlserializer';
+import { findChildrenByAttr } from 'prosemirror-utils';
 import { buildCiteprocCitation } from '../../lib/citeproc';
 import { CreditRoleUrls } from '../../lib/credit-roles';
 import { generateFootnoteLabels } from '../../lib/footnotes';
 import { FOOTNOTE_SECTION_CATEGORY_IDS } from '../../lib/section-categories';
 import { sanitizeXmlString, XLINK_NAMESPACE, XML_NAMESPACE, } from '../../lib/xml';
-import { isBibliographyItemNode, isCitationNode, isNodeOfType, schema, } from '../../schema';
+import { isBibliographyItemNode, isCitationNode, schema, } from '../../schema';
 import { isExecutableNodeType } from '../../transformer';
 import { initJats, jatsVariableWrapper } from './citeproc';
 import { selectVersionIDs } from './jats-versions';
 import { buildTargets } from './labels';
-const normalizeID = (id) => id.replace(/:/g, '_');
-export const createCounter = () => {
-    const counts = new Map();
-    return {
-        increment: (field) => {
-            const value = counts.get(field);
-            const newValue = value === undefined ? 1 : value + 1;
-            counts.set(field, newValue);
-            return newValue;
-        },
-    };
-};
-const createDefaultIDGenerator = () => {
-    const counter = createCounter();
-    return async (element) => {
-        const value = String(counter.increment(element.nodeName));
-        return `${element.localName}-${value}`;
-    };
-};
-const chooseRefType = (type) => {
-    switch (type) {
-        case schema.nodes.figure:
-        case schema.nodes.figure_element:
-            return 'fig';
-        case schema.nodes.footnote:
-            return 'fn';
-        case schema.nodes.table:
-        case schema.nodes.table_element:
-            return 'table';
-        case schema.nodes.section:
-        case schema.nodes.abstract:
-            return 'sec';
-        case schema.nodes.equation:
-        case schema.nodes.equation_element:
-            return 'disp-formula';
-        case schema.nodes.supplement:
-            return 'supplementary-material';
-    }
-};
-export class JATSExporter {
+import { JATSExporterBase } from './JATSExporterBase';
+import { chooseRefType, createDefaultIDGenerator, normalizeID } from './lib';
+export class JATSExporter extends JATSExporterBase {
     constructor() {
-        this.nodesMap = new Map();
+        super(...arguments);
         this.contributorLabels = new Map();
-        this.populateNodesMap = () => {
-            this.manuscriptNode.descendants((node) => {
-                const type = node.type;
-                const nodes = this.nodesMap.get(type) ?? [];
-                nodes.push(node);
-                this.nodesMap.set(type, nodes);
-            });
-        };
-        this.serializeToJATS = async (manuscriptNode, options) => {
+        this.export = async (manuscriptNode, options) => {
             this.manuscriptNode = manuscriptNode;
             this.populateNodesMap();
             this.initCiteprocEngine(options);
@@ -109,7 +63,7 @@ export class JATSExporter {
                 $article.appendChild($floatsGroup);
             }
             await this.rewriteIDs();
-            return serializeToXML(this.document);
+            return this.document;
         };
         this.appendChildNodeOfType = ($element, node, type) => {
             const childNode = this.getFirstChildOfType(type, node);
@@ -400,7 +354,7 @@ export class JATSExporter {
             const [, bibliography] = this.engine.makeBibliography();
             const parser = new DOMParser();
             bibliography.forEach((item) => {
-                const fragment = `<template xmlns:xlink="${XLINK_NAMESPACE}">${sanitizeXmlString(item)}</template>`;
+                const fragment = `<wrapper xmlns:xlink="${XLINK_NAMESPACE}">${sanitizeXmlString(item)}</wrapper>`;
                 const $ref = parser
                     .parseFromString(fragment, 'text/xml')
                     .querySelector('ref');
@@ -410,32 +364,13 @@ export class JATSExporter {
             });
             return $refList;
         };
-        this.createElement = (tag, content, attrs) => {
-            const $element = this.document.createElement(tag);
-            if (content) {
-                $element.textContent = content;
-            }
-            if (attrs) {
-                Object.entries(attrs).forEach(([k, v]) => {
-                    if (v) {
-                        $element.setAttribute(k, v);
-                    }
-                });
-            }
-            return $element;
-        };
-        this.appendElement = ($parent, tag, content, attrs) => {
-            const $element = this.createElement(tag, content, attrs);
-            $parent.appendChild($element);
-            return $element;
-        };
         this.createSerializer = () => {
             const nodes = {
-                trans_abstract: (node) => createTransAbstract(node),
-                trans_graphical_abstract: (node) => createTransAbstract(node),
+                trans_abstract: (node) => this.createTransAbstract(node),
+                trans_graphical_abstract: (node) => this.createTransAbstract(node),
                 hero_image: () => '',
                 headshot_grid: () => ['p', { 'content-type': 'headshots' }, 0],
-                headshot_element: (node) => createImage(node),
+                headshot_element: (node) => this.createImage(node),
                 headshot_image: () => '',
                 alt_text: (node) => {
                     if (node.textContent) {
@@ -460,7 +395,7 @@ export class JATSExporter {
                     return $selfUri;
                 },
                 attachments: () => '',
-                image_element: (node) => createImage(node),
+                image_element: (node) => this.createImage(node),
                 embed: (node) => {
                     const { id, href, mimetype, mimeSubtype, extLinks } = node.attrs;
                     if (!href) {
@@ -476,7 +411,7 @@ export class JATSExporter {
                     if (mimeSubtype) {
                         $media.setAttribute('mime-subtype', node.attrs.mimeSubtype);
                     }
-                    appendLabels($media, node);
+                    this.appendLabels($media, node);
                     this.appendChildNodeOfType($media, node, schema.nodes.alt_text);
                     this.appendChildNodeOfType($media, node, schema.nodes.long_desc);
                     this.appendCaption($media, node);
@@ -503,14 +438,14 @@ export class JATSExporter {
                     const awardGroup = node;
                     const $awardGroup = this.createElement('award-group');
                     $awardGroup.setAttribute('id', normalizeID(awardGroup.attrs.id));
-                    appendChildIfPresent($awardGroup, 'funding-source', awardGroup.attrs.source);
+                    this.appendChildIfPresent($awardGroup, 'funding-source', awardGroup.attrs.source);
                     awardGroup.attrs.code
                         ?.split(';')
-                        .forEach((code) => appendChildIfPresent($awardGroup, 'award-id', code));
-                    appendChildIfPresent($awardGroup, 'principal-award-recipient', awardGroup.attrs.recipient);
+                        .forEach((code) => this.appendChildIfPresent($awardGroup, 'award-id', code));
+                    this.appendChildIfPresent($awardGroup, 'principal-award-recipient', awardGroup.attrs.recipient);
                     return $awardGroup;
                 },
-                box_element: (node) => createBoxElement(node),
+                box_element: (node) => this.createBoxElement(node),
                 author_notes: () => '',
                 corresp: () => '',
                 title: () => ['article-title', 0],
@@ -529,6 +464,7 @@ export class JATSExporter {
                     ? ['table-wrap-foot', ['fn-group', ['fn', ['p']]]]
                     : ['table-wrap-foot', 0],
                 contributor: (node) => this.buildContributorElement(node),
+                bio: () => ['bio', 0],
                 affiliation: (node) => this.buildAffiliationElement(node),
                 attribution: () => ['attrib', 0],
                 bibliography_element: () => '',
@@ -550,7 +486,7 @@ export class JATSExporter {
                     $supplementaryMaterial.setAttributeNS(XLINK_NAMESPACE, 'href', node.attrs.href ?? '');
                     $supplementaryMaterial.setAttribute('mimetype', node.attrs.mimeType ?? '');
                     $supplementaryMaterial.setAttribute('mime-subtype', node.attrs.mimeSubType ?? '');
-                    appendLabels($supplementaryMaterial, node);
+                    this.appendLabels($supplementaryMaterial, node);
                     this.appendCaption($supplementaryMaterial, node);
                     return $supplementaryMaterial;
                 },
@@ -636,12 +572,12 @@ export class JATSExporter {
                 equation_element: (node) => {
                     const $dispFormula = this.createElement('disp-formula');
                     $dispFormula.setAttribute('id', normalizeID(node.attrs.id));
-                    appendLabels($dispFormula, node);
-                    processChildNodes($dispFormula, node, schema.nodes.equation);
+                    this.appendLabels($dispFormula, node);
+                    this.processChildNodes($dispFormula, node, schema.nodes.equation);
                     return $dispFormula;
                 },
-                figure: (node) => createGraphic(node),
-                figure_element: (node) => createFigureElement(node, node.type.schema.nodes.figure),
+                figure: (node) => this.createGraphic(node),
+                figure_element: (node) => this.createFigureElement(node, node.type.schema.nodes.figure),
                 footnote: (node) => {
                     const attrs = {};
                     if (node.attrs.id) {
@@ -716,7 +652,7 @@ export class JATSExporter {
                     $code.textContent = node.attrs.contents;
                     return $code;
                 },
-                listing_element: (node) => createFigureElement(node, node.type.schema.nodes.listing),
+                listing_element: (node) => this.createFigureElement(node, node.type.schema.nodes.listing),
                 manuscript: (node) => ['article', { id: normalizeID(node.attrs.id) }, 0],
                 missing_figure: () => {
                     const $graphic = this.createElement('graphic');
@@ -753,11 +689,11 @@ export class JATSExporter {
                 quote_image: (node) => {
                     const img = node;
                     if (img.attrs.src) {
-                        return createGraphic(node);
+                        return this.createGraphic(node);
                     }
                     return '';
                 },
-                graphical_abstract_section: (node) => createAbstract(node),
+                graphical_abstract_section: (node) => this.createAbstract(node),
                 section: (node) => {
                     const attrs = {
                         id: normalizeID(node.attrs.id),
@@ -767,13 +703,13 @@ export class JATSExporter {
                     }
                     return ['sec', attrs, 0];
                 },
-                abstract: (node) => createAbstract(node),
+                abstract: (node) => this.createAbstract(node),
                 section_label: () => ['label', 0],
                 section_title: () => ['title', 0],
                 section_title_plain: () => ['title', 0],
                 table: (node) => ['table', { id: normalizeID(node.attrs.id) }, 0],
                 table_element: (node) => {
-                    const $tableWrap = createTableElement(node);
+                    const $tableWrap = this.createTableElement(node);
                     $tableWrap.setAttribute('position', 'anchor');
                     if (node.attrs.type) {
                         $tableWrap.setAttribute('content-type', node.attrs.type);
@@ -824,210 +760,7 @@ export class JATSExporter {
                 tracked_delete: () => ['del'],
             };
             this.serializer = new DOMSerializer(nodes, marks);
-            const appendChildIfPresent = ($parent, tagName, textContent) => {
-                if (!textContent) {
-                    return;
-                }
-                const $element = this.createElement(tagName);
-                $element.textContent = textContent;
-                $parent.appendChild($element);
-            };
-            const processChildNodes = ($element, node, contentNodeType) => {
-                node.forEach((childNode) => {
-                    if (childNode.type === contentNodeType) {
-                        if (childNode.attrs.id) {
-                            $element.appendChild(this.serializeNode(childNode));
-                        }
-                    }
-                    else if (childNode.type === node.type.schema.nodes.paragraph) {
-                        $element.appendChild(this.serializeNode(childNode));
-                    }
-                    else if (childNode.type === node.type.schema.nodes.missing_figure) {
-                        $element.appendChild(this.serializeNode(childNode));
-                    }
-                });
-            };
-            const createElement = (node, nodeName) => {
-                const $element = this.createElement(nodeName);
-                $element.setAttribute('id', normalizeID(node.attrs.id));
-                return $element;
-            };
-            const appendLabels = ($element, node) => {
-                if (this.labelTargets) {
-                    const target = this.labelTargets.get(node.attrs.id);
-                    if (target) {
-                        const $label = this.createElement('label');
-                        $label.textContent = target.label;
-                        $element.appendChild($label);
-                    }
-                }
-            };
-            const appendAttributions = ($element, node) => {
-                if (node.attrs.attribution) {
-                    const $attrib = this.createElement('attrib');
-                    $attrib.textContent = node.attrs.attribution.literal;
-                    $element.appendChild($attrib);
-                }
-            };
-            const appendTable = ($element, node) => {
-                const tableNode = this.getFirstChildOfType(schema.nodes.table, node);
-                const colGroupNode = this.getFirstChildOfType(schema.nodes.table_colgroup, node);
-                if (!tableNode) {
-                    return;
-                }
-                const $table = this.serializeNode(tableNode);
-                const $tbody = this.createElement('tbody');
-                while ($table.firstChild) {
-                    const $child = $table.firstChild;
-                    $table.removeChild($child);
-                    $tbody.appendChild($child);
-                }
-                $table.appendChild($tbody);
-                this.normalizeTable($table);
-                if (colGroupNode) {
-                    const $colGroup = this.serializeNode(colGroupNode);
-                    $table.insertBefore($colGroup, $table.firstChild);
-                }
-                $element.appendChild($table);
-            };
-            const createBoxElement = (node) => {
-                const $boxedText = createElement(node, 'boxed-text');
-                if (node.attrs.type) {
-                    $boxedText.setAttribute('content-type', node.attrs.type);
-                }
-                appendLabels($boxedText, node);
-                const child = node.firstChild;
-                if (child?.type === schema.nodes.caption_title) {
-                    this.appendCaption($boxedText, node);
-                }
-                processChildNodes($boxedText, node, node.type.schema.nodes.section);
-                return $boxedText;
-            };
-            const abstractTypeAttrs = (category) => category && category !== 'abstract' ? { 'abstract-type': category } : {};
-            const createAbstract = (node) => [
-                'abstract',
-                abstractTypeAttrs(node.attrs.category),
-                0,
-            ];
-            const createTransAbstract = (node) => [
-                'trans-abstract',
-                {
-                    [`${XML_NAMESPACE} lang`]: node.attrs.lang ?? '',
-                    ...abstractTypeAttrs(node.attrs.category),
-                },
-                0,
-            ];
-            const isChildOfNodeType = (targetID, type, descend = false) => {
-                const nodes = this.getChildrenOfType(type);
-                return nodes.some((node) => {
-                    const result = findChildrenByAttr(node, (attrs) => attrs.id === targetID, descend)[0];
-                    return !!result;
-                });
-            };
-            const findParentHeroImage = (targetID) => {
-                const heroes = this.getChildrenOfType(schema.nodes.hero_image);
-                return heroes.find((hero) => !!findChildrenByAttr(hero, (attrs) => attrs.id === targetID)[0]);
-            };
-            const createImage = (node) => {
-                const graphicNode = node.content.firstChild;
-                if (!graphicNode) {
-                    return '';
-                }
-                const $graphic = createGraphic(graphicNode);
-                if (node.attrs.extLink) {
-                    const $extLink = this.appendElement($graphic, 'ext-link');
-                    $extLink.setAttributeNS(XLINK_NAMESPACE, 'href', node.attrs.extLink);
-                }
-                this.appendCaption($graphic, node);
-                this.appendChildNodeOfType($graphic, node, schema.nodes.alt_text);
-                this.appendChildNodeOfType($graphic, node, schema.nodes.long_desc);
-                return $graphic;
-            };
-            const createGraphic = (node) => {
-                const $graphic = this.createElement('graphic');
-                $graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', node.attrs.src);
-                const hero = findParentHeroImage(node.attrs.id);
-                if (hero) {
-                    $graphic.setAttribute('content-type', hero.attrs.type || 'leading');
-                }
-                else if (!isChildOfNodeType(node.attrs.id, schema.nodes.figure_element) &&
-                    node.attrs.type) {
-                    $graphic.setAttribute('content-type', node.attrs.type);
-                }
-                return $graphic;
-            };
-            const createFigureElement = (node, contentNodeType) => {
-                const $fig = createElement(node, 'fig');
-                const figNode = this.getFirstChildOfType(schema.nodes.figure, node);
-                const figType = figNode?.attrs.type;
-                if (figType) {
-                    $fig.setAttribute('fig-type', figType);
-                }
-                appendLabels($fig, node);
-                this.appendCaption($fig, node);
-                this.appendChildNodeOfType($fig, node, schema.nodes.alt_text);
-                this.appendChildNodeOfType($fig, node, schema.nodes.long_desc);
-                this.appendChildNodeOfType($fig, node, node.type.schema.nodes.footnotes_element);
-                processChildNodes($fig, node, contentNodeType);
-                appendAttributions($fig, node);
-                if (isExecutableNodeType(node.type)) {
-                    processExecutableNode(node, $fig);
-                }
-                moveAltTextAndLongDescToGraphics($fig);
-                return $fig;
-            };
-            const moveAltTextAndLongDescToGraphics = ($element) => {
-                const $altText = $element.querySelector('alt-text');
-                const $longDesc = $element.querySelector('long-desc');
-                const $graphics = $element.querySelectorAll('graphic');
-                if ($graphics.length === 0) {
-                    return;
-                }
-                $graphics.forEach(($graphic) => {
-                    if ($longDesc) {
-                        $graphic.prepend($longDesc.cloneNode(true));
-                    }
-                    if ($altText) {
-                        $graphic.prepend($altText.cloneNode(true));
-                    }
-                });
-                $altText?.remove();
-                $longDesc?.remove();
-            };
-            const createTableElement = (node) => {
-                const nodeName = 'table-wrap';
-                const $tableWrap = createElement(node, nodeName);
-                appendLabels($tableWrap, node);
-                this.appendCaption($tableWrap, node);
-                this.appendChildNodeOfType($tableWrap, node, schema.nodes.alt_text);
-                this.appendChildNodeOfType($tableWrap, node, schema.nodes.long_desc);
-                appendTable($tableWrap, node);
-                this.appendChildNodeOfType($tableWrap, node, node.type.schema.nodes.table_element_footer);
-                if (isExecutableNodeType(node.type)) {
-                    processExecutableNode(node, $tableWrap);
-                }
-                return $tableWrap;
-            };
-            const processExecutableNode = (node, $element) => {
-                const listingNode = this.getFirstChildOfType(schema.nodes.listing, node);
-                if (listingNode) {
-                    const { contents, languageKey } = listingNode.attrs;
-                    if (contents && languageKey) {
-                        const $fig = this.createElement('fig');
-                        $fig.setAttribute('specific-use', 'source');
-                        $element.appendChild($fig);
-                        const $code = this.createElement('code');
-                        $code.setAttribute('executable', 'true');
-                        $code.setAttribute('language', languageKey);
-                        $code.textContent = contents;
-                        $fig.appendChild($code);
-                    }
-                }
-            };
         };
-        this.serializeNode = (node) => this.serializer.serializeNode(node, {
-            document: this.document,
-        });
         this.buildContributorGroup = (contributors) => {
             if (!contributors.length) {
                 return;
@@ -1146,6 +879,10 @@ export class JATSExporter {
                     'vocab-term-identifier': url,
                 });
             });
+            const bio = this.getFirstChildOfType(schema.nodes.bio, contributor);
+            if (bio?.childCount) {
+                $contrib.appendChild(this.serializeNode(bio));
+            }
             return $contrib;
         };
         this.buildAffiliationElement = (affiliation) => {
@@ -1260,17 +997,6 @@ export class JATSExporter {
             });
         };
         this.buildKeywords = () => this.getChildrenOfType(schema.nodes.keyword_group).map((group) => this.serializeNode(group));
-        this.changeTag = ($node, tag) => {
-            const $clone = this.createElement(tag);
-            for (const attr of $node.attributes) {
-                $clone.setAttributeNS(null, attr.name, attr.value);
-            }
-            while ($node.firstChild) {
-                $clone.appendChild($node.firstChild);
-            }
-            $node.replaceWith($clone);
-            return $clone;
-        };
         this.normalizeTable = ($table) => {
             let $tbody;
             Array.from($table.childNodes).forEach(($child) => {
@@ -1355,14 +1081,174 @@ export class JATSExporter {
             }
         };
     }
-    getFirstChildOfType(type, node) {
-        return this.getChildrenOfType(type, node)[0];
+    appendLabels($element, node) {
+        if (this.labelTargets) {
+            const target = this.labelTargets.get(node.attrs.id);
+            if (target) {
+                const $label = this.createElement('label');
+                $label.textContent = target.label;
+                $element.appendChild($label);
+            }
+        }
+    }
+    appendAttributions($element, node) {
+        if (node.attrs.attribution) {
+            const $attrib = this.createElement('attrib');
+            $attrib.textContent = node.attrs.attribution.literal;
+            $element.appendChild($attrib);
+        }
+    }
+    appendTable($element, node) {
+        const tableNode = this.getFirstChildOfType(schema.nodes.table, node);
+        const colGroupNode = this.getFirstChildOfType(schema.nodes.table_colgroup, node);
+        if (!tableNode) {
+            return;
+        }
+        const $table = this.serializeNode(tableNode);
+        const $tbody = this.createElement('tbody');
+        while ($table.firstChild) {
+            const $child = $table.firstChild;
+            $table.removeChild($child);
+            $tbody.appendChild($child);
+        }
+        $table.appendChild($tbody);
+        this.normalizeTable($table);
+        if (colGroupNode) {
+            const $colGroup = this.serializeNode(colGroupNode);
+            $table.insertBefore($colGroup, $table.firstChild);
+        }
+        $element.appendChild($table);
     }
-    getChildrenOfType(type, node) {
-        const nodes = node
-            ? findChildrenByType(node, type).map(({ node }) => node)
-            : this.nodesMap.get(type);
-        return (nodes ?? []).filter((n) => isNodeOfType(n, type));
+    createBoxElement(node) {
+        const $boxedText = this.createElementWithID(node, 'boxed-text');
+        if (node.attrs.type) {
+            $boxedText.setAttribute('content-type', node.attrs.type);
+        }
+        this.appendLabels($boxedText, node);
+        const child = node.firstChild;
+        if (child?.type === schema.nodes.caption_title) {
+            this.appendCaption($boxedText, node);
+        }
+        this.processChildNodes($boxedText, node, node.type.schema.nodes.section);
+        return $boxedText;
+    }
+    abstractTypeAttrs(category) {
+        return category && category !== 'abstract'
+            ? { 'abstract-type': category }
+            : {};
+    }
+    createAbstract(node) {
+        return ['abstract', this.abstractTypeAttrs(node.attrs.category), 0];
+    }
+    createTransAbstract(node) {
+        return [
+            'trans-abstract',
+            {
+                [`${XML_NAMESPACE} lang`]: node.attrs.lang ?? '',
+                ...this.abstractTypeAttrs(node.attrs.category),
+            },
+            0,
+        ];
+    }
+    createGraphic(node) {
+        const $graphic = this.createElement('graphic');
+        $graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', node.attrs.src);
+        const findParentHeroImage = (targetID) => {
+            const heroes = this.getChildrenOfType(schema.nodes.hero_image);
+            return heroes.find((hero) => !!findChildrenByAttr(hero, (attrs) => attrs.id === targetID)[0]);
+        };
+        const hero = findParentHeroImage(node.attrs.id);
+        if (hero) {
+            $graphic.setAttribute('content-type', hero.attrs.type || 'leading');
+        }
+        else if (!this.isChildOfNodeType(node.attrs.id, schema.nodes.figure_element) &&
+            node.attrs.type) {
+            $graphic.setAttribute('content-type', node.attrs.type);
+        }
+        return $graphic;
+    }
+    createImage(node) {
+        const graphicNode = node.content.firstChild;
+        if (!graphicNode) {
+            return '';
+        }
+        const $graphic = this.createGraphic(graphicNode);
+        if (node.attrs.extLink) {
+            const $extLink = this.appendElement($graphic, 'ext-link');
+            $extLink.setAttributeNS(XLINK_NAMESPACE, 'href', node.attrs.extLink);
+        }
+        this.appendCaption($graphic, node);
+        this.appendChildNodeOfType($graphic, node, schema.nodes.alt_text);
+        this.appendChildNodeOfType($graphic, node, schema.nodes.long_desc);
+        return $graphic;
+    }
+    createFigureElement(node, contentNodeType) {
+        const $fig = this.createElementWithID(node, 'fig');
+        const figNode = this.getFirstChildOfType(schema.nodes.figure, node);
+        const figType = figNode?.attrs.type;
+        if (figType) {
+            $fig.setAttribute('fig-type', figType);
+        }
+        this.appendLabels($fig, node);
+        this.appendCaption($fig, node);
+        this.appendChildNodeOfType($fig, node, schema.nodes.alt_text);
+        this.appendChildNodeOfType($fig, node, schema.nodes.long_desc);
+        this.appendChildNodeOfType($fig, node, node.type.schema.nodes.footnotes_element);
+        this.processChildNodes($fig, node, contentNodeType);
+        this.appendAttributions($fig, node);
+        if (isExecutableNodeType(node.type)) {
+            this.processExecutableNode(node, $fig);
+        }
+        this.moveAltTextAndLongDescToGraphics($fig);
+        return $fig;
+    }
+    moveAltTextAndLongDescToGraphics($element) {
+        const $altText = $element.querySelector('alt-text');
+        const $longDesc = $element.querySelector('long-desc');
+        const $graphics = $element.querySelectorAll('graphic');
+        if ($graphics.length === 0) {
+            return;
+        }
+        $graphics.forEach(($graphic) => {
+            if ($longDesc) {
+                $graphic.prepend($longDesc.cloneNode(true));
+            }
+            if ($altText) {
+                $graphic.prepend($altText.cloneNode(true));
+            }
+        });
+        $altText?.remove();
+        $longDesc?.remove();
+    }
+    createTableElement(node) {
+        const nodeName = 'table-wrap';
+        const $tableWrap = this.createElementWithID(node, nodeName);
+        this.appendLabels($tableWrap, node);
+        this.appendCaption($tableWrap, node);
+        this.appendChildNodeOfType($tableWrap, node, schema.nodes.alt_text);
+        this.appendChildNodeOfType($tableWrap, node, schema.nodes.long_desc);
+        this.appendTable($tableWrap, node);
+        this.appendChildNodeOfType($tableWrap, node, node.type.schema.nodes.table_element_footer);
+        if (isExecutableNodeType(node.type)) {
+            this.processExecutableNode(node, $tableWrap);
+        }
+        return $tableWrap;
+    }
+    processExecutableNode(node, $element) {
+        const listingNode = this.getFirstChildOfType(schema.nodes.listing, node);
+        if (listingNode) {
+            const { contents, languageKey } = listingNode.attrs;
+            if (contents && languageKey) {
+                const $fig = this.createElement('fig');
+                $fig.setAttribute('specific-use', 'source');
+                $element.appendChild($fig);
+                const $code = this.createElement('code');
+                $code.setAttribute('executable', 'true');
+                $code.setAttribute('language', languageKey);
+                $code.textContent = contents;
+                $fig.appendChild($code);
+            }
+        }
     }
     createEquation(node, isInline = false) {
         if (node.attrs.format === 'tex') {
@@ -1386,10 +1272,6 @@ export class JATSExporter {
             return $mathml;
         }
     }
-    fillEmptyElements($article, selector, tagName = 'p') {
-        const $empty = Array.from($article.querySelectorAll(selector)).filter(($el) => !$el.innerHTML);
-        $empty.forEach(($element) => $element.appendChild(this.createElement(tagName)));
-    }
     addParagraphsToSections($article) {
         const $sections = $article.querySelectorAll('sec, abstract');
         const TITLE_TAGS = new Set(['title', 'label', 'sec-meta']);