@manuscripts/transform 2.3.5-LEAN-3519.0 → 2.3.5-LEAN-3608.2

package/dist/cjs/jats/importer/jats-body-dom-parser.js

@@ -315,24 +315,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'general-table-footnote',
-        node: 'general_table_footnote',
-        context: 'table_element_footer/',
-        getAttrs: (node) => {
-            const element = node;
-            return {
-                id: element.getAttribute('id'),
-            };
-        },
-        getContent: (node) => {
-            const generalTableFootnote = schema_1.schema.nodes.paragraph.create();
-            const content = exports.jatsBodyDOMParser.parse(node, {
-                topNode: generalTableFootnote,
-            });
-            return prosemirror_model_1.Fragment.from([content]);
-        },
-    },
     {
         tag: 'fn',
         node: 'footnote',
@@ -350,19 +332,8 @@ const nodes = [
         ignore: true,
     },
     {
-        tag: 'list[list-type=bullet]',
-        node: 'bullet_list',
-        getAttrs: (node) => {
-            const element = node;
-            return {
-                id: element.getAttribute('id'),
-                listStyleType: element.getAttribute('list-type'),
-            };
-        },
-    },
-    {
-        tag: 'list[list-type]',
-        node: 'ordered_list',
+        tag: 'list',
+        node: 'list',
         getAttrs: (node) => {
             const element = node;
             return {

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

@@ -242,18 +242,6 @@ exports.jatsBodyTransformations = {
                 }
                 tableWrap.insertBefore(colgroup, table.nextSibling);
             }
-            const tableFootWrap = tableWrap.querySelector('table-wrap-foot');
-            if (tableFootWrap) {
-                const paragraphs = tableFootWrap.querySelectorAll(':scope > p');
-                if (paragraphs.length) {
-                    const generalTableFootnote = createElement('general-table-footnote');
-                    for (const paragraph of paragraphs) {
-                        removeNodeFromParent(paragraph);
-                        generalTableFootnote.append(paragraph);
-                    }
-                    tableFootWrap.prepend(generalTableFootnote);
-                }
-            }
         });
     },
     orderTableFootnote(doc, body) {

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

@@ -36,10 +36,6 @@ const updateNodeID = (node, replacements, warnings) => {
         node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `InlineMathFragment:${(0, uuid_1.v4)()}` });
         return;
     }
-    if (node.type === schema_1.schema.nodes.general_table_footnote) {
-        node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `GeneralTableFootnote:${(0, uuid_1.v4)()}` });
-        return;
-    }
     if (!('id' in node.attrs)) {
         return;
     }

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

@@ -620,11 +620,14 @@ class JATSExporter {
                     0,
                 ],
                 blockquote_element: () => ['disp-quote', { 'content-type': 'quote' }, 0],
-                bullet_list: (node) => {
+                list: (node) => {
                     var _a;
                     return [
                         'list',
-                        { 'list-type': (_a = node.attrs.listStyleType) !== null && _a !== void 0 ? _a : 'bullet' },
+                        {
+                            'list-type': (_a = node.attrs.listStyleType) !== null && _a !== void 0 ? _a : 'bullet',
+                            type: node.attrs.type,
+                        },
                         0,
                     ];
                 },
@@ -679,9 +682,6 @@ class JATSExporter {
                 equation: (node) => {
                     return this.createEquation(node);
                 },
-                general_table_footnote: (node) => {
-                    return this.serializeNode(node.child(0));
-                },
                 inline_equation: (node) => {
                     const eqElement = this.document.createElement('inline-formula');
                     const equation = this.createEquation(node, true);
@@ -784,14 +784,6 @@ class JATSExporter {
                     graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', '');
                     return graphic;
                 },
-                ordered_list: (node) => {
-                    var _a;
-                    return [
-                        'list',
-                        { 'list-type': (_a = node.attrs.listStyleType) !== null && _a !== void 0 ? _a : 'order' },
-                        0,
-                    ];
-                },
                 paragraph: (node) => {
                     if (!node.childCount) {
                         return '';

package/dist/cjs/schema/index.js

@@ -61,7 +61,6 @@ const figure_element_1 = require("./nodes/figure_element");
 const footnote_1 = require("./nodes/footnote");
 const footnotes_element_1 = require("./nodes/footnotes_element");
 const footnotes_section_1 = require("./nodes/footnotes_section");
-const general_table_footnote_1 = require("./nodes/general_table_footnote");
 const graphical_abstract_section_1 = require("./nodes/graphical_abstract_section");
 const hard_break_1 = require("./nodes/hard_break");
 const highlight_marker_1 = require("./nodes/highlight_marker");
@@ -113,7 +112,6 @@ __exportStar(require("./nodes/equation_element"), exports);
 __exportStar(require("./nodes/figcaption"), exports);
 __exportStar(require("./nodes/figure"), exports);
 __exportStar(require("./nodes/figure_element"), exports);
-__exportStar(require("./nodes/general_table_footnote"), exports);
 __exportStar(require("./nodes/footnote"), exports);
 __exportStar(require("./nodes/footnotes_element"), exports);
 __exportStar(require("./nodes/footnotes_section"), exports);
@@ -172,7 +170,7 @@ exports.schema = new prosemirror_model_1.Schema({
         bibliography_element: bibliography_element_1.bibliographyElement,
         bibliography_section: bibliography_section_1.bibliographySection,
         blockquote_element: blockquote_element_1.blockquoteElement,
-        bullet_list: list_1.bulletList,
+        list: list_1.list,
         caption: caption_1.caption,
         caption_title: caption_title_1.captionTitle,
         citation: citation_1.citation,
@@ -189,7 +187,6 @@ exports.schema = new prosemirror_model_1.Schema({
         footnote: footnote_1.footnote,
         footnotes_element: footnotes_element_1.footnotesElement,
         footnotes_section: footnotes_section_1.footnotesSection,
-        general_table_footnote: general_table_footnote_1.generalTableFootnote,
         graphical_abstract_section: graphical_abstract_section_1.graphicalAbstractSection,
         hard_break: hard_break_1.hardBreak,
         highlight_marker: highlight_marker_1.highlightMarker,
@@ -205,7 +202,6 @@ exports.schema = new prosemirror_model_1.Schema({
         listing_element: listing_element_1.listingElement,
         manuscript: manuscript_1.manuscript,
         missing_figure: missing_figure_1.missingFigure,
-        ordered_list: list_1.orderedList,
         paragraph: paragraph_1.paragraph,
         placeholder: placeholder_1.placeholder,
         placeholder_element: placeholder_element_1.placeholderElement,

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

@@ -15,10 +15,19 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isListNode = exports.listItem = exports.orderedList = exports.bulletList = void 0;
+exports.isListNode = exports.listItem = exports.list = exports.JATS_HTML_LIST_STYLE_MAPPING = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 const attributes_1 = require("../../lib/attributes");
-exports.bulletList = {
+exports.JATS_HTML_LIST_STYLE_MAPPING = {
+    simple: { style: 'none', type: 'ul' },
+    bullet: { style: 'disc', type: 'ul' },
+    order: { style: 'decimal', type: 'ol' },
+    'alpha-lower': { style: 'lower-alpha', type: 'ol' },
+    'alpha-upper': { style: 'upper-alpha', type: 'ol' },
+    'roman-lower': { style: 'lower-roman', type: 'ol' },
+    'roman-upper': { style: 'upper-roman', type: 'ol' },
+};
+exports.list = {
     content: 'list_item+',
     group: 'block list element',
     attrs: {
@@ -38,33 +47,6 @@ exports.bulletList = {
                 };
             },
         },
-    ],
-    toDOM: (node) => {
-        const bulletListNode = node;
-        return bulletListNode.attrs.id
-            ? [
-                'ul',
-                {
-                    id: bulletListNode.attrs.id,
-                    'list-type': bulletListNode.attrs.listStyleType,
-                    class: (0, attributes_1.buildElementClass)(bulletListNode.attrs),
-                    'data-object-type': json_schema_1.ObjectTypes.ListElement,
-                },
-                0,
-            ]
-            : ['ul', 0];
-    },
-};
-exports.orderedList = {
-    content: 'list_item+',
-    group: 'block list element',
-    attrs: {
-        id: { default: '' },
-        listStyleType: { default: null },
-        paragraphStyle: { default: '' },
-        dataTracked: { default: null },
-    },
-    parseDOM: [
         {
             tag: 'ol',
             getAttrs: (p) => {
@@ -77,19 +59,28 @@ exports.orderedList = {
         },
     ],
     toDOM: (node) => {
-        const orderedListNode = node;
-        return orderedListNode.attrs.id
+        const ListNode = node;
+        return exports.JATS_HTML_LIST_STYLE_MAPPING[ListNode.attrs.listStyleType].type === 'ul'
             ? [
-                'ol',
+                'ul',
                 {
-                    id: orderedListNode.attrs.id,
-                    'list-type': orderedListNode.attrs.listStyleType,
-                    class: (0, attributes_1.buildElementClass)(orderedListNode.attrs),
+                    id: ListNode.attrs.id,
+                    'list-type': ListNode.attrs.listStyleType,
+                    class: (0, attributes_1.buildElementClass)(ListNode.attrs),
                     'data-object-type': json_schema_1.ObjectTypes.ListElement,
                 },
                 0,
             ]
-            : ['ol', 0];
+            : [
+                'ol',
+                {
+                    id: ListNode.attrs.id,
+                    'list-type': ListNode.attrs.listStyleType,
+                    class: (0, attributes_1.buildElementClass)(ListNode.attrs),
+                    'data-object-type': json_schema_1.ObjectTypes.ListElement,
+                },
+                0,
+            ];
     },
 };
 exports.listItem = {
@@ -122,6 +113,6 @@ exports.listItem = {
 };
 const isListNode = (node) => {
     const { nodes } = node.type.schema;
-    return node.type === nodes.bullet_list || node.type === nodes.ordered_list;
+    return node.type === nodes.list;
 };
 exports.isListNode = isListNode;

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

@@ -21,7 +21,7 @@ exports.tableElementFooter = {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    content: 'general_table_footnote? footnotes_element?',
+    content: '(paragraph | footnotes_element)*',
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };

package/dist/cjs/transformer/decode.js

@@ -38,7 +38,6 @@ const section_group_type_1 = require("../lib/section-group-type");
 const schema_1 = require("../schema");
 const builders_1 = require("./builders");
 const highlight_markers_1 = require("./highlight-markers");
-const id_1 = require("./id");
 const object_types_1 = require("./object-types");
 const section_category_1 = require("./section-category");
 const timestamp_1 = require("./timestamp");
@@ -391,7 +390,7 @@ class Decoder {
                 switch (model.elementType) {
                     case 'ol':
                         return this.parseContents(model.contents || '<ol></ol>', undefined, this.getComments(model), {
-                            topNode: schema_1.schema.nodes.ordered_list.create({
+                            topNode: schema_1.schema.nodes.list.create({
                                 id: model._id,
                                 listStyleType: model.listStyleType,
                                 paragraphStyle: model.paragraphStyle,
@@ -400,7 +399,7 @@ class Decoder {
                         });
                     case 'ul':
                         return this.parseContents(model.contents || '<ul></ul>', undefined, this.getComments(model), {
-                            topNode: schema_1.schema.nodes.bullet_list.create({
+                            topNode: schema_1.schema.nodes.list.create({
                                 id: model._id,
                                 listStyleType: model.listStyleType,
                                 paragraphStyle: model.paragraphStyle,
@@ -493,30 +492,10 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.TableElementFooter]: (data) => {
                 const model = data;
-                const contents = [];
-                const generalTableFootnotes = [];
-                const footnotesElements = [];
-                for (const containedObjectID of model.containedObjectIDs) {
-                    const model = this.modelMap.get(containedObjectID);
-                    if (model.objectType === json_schema_1.ObjectTypes.ParagraphElement) {
-                        const paragraph = this.decode(model);
-                        if (paragraph) {
-                            generalTableFootnotes.push(paragraph);
-                        }
-                    }
-                    else {
-                        footnotesElements.push(this.decode(model));
-                    }
-                }
-                if (generalTableFootnotes && generalTableFootnotes.length) {
-                    contents.push(schema_1.schema.nodes.general_table_footnote.create({ id: (0, id_1.generateID)(object_types_1.ExtraObjectTypes.GeneralTableFootnote) }, [...generalTableFootnotes]));
-                }
-                if (footnotesElements && footnotesElements.length) {
-                    contents.push(...footnotesElements);
-                }
+                const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
                 return schema_1.schema.nodes.table_element_footer.create({
                     id: model._id,
-                }, contents);
+                }, content);
             },
             [json_schema_1.ObjectTypes.AuthorNotes]: (data) => {
                 const model = data;

package/dist/cjs/transformer/encode.js

@@ -210,18 +210,6 @@ const containedBibliographyItemIDs = (node) => {
     const bibliographyItemNodeType = node.type.schema.nodes.bibliography_item;
     return containedObjectIDs(node, [bibliographyItemNodeType]);
 };
-const tableElementFooterContainedIDs = (node) => {
-    const containedGeneralTableFootnoteIDs = containedObjectIDs(node, [
-        schema_1.schema.nodes.footnotes_element,
-    ]);
-    for (let i = 0; i < node.childCount; i++) {
-        const childNode = node.child(i);
-        if (childNode.type === schema_1.schema.nodes.general_table_footnote) {
-            containedGeneralTableFootnoteIDs.push(...containedObjectIDs(childNode));
-        }
-    }
-    return containedGeneralTableFootnoteIDs;
-};
 const containedObjectIDs = (node, nodeTypes) => {
     const ids = [];
     for (let i = 0; i < node.childCount; i++) {
@@ -338,8 +326,8 @@ const encoders = {
         placeholderInnerHTML: node.attrs.placeholder || '',
         quoteType: 'block',
     }),
-    bullet_list: (node) => ({
-        elementType: 'ul',
+    list: (node) => ({
+        elementType: schema_1.JATS_HTML_LIST_STYLE_MAPPING[node.attrs.listStyleType].type,
         contents: listContents(node),
         listStyleType: node.attrs.listStyleType,
         paragraphStyle: node.attrs.paragraphStyle || undefined,
@@ -394,7 +382,7 @@ const encoders = {
         paragraphStyle: node.attrs.paragraphStyle || undefined,
     }),
     table_element_footer: (node) => ({
-        containedObjectIDs: tableElementFooterContainedIDs(node),
+        containedObjectIDs: containedObjectIDs(node),
     }),
     author_notes: (node) => ({
         containedObjectIDs: containedObjectIDs(node),
@@ -432,12 +420,6 @@ const encoders = {
     missing_figure: (node) => ({
         position: node.attrs.position || undefined,
     }),
-    ordered_list: (node) => ({
-        elementType: 'ol',
-        contents: listContents(node),
-        listStyleType: node.attrs.listStyleType,
-        paragraphStyle: node.attrs.paragraphStyle || undefined,
-    }),
     paragraph: (node) => ({
         elementType: 'p',
         contents: contents(node),
@@ -570,7 +552,6 @@ const containerTypes = [
     schema_1.schema.nodes.abstracts,
     schema_1.schema.nodes.body,
     schema_1.schema.nodes.backmatter,
-    schema_1.schema.nodes.general_table_footnote,
 ];
 const placeholderTypes = [
     schema_1.schema.nodes.placeholder,

package/dist/cjs/transformer/node-names.js

@@ -27,8 +27,7 @@ exports.nodeNames = new Map([
     [schema_1.schema.nodes.figure_element, 'Figure'],
     [schema_1.schema.nodes.footnote, 'Footnote'],
     [schema_1.schema.nodes.footnotes_element, 'Notes'],
-    [schema_1.schema.nodes.bullet_list, 'Bullet List'],
-    [schema_1.schema.nodes.ordered_list, 'Ordered List'],
+    [schema_1.schema.nodes.list, 'List'],
     [schema_1.schema.nodes.manuscript, 'Manuscript'],
     [schema_1.schema.nodes.paragraph, 'Paragraph'],
     [schema_1.schema.nodes.section, 'Section'],

package/dist/cjs/transformer/node-title.js

@@ -56,8 +56,7 @@ const nodeTitle = (node) => {
             return snippetOfNodeType(node, nodes.section_title);
         case nodes.footnotes_element:
             return node.attrs.collateByKind === 'footnote' ? 'Footnotes' : 'Endnotes';
-        case nodes.ordered_list:
-        case nodes.bullet_list:
+        case nodes.list:
         case nodes.blockquote_element:
         case nodes.footnote:
         case nodes.pullquote_element:

package/dist/cjs/transformer/node-types.js

@@ -27,7 +27,7 @@ exports.nodeTypesMap = new Map([
     [schema_1.schema.nodes.bibliography_element, json_schema_1.ObjectTypes.BibliographyElement],
     [schema_1.schema.nodes.bibliography_section, json_schema_1.ObjectTypes.Section],
     [schema_1.schema.nodes.blockquote_element, json_schema_1.ObjectTypes.QuoteElement],
-    [schema_1.schema.nodes.bullet_list, json_schema_1.ObjectTypes.ListElement],
+    [schema_1.schema.nodes.list, json_schema_1.ObjectTypes.ListElement],
     [schema_1.schema.nodes.citation, json_schema_1.ObjectTypes.Citation],
     [schema_1.schema.nodes.equation, json_schema_1.ObjectTypes.Equation],
     [schema_1.schema.nodes.equation_element, json_schema_1.ObjectTypes.EquationElement],
@@ -46,7 +46,6 @@ exports.nodeTypesMap = new Map([
     [schema_1.schema.nodes.listing, json_schema_1.ObjectTypes.Listing],
     [schema_1.schema.nodes.listing_element, json_schema_1.ObjectTypes.ListingElement],
     [schema_1.schema.nodes.manuscript, json_schema_1.ObjectTypes.Manuscript],
-    [schema_1.schema.nodes.ordered_list, json_schema_1.ObjectTypes.ListElement],
     [schema_1.schema.nodes.paragraph, json_schema_1.ObjectTypes.ParagraphElement],
     [schema_1.schema.nodes.pullquote_element, json_schema_1.ObjectTypes.QuoteElement],
     [schema_1.schema.nodes.section, json_schema_1.ObjectTypes.Section],

package/dist/cjs/transformer/object-types.js

@@ -20,7 +20,6 @@ const json_schema_1 = require("@manuscripts/json-schema");
 var ExtraObjectTypes;
 (function (ExtraObjectTypes) {
     ExtraObjectTypes["PlaceholderElement"] = "MPPlaceholderElement";
-    ExtraObjectTypes["GeneralTableFootnote"] = "MPGeneralTableFootnote";
 })(ExtraObjectTypes = exports.ExtraObjectTypes || (exports.ExtraObjectTypes = {}));
 exports.elementObjects = [
     json_schema_1.ObjectTypes.BibliographyElement,

package/dist/es/jats/importer/jats-body-dom-parser.js

@@ -309,24 +309,6 @@ const nodes = [
             };
         },
     },
-    {
-        tag: 'general-table-footnote',
-        node: 'general_table_footnote',
-        context: 'table_element_footer/',
-        getAttrs: (node) => {
-            const element = node;
-            return {
-                id: element.getAttribute('id'),
-            };
-        },
-        getContent: (node) => {
-            const generalTableFootnote = schema.nodes.paragraph.create();
-            const content = jatsBodyDOMParser.parse(node, {
-                topNode: generalTableFootnote,
-            });
-            return Fragment.from([content]);
-        },
-    },
     {
         tag: 'fn',
         node: 'footnote',
@@ -344,19 +326,8 @@ const nodes = [
         ignore: true,
     },
     {
-        tag: 'list[list-type=bullet]',
-        node: 'bullet_list',
-        getAttrs: (node) => {
-            const element = node;
-            return {
-                id: element.getAttribute('id'),
-                listStyleType: element.getAttribute('list-type'),
-            };
-        },
-    },
-    {
-        tag: 'list[list-type]',
-        node: 'ordered_list',
+        tag: 'list',
+        node: 'list',
         getAttrs: (node) => {
             const element = node;
             return {

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

@@ -239,18 +239,6 @@ export const jatsBodyTransformations = {
                 }
                 tableWrap.insertBefore(colgroup, table.nextSibling);
             }
-            const tableFootWrap = tableWrap.querySelector('table-wrap-foot');
-            if (tableFootWrap) {
-                const paragraphs = tableFootWrap.querySelectorAll(':scope > p');
-                if (paragraphs.length) {
-                    const generalTableFootnote = createElement('general-table-footnote');
-                    for (const paragraph of paragraphs) {
-                        removeNodeFromParent(paragraph);
-                        generalTableFootnote.append(paragraph);
-                    }
-                    tableFootWrap.prepend(generalTableFootnote);
-                }
-            }
         });
     },
     orderTableFootnote(doc, body) {

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

@@ -32,10 +32,6 @@ const updateNodeID = (node, replacements, warnings) => {
         node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `InlineMathFragment:${uuidv4()}` });
         return;
     }
-    if (node.type === schema.nodes.general_table_footnote) {
-        node.attrs = Object.assign(Object.assign({}, node.attrs), { id: `GeneralTableFootnote:${uuidv4()}` });
-        return;
-    }
     if (!('id' in node.attrs)) {
         return;
     }

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

@@ -612,11 +612,14 @@ export class JATSExporter {
                     0,
                 ],
                 blockquote_element: () => ['disp-quote', { 'content-type': 'quote' }, 0],
-                bullet_list: (node) => {
+                list: (node) => {
                     var _a;
                     return [
                         'list',
-                        { 'list-type': (_a = node.attrs.listStyleType) !== null && _a !== void 0 ? _a : 'bullet' },
+                        {
+                            'list-type': (_a = node.attrs.listStyleType) !== null && _a !== void 0 ? _a : 'bullet',
+                            type: node.attrs.type,
+                        },
                         0,
                     ];
                 },
@@ -671,9 +674,6 @@ export class JATSExporter {
                 equation: (node) => {
                     return this.createEquation(node);
                 },
-                general_table_footnote: (node) => {
-                    return this.serializeNode(node.child(0));
-                },
                 inline_equation: (node) => {
                     const eqElement = this.document.createElement('inline-formula');
                     const equation = this.createEquation(node, true);
@@ -776,14 +776,6 @@ export class JATSExporter {
                     graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', '');
                     return graphic;
                 },
-                ordered_list: (node) => {
-                    var _a;
-                    return [
-                        'list',
-                        { 'list-type': (_a = node.attrs.listStyleType) !== null && _a !== void 0 ? _a : 'order' },
-                        0,
-                    ];
-                },
                 paragraph: (node) => {
                     if (!node.childCount) {
                         return '';

package/dist/es/schema/index.js

@@ -44,7 +44,6 @@ import { figureElement } from './nodes/figure_element';
 import { footnote } from './nodes/footnote';
 import { footnotesElement } from './nodes/footnotes_element';
 import { footnotesSection } from './nodes/footnotes_section';
-import { generalTableFootnote } from './nodes/general_table_footnote';
 import { graphicalAbstractSection } from './nodes/graphical_abstract_section';
 import { hardBreak } from './nodes/hard_break';
 import { highlightMarker } from './nodes/highlight_marker';
@@ -55,7 +54,7 @@ import { keywordGroup } from './nodes/keyword_group';
 import { keywords } from './nodes/keywords';
 import { keywordsElement } from './nodes/keywords_element';
 import { link } from './nodes/link';
-import { bulletList, listItem, orderedList } from './nodes/list';
+import { list, listItem } from './nodes/list';
 import { listing } from './nodes/listing';
 import { listingElement } from './nodes/listing_element';
 import { manuscript } from './nodes/manuscript';
@@ -96,7 +95,6 @@ export * from './nodes/equation_element';
 export * from './nodes/figcaption';
 export * from './nodes/figure';
 export * from './nodes/figure_element';
-export * from './nodes/general_table_footnote';
 export * from './nodes/footnote';
 export * from './nodes/footnotes_element';
 export * from './nodes/footnotes_section';
@@ -155,7 +153,7 @@ export const schema = new Schema({
         bibliography_element: bibliographyElement,
         bibliography_section: bibliographySection,
         blockquote_element: blockquoteElement,
-        bullet_list: bulletList,
+        list: list,
         caption,
         caption_title: captionTitle,
         citation,
@@ -172,7 +170,6 @@ export const schema = new Schema({
         footnote,
         footnotes_element: footnotesElement,
         footnotes_section: footnotesSection,
-        general_table_footnote: generalTableFootnote,
         graphical_abstract_section: graphicalAbstractSection,
         hard_break: hardBreak,
         highlight_marker: highlightMarker,
@@ -188,7 +185,6 @@ export const schema = new Schema({
         listing_element: listingElement,
         manuscript,
         missing_figure: missingFigure,
-        ordered_list: orderedList,
         paragraph,
         placeholder,
         placeholder_element: placeholderElement,

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

@@ -15,7 +15,16 @@
  */
 import { ObjectTypes } from '@manuscripts/json-schema';
 import { buildElementClass } from '../../lib/attributes';
-export const bulletList = {
+export const JATS_HTML_LIST_STYLE_MAPPING = {
+    simple: { style: 'none', type: 'ul' },
+    bullet: { style: 'disc', type: 'ul' },
+    order: { style: 'decimal', type: 'ol' },
+    'alpha-lower': { style: 'lower-alpha', type: 'ol' },
+    'alpha-upper': { style: 'upper-alpha', type: 'ol' },
+    'roman-lower': { style: 'lower-roman', type: 'ol' },
+    'roman-upper': { style: 'upper-roman', type: 'ol' },
+};
+export const list = {
     content: 'list_item+',
     group: 'block list element',
     attrs: {
@@ -35,33 +44,6 @@ export const bulletList = {
                 };
             },
         },
-    ],
-    toDOM: (node) => {
-        const bulletListNode = node;
-        return bulletListNode.attrs.id
-            ? [
-                'ul',
-                {
-                    id: bulletListNode.attrs.id,
-                    'list-type': bulletListNode.attrs.listStyleType,
-                    class: buildElementClass(bulletListNode.attrs),
-                    'data-object-type': ObjectTypes.ListElement,
-                },
-                0,
-            ]
-            : ['ul', 0];
-    },
-};
-export const orderedList = {
-    content: 'list_item+',
-    group: 'block list element',
-    attrs: {
-        id: { default: '' },
-        listStyleType: { default: null },
-        paragraphStyle: { default: '' },
-        dataTracked: { default: null },
-    },
-    parseDOM: [
         {
             tag: 'ol',
             getAttrs: (p) => {
@@ -74,19 +56,28 @@ export const orderedList = {
         },
     ],
     toDOM: (node) => {
-        const orderedListNode = node;
-        return orderedListNode.attrs.id
+        const ListNode = node;
+        return JATS_HTML_LIST_STYLE_MAPPING[ListNode.attrs.listStyleType].type === 'ul'
             ? [
-                'ol',
+                'ul',
                 {
-                    id: orderedListNode.attrs.id,
-                    'list-type': orderedListNode.attrs.listStyleType,
-                    class: buildElementClass(orderedListNode.attrs),
+                    id: ListNode.attrs.id,
+                    'list-type': ListNode.attrs.listStyleType,
+                    class: buildElementClass(ListNode.attrs),
                     'data-object-type': ObjectTypes.ListElement,
                 },
                 0,
             ]
-            : ['ol', 0];
+            : [
+                'ol',
+                {
+                    id: ListNode.attrs.id,
+                    'list-type': ListNode.attrs.listStyleType,
+                    class: buildElementClass(ListNode.attrs),
+                    'data-object-type': ObjectTypes.ListElement,
+                },
+                0,
+            ];
     },
 };
 export const listItem = {
@@ -119,5 +110,5 @@ export const listItem = {
 };
 export const isListNode = (node) => {
     const { nodes } = node.type.schema;
-    return node.type === nodes.bullet_list || node.type === nodes.ordered_list;
+    return node.type === nodes.list;
 };

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

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

package/dist/es/transformer/decode.js

@@ -32,7 +32,6 @@ import { abstractsType, backmatterType, bodyType, } from '../lib/section-group-t
 import { schema, } from '../schema';
 import { buildTitles } from './builders';
 import { insertHighlightMarkers } from './highlight-markers';
-import { generateID } from './id';
 import { ExtraObjectTypes, isCommentAnnotation, isManuscript, } from './object-types';
 import { chooseSectionLableName, chooseSectionNodeType, chooseSecType, getSectionGroupType, guessSectionCategory, } from './section-category';
 import { timestamp } from './timestamp';
@@ -382,7 +381,7 @@ export class Decoder {
                 switch (model.elementType) {
                     case 'ol':
                         return this.parseContents(model.contents || '<ol></ol>', undefined, this.getComments(model), {
-                            topNode: schema.nodes.ordered_list.create({
+                            topNode: schema.nodes.list.create({
                                 id: model._id,
                                 listStyleType: model.listStyleType,
                                 paragraphStyle: model.paragraphStyle,
@@ -391,7 +390,7 @@ export class Decoder {
                         });
                     case 'ul':
                         return this.parseContents(model.contents || '<ul></ul>', undefined, this.getComments(model), {
-                            topNode: schema.nodes.bullet_list.create({
+                            topNode: schema.nodes.list.create({
                                 id: model._id,
                                 listStyleType: model.listStyleType,
                                 paragraphStyle: model.paragraphStyle,
@@ -484,30 +483,10 @@ export class Decoder {
             },
             [ObjectTypes.TableElementFooter]: (data) => {
                 const model = data;
-                const contents = [];
-                const generalTableFootnotes = [];
-                const footnotesElements = [];
-                for (const containedObjectID of model.containedObjectIDs) {
-                    const model = this.modelMap.get(containedObjectID);
-                    if (model.objectType === ObjectTypes.ParagraphElement) {
-                        const paragraph = this.decode(model);
-                        if (paragraph) {
-                            generalTableFootnotes.push(paragraph);
-                        }
-                    }
-                    else {
-                        footnotesElements.push(this.decode(model));
-                    }
-                }
-                if (generalTableFootnotes && generalTableFootnotes.length) {
-                    contents.push(schema.nodes.general_table_footnote.create({ id: generateID(ExtraObjectTypes.GeneralTableFootnote) }, [...generalTableFootnotes]));
-                }
-                if (footnotesElements && footnotesElements.length) {
-                    contents.push(...footnotesElements);
-                }
+                const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
                 return schema.nodes.table_element_footer.create({
                     id: model._id,
-                }, contents);
+                }, content);
             },
             [ObjectTypes.AuthorNotes]: (data) => {
                 const model = data;

package/dist/es/transformer/encode.js

@@ -16,7 +16,7 @@
 import { DOMSerializer } from 'prosemirror-model';
 import serializeToXML from 'w3c-xmlserializer';
 import { iterateChildren } from '../lib/utils';
-import { hasGroup, isHighlightMarkerNode, isManuscriptNode, isSectionNode, schema, } from '../schema';
+import { hasGroup, isHighlightMarkerNode, isManuscriptNode, isSectionNode, JATS_HTML_LIST_STYLE_MAPPING, schema, } from '../schema';
 import { auxiliaryObjectTypes, buildAttribution, buildElementsOrder, buildFootnotesOrder, } from './builders';
 import { extractCommentMarkers } from './highlight-markers';
 import { nodeTypesMap } from './node-types';
@@ -202,18 +202,6 @@ const containedBibliographyItemIDs = (node) => {
     const bibliographyItemNodeType = node.type.schema.nodes.bibliography_item;
     return containedObjectIDs(node, [bibliographyItemNodeType]);
 };
-const tableElementFooterContainedIDs = (node) => {
-    const containedGeneralTableFootnoteIDs = containedObjectIDs(node, [
-        schema.nodes.footnotes_element,
-    ]);
-    for (let i = 0; i < node.childCount; i++) {
-        const childNode = node.child(i);
-        if (childNode.type === schema.nodes.general_table_footnote) {
-            containedGeneralTableFootnoteIDs.push(...containedObjectIDs(childNode));
-        }
-    }
-    return containedGeneralTableFootnoteIDs;
-};
 const containedObjectIDs = (node, nodeTypes) => {
     const ids = [];
     for (let i = 0; i < node.childCount; i++) {
@@ -330,8 +318,8 @@ const encoders = {
         placeholderInnerHTML: node.attrs.placeholder || '',
         quoteType: 'block',
     }),
-    bullet_list: (node) => ({
-        elementType: 'ul',
+    list: (node) => ({
+        elementType: JATS_HTML_LIST_STYLE_MAPPING[node.attrs.listStyleType].type,
         contents: listContents(node),
         listStyleType: node.attrs.listStyleType,
         paragraphStyle: node.attrs.paragraphStyle || undefined,
@@ -386,7 +374,7 @@ const encoders = {
         paragraphStyle: node.attrs.paragraphStyle || undefined,
     }),
     table_element_footer: (node) => ({
-        containedObjectIDs: tableElementFooterContainedIDs(node),
+        containedObjectIDs: containedObjectIDs(node),
     }),
     author_notes: (node) => ({
         containedObjectIDs: containedObjectIDs(node),
@@ -424,12 +412,6 @@ const encoders = {
     missing_figure: (node) => ({
         position: node.attrs.position || undefined,
     }),
-    ordered_list: (node) => ({
-        elementType: 'ol',
-        contents: listContents(node),
-        listStyleType: node.attrs.listStyleType,
-        paragraphStyle: node.attrs.paragraphStyle || undefined,
-    }),
     paragraph: (node) => ({
         elementType: 'p',
         contents: contents(node),
@@ -561,7 +543,6 @@ const containerTypes = [
     schema.nodes.abstracts,
     schema.nodes.body,
     schema.nodes.backmatter,
-    schema.nodes.general_table_footnote,
 ];
 const placeholderTypes = [
     schema.nodes.placeholder,

package/dist/es/transformer/node-names.js

@@ -24,8 +24,7 @@ export const nodeNames = new Map([
     [schema.nodes.figure_element, 'Figure'],
     [schema.nodes.footnote, 'Footnote'],
     [schema.nodes.footnotes_element, 'Notes'],
-    [schema.nodes.bullet_list, 'Bullet List'],
-    [schema.nodes.ordered_list, 'Ordered List'],
+    [schema.nodes.list, 'List'],
     [schema.nodes.manuscript, 'Manuscript'],
     [schema.nodes.paragraph, 'Paragraph'],
     [schema.nodes.section, 'Section'],

package/dist/es/transformer/node-title.js

@@ -53,8 +53,7 @@ export const nodeTitle = (node) => {
             return snippetOfNodeType(node, nodes.section_title);
         case nodes.footnotes_element:
             return node.attrs.collateByKind === 'footnote' ? 'Footnotes' : 'Endnotes';
-        case nodes.ordered_list:
-        case nodes.bullet_list:
+        case nodes.list:
         case nodes.blockquote_element:
         case nodes.footnote:
         case nodes.pullquote_element:

package/dist/es/transformer/node-types.js

@@ -24,7 +24,7 @@ export const nodeTypesMap = new Map([
     [schema.nodes.bibliography_element, ObjectTypes.BibliographyElement],
     [schema.nodes.bibliography_section, ObjectTypes.Section],
     [schema.nodes.blockquote_element, ObjectTypes.QuoteElement],
-    [schema.nodes.bullet_list, ObjectTypes.ListElement],
+    [schema.nodes.list, ObjectTypes.ListElement],
     [schema.nodes.citation, ObjectTypes.Citation],
     [schema.nodes.equation, ObjectTypes.Equation],
     [schema.nodes.equation_element, ObjectTypes.EquationElement],
@@ -43,7 +43,6 @@ export const nodeTypesMap = new Map([
     [schema.nodes.listing, ObjectTypes.Listing],
     [schema.nodes.listing_element, ObjectTypes.ListingElement],
     [schema.nodes.manuscript, ObjectTypes.Manuscript],
-    [schema.nodes.ordered_list, ObjectTypes.ListElement],
     [schema.nodes.paragraph, ObjectTypes.ParagraphElement],
     [schema.nodes.pullquote_element, ObjectTypes.QuoteElement],
     [schema.nodes.section, ObjectTypes.Section],

package/dist/es/transformer/object-types.js

@@ -17,7 +17,6 @@ import { manuscriptIDTypes, ObjectTypes, } from '@manuscripts/json-schema';
 export var ExtraObjectTypes;
 (function (ExtraObjectTypes) {
     ExtraObjectTypes["PlaceholderElement"] = "MPPlaceholderElement";
-    ExtraObjectTypes["GeneralTableFootnote"] = "MPGeneralTableFootnote";
 })(ExtraObjectTypes || (ExtraObjectTypes = {}));
 export const elementObjects = [
     ObjectTypes.BibliographyElement,

package/dist/types/schema/index.d.ts

@@ -34,7 +34,6 @@ export * from './nodes/equation_element';
 export * from './nodes/figcaption';
 export * from './nodes/figure';
 export * from './nodes/figure_element';
-export * from './nodes/general_table_footnote';
 export * from './nodes/footnote';
 export * from './nodes/footnotes_element';
 export * from './nodes/footnotes_section';

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

@@ -13,29 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { ListElement } from '@manuscripts/json-schema';
 import { NodeSpec } from 'prosemirror-model';
 import { ManuscriptNode } from '../types';
-export interface BulletListNode extends ManuscriptNode {
-    attrs: {
-        id: string;
-        paragraphStyle: string;
-        listStyleType: string;
+export type JatsStyleType = NonNullable<ListElement['listStyleType']>;
+export declare const JATS_HTML_LIST_STYLE_MAPPING: {
+    [key in JatsStyleType]: {
+        style: string;
+        type: string;
     };
-}
-export declare const bulletList: NodeSpec;
-export interface OrderedListNode extends ManuscriptNode {
+};
+export interface ListNode extends ManuscriptNode {
     attrs: {
         id: string;
-        listStyleType: string;
         paragraphStyle: string;
+        listStyleType: string;
     };
 }
-export declare const orderedList: NodeSpec;
+export declare const list: NodeSpec;
 export interface ListItemNode extends ManuscriptNode {
     attrs: {
         placeholder: string;
     };
 }
 export declare const listItem: NodeSpec;
-export type ListNode = BulletListNode | OrderedListNode;
 export declare const isListNode: (node: ManuscriptNode) => node is ListNode;

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

@@ -17,7 +17,7 @@ import { Fragment, Mark as ProsemirrorMark, MarkType, Node as ProsemirrorNode, N
 import { EditorState, NodeSelection, Plugin, TextSelection, Transaction } from 'prosemirror-state';
 import { EditorView, NodeView } from 'prosemirror-view';
 export type Marks = 'bold' | 'code' | 'italic' | 'smallcaps' | 'strikethrough' | 'styled' | 'subscript' | 'superscript' | 'underline' | 'tracked_insert' | 'tracked_delete';
-export type Nodes = 'attribution' | 'bibliography_item' | 'bibliography_element' | 'bibliography_section' | 'blockquote_element' | 'bullet_list' | 'caption' | 'caption_title' | 'comment' | 'comments' | 'citation' | 'cross_reference' | 'doc' | 'equation' | 'equation_element' | 'figcaption' | 'figure' | 'graphical_abstract_section' | 'figure_element' | 'footnote' | 'footnotes_element' | 'footnotes_section' | 'hard_break' | 'highlight_marker' | 'inline_equation' | 'inline_footnote' | 'keyword' | 'keywords_element' | 'keyword_group' | 'keywords' | 'link' | 'list_item' | 'listing' | 'listing_element' | 'manuscript' | 'abstracts' | 'body' | 'backmatter' | 'missing_figure' | 'ordered_list' | 'paragraph' | 'placeholder' | 'placeholder_element' | 'pullquote_element' | 'section' | 'section_label' | 'section_title' | 'section_title_plain' | 'table' | 'table_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'table_header' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'contributor' | 'table_element_footer' | 'title' | 'affiliations' | 'contributors' | 'supplements' | 'supplement' | 'author_notes' | 'corresp' | 'general_table_footnote';
+export type Nodes = 'attribution' | 'bibliography_item' | 'bibliography_element' | 'bibliography_section' | 'blockquote_element' | 'list' | 'caption' | 'caption_title' | 'comment' | 'comments' | 'citation' | 'cross_reference' | 'doc' | 'equation' | 'equation_element' | 'figcaption' | 'figure' | 'graphical_abstract_section' | 'figure_element' | 'footnote' | 'footnotes_element' | 'footnotes_section' | 'hard_break' | 'highlight_marker' | 'inline_equation' | 'inline_footnote' | 'keyword' | 'keywords_element' | 'keyword_group' | 'keywords' | 'link' | 'list_item' | 'listing' | 'listing_element' | 'manuscript' | 'abstracts' | 'body' | 'backmatter' | 'missing_figure' | 'paragraph' | 'placeholder' | 'placeholder_element' | 'pullquote_element' | 'section' | 'section_label' | 'section_title' | 'section_title_plain' | 'table' | 'table_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'table_header' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'contributor' | 'table_element_footer' | 'title' | 'affiliations' | 'contributors' | 'supplements' | 'supplement' | 'author_notes' | 'corresp';
 export type ManuscriptSchema = Schema<Nodes, Marks>;
 export type ManuscriptEditorState = EditorState;
 export type ManuscriptEditorView = EditorView;

package/dist/types/transformer/object-types.d.ts

@@ -16,8 +16,7 @@
 import { CommentAnnotation, Figure, Keyword, Manuscript, Model, ObjectTypes, Table } from '@manuscripts/json-schema';
 import { ManuscriptModel } from './models';
 export declare enum ExtraObjectTypes {
-    PlaceholderElement = "MPPlaceholderElement",
-    GeneralTableFootnote = "MPGeneralTableFootnote"
+    PlaceholderElement = "MPPlaceholderElement"
 }
 export declare const elementObjects: ObjectTypes[];
 export declare const manuscriptObjects: ObjectTypes[];

package/package.json

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

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

@@ -1,27 +0,0 @@
-"use strict";
-/*!
- * © 2019 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.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generalTableFootnote = void 0;
-exports.generalTableFootnote = {
-    content: 'paragraph*',
-    attrs: {
-        id: { default: '' },
-        dataTracked: { default: null },
-    },
-    group: 'block',
-    toDOM: () => ['div', { class: 'general-table-footnote' }, 0],
-};

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

@@ -1,24 +0,0 @@
-/*!
- * © 2019 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.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export const generalTableFootnote = {
-    content: 'paragraph*',
-    attrs: {
-        id: { default: '' },
-        dataTracked: { default: null },
-    },
-    group: 'block',
-    toDOM: () => ['div', { class: 'general-table-footnote' }, 0],
-};

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

@@ -1,25 +0,0 @@
-/*!
- * © 2019 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.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { NodeSpec } from 'prosemirror-model';
-import { ManuscriptNode } from '../types';
-interface Attrs {
-    id: string;
-}
-export interface GeneralTableFootnote extends ManuscriptNode {
-    attrs: Attrs;
-}
-export declare const generalTableFootnote: NodeSpec;
-export {};