@manuscripts/transform 2.1.0 → 2.1.1-LEAN-3336-0

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

@@ -568,7 +568,7 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_cell',
+        node: 'table_header',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');

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

@@ -614,6 +614,11 @@ class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
+                table_header: (node) => [
+                    node.attrs.celltype,
+                    Object.assign(Object.assign({ valign: node.attrs.valign, align: node.attrs.align, scope: node.attrs.scope, style: node.attrs.style }, (node.attrs.rowspan > 1 && { rowspan: node.attrs.rowspan })), (node.attrs.colspan > 1 && { colspan: node.attrs.colspan })),
+                    0,
+                ],
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',

package/dist/cjs/schema/index.js

@@ -230,5 +230,6 @@ exports.schema = new prosemirror_model_1.Schema({
         contributors: contributors_1.contributors,
         supplements: supplements_1.supplements,
         supplement: supplement_1.supplement,
+        table_header: table_row_1.tableHeader,
     },
 });

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAffiliationNode = exports.affiliation = void 0;
 exports.affiliation = {
+    content: 'inline*',
     attrs: {
         id: { default: '' },
         institution: { default: '' },
@@ -11,6 +12,8 @@ exports.affiliation = {
         addressLine3: { default: '' },
         postCode: { default: '' },
         country: { default: '' },
+        county: { default: '' },
+        city: { default: '' },
         priority: { default: undefined },
         email: {
             default: {
@@ -20,7 +23,7 @@ exports.affiliation = {
         },
         dataTracked: { default: null },
     },
-    group: 'block element',
+    group: 'block',
     parseDOM: [
         {
             tag: 'div.affiliation',

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

@@ -6,6 +6,7 @@ exports.contributor = {
     attrs: {
         id: { default: '' },
         role: { default: '' },
+        email: { default: '' },
         affiliations: { default: [] },
         footnote: { default: undefined },
         corresp: { default: undefined },
@@ -13,12 +14,13 @@ exports.contributor = {
         userID: { default: undefined },
         invitationID: { default: undefined },
         isCorresponding: { default: undefined },
+        isJointContributor: { default: undefined },
         ORCIDIdentifier: { default: undefined },
         priority: { default: undefined },
         dataTracked: { default: null },
         contents: { default: '' },
     },
-    group: 'block element',
+    group: 'block',
     toDOM: (node) => {
         const contributorNode = node;
         return [

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableCell = exports.tableRow = void 0;
+exports.tableHeader = exports.tableCell = exports.tableRow = void 0;
 const table_cell_styles_1 = require("../../lib/table-cell-styles");
 const getCellAttrs = (p) => {
     const dom = p;
@@ -43,7 +43,7 @@ const getCellAttrs = (p) => {
     };
 };
 exports.tableRow = {
-    content: 'table_cell+',
+    content: '(table_cell | table_header)*',
     tableRole: 'row',
     attrs: {
         placeholder: { default: '' },
@@ -79,10 +79,62 @@ exports.tableCell = {
     },
     tableRole: 'cell',
     isolating: true,
-    parseDOM: [
-        { tag: 'td', getAttrs: getCellAttrs },
-        { tag: 'th', getAttrs: getCellAttrs },
-    ],
+    parseDOM: [{ tag: 'td', getAttrs: getCellAttrs }],
+    toDOM: (node) => {
+        const tableCellNode = node;
+        const attrs = {};
+        const tag = tableCellNode.attrs.celltype;
+        if (tableCellNode.attrs.colspan && tableCellNode.attrs.colspan !== 1) {
+            attrs.colspan = String(tableCellNode.attrs.colspan);
+        }
+        if (tableCellNode.attrs.rowspan && tableCellNode.attrs.rowspan !== 1) {
+            attrs.rowspan = String(tableCellNode.attrs.rowspan);
+        }
+        if (tableCellNode.attrs.colwidth) {
+            attrs['data-colwidth'] = tableCellNode.attrs.colwidth.join(',');
+        }
+        if (tableCellNode.attrs.placeholder) {
+            attrs['data-placeholder-text'] = tableCellNode.attrs.placeholder;
+        }
+        if (!tableCellNode.textContent) {
+            attrs.class = 'placeholder';
+        }
+        const styleString = (0, table_cell_styles_1.serializeTableCellStyles)(tableCellNode.attrs.styles);
+        if (styleString) {
+            attrs.style = styleString;
+        }
+        if (tableCellNode.attrs.valign) {
+            attrs.valign = tableCellNode.attrs.valign;
+        }
+        if (tableCellNode.attrs.align) {
+            attrs.align = tableCellNode.attrs.align;
+        }
+        if (tableCellNode.attrs.scope) {
+            attrs.scope = tableCellNode.attrs.scope;
+        }
+        if (tableCellNode.attrs.style) {
+            attrs.style = tableCellNode.attrs.style;
+        }
+        return [tag, attrs, 0];
+    },
+};
+exports.tableHeader = {
+    content: 'inline*',
+    attrs: {
+        celltype: { default: 'th' },
+        colspan: { default: 1 },
+        rowspan: { default: 1 },
+        colwidth: { default: null },
+        placeholder: { default: 'Data' },
+        styles: { default: {} },
+        valign: { default: null },
+        align: { default: null },
+        scope: { default: null },
+        style: { default: null },
+    },
+    tableRole: 'header_cell',
+    isolating: true,
+    parseDOM: [{ tag: 'th', getAttrs: getCellAttrs }],
     toDOM: (node) => {
         const tableCellNode = node;
         const attrs = {};

package/dist/cjs/transformer/decode.js

@@ -567,6 +567,7 @@ class Decoder {
                 });
             },
             [json_schema_1.ObjectTypes.TableElement]: (data) => {
+                console.log('tableElement');
                 const model = data;
                 const table = this.createTable(model);
                 const tableElementFooter = this.createTableElementFooter(model);
@@ -628,6 +629,8 @@ class Decoder {
                     addressLine3: model.addressLine3,
                     postCode: model.postCode,
                     country: model.country,
+                    county: model.county,
+                    city: model.city,
                     email: model.email,
                     department: model.department,
                     priority: model.priority,
@@ -639,6 +642,8 @@ class Decoder {
                     id: model._id,
                     role: model.role,
                     affiliations: model.affiliations,
+                    email: model.email,
+                    isJointContributor: model.isJointContributor,
                     bibliographicName: model.bibliographicName,
                     userID: model.userID,
                     invitationID: model.invitationID,

package/dist/cjs/transformer/encode.js

@@ -508,8 +508,11 @@ const encoders = {
         addressLine1: node.attrs.addressLine1,
         addressLine2: node.attrs.addressLine2,
         addressLine3: node.attrs.addressLine3,
+        department: node.attrs.department,
         postCode: node.attrs.postCode,
         country: node.attrs.country,
+        county: node.attrs.county,
+        city: node.attrs.city,
         email: node.attrs.email,
         priority: node.attrs.priority,
     }),
@@ -520,6 +523,7 @@ const encoders = {
         userID: node.attrs.userID,
         invitationID: node.attrs.invitationID,
         isCorresponding: node.attrs.isCorresponding,
+        isJointContributor: node.attrs.isJointContributor,
         ORCIDIdentifier: node.attrs.ORCIDIdentifier,
         footnote: node.attrs.footnote,
         corresp: node.attrs.corresp,
@@ -571,6 +575,7 @@ const placeholderTypes = [
 ];
 const encode = (node) => {
     const models = new Map();
+    console.log('encoding...');
     const priority = {
         value: 1,
     };

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

@@ -562,7 +562,7 @@ const nodes = [
     },
     {
         tag: 'th',
-        node: 'table_cell',
+        node: 'table_header',
         getAttrs: (node) => {
             const element = node;
             const colspan = element.getAttribute('colspan');

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

@@ -606,6 +606,11 @@ export class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
+                table_header: (node) => [
+                    node.attrs.celltype,
+                    Object.assign(Object.assign({ valign: node.attrs.valign, align: node.attrs.align, scope: node.attrs.scope, style: node.attrs.style }, (node.attrs.rowspan > 1 && { rowspan: node.attrs.rowspan })), (node.attrs.colspan > 1 && { colspan: node.attrs.colspan })),
+                    0,
+                ],
                 title: () => '',
                 affiliations: () => '',
                 contributors: () => '',

package/dist/es/schema/index.js

@@ -70,7 +70,7 @@ import { table, tableBody } from './nodes/table';
 import { tableCol, tableColGroup } from './nodes/table_col';
 import { tableElement } from './nodes/table_element';
 import { tableElementFooter } from './nodes/table_element_footer';
-import { tableCell, tableRow } from './nodes/table_row';
+import { tableCell, tableHeader, tableRow } from './nodes/table_row';
 import { text } from './nodes/text';
 import { title } from './nodes/title';
 import { tocElement } from './nodes/toc_element';
@@ -213,5 +213,6 @@ export const schema = new Schema({
         contributors,
         supplements,
         supplement,
+        table_header: tableHeader,
     },
 });

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

@@ -1,4 +1,5 @@
 export const affiliation = {
+    content: 'inline*',
     attrs: {
         id: { default: '' },
         institution: { default: '' },
@@ -8,6 +9,8 @@ export const affiliation = {
         addressLine3: { default: '' },
         postCode: { default: '' },
         country: { default: '' },
+        county: { default: '' },
+        city: { default: '' },
         priority: { default: undefined },
         email: {
             default: {
@@ -17,7 +20,7 @@ export const affiliation = {
         },
         dataTracked: { default: null },
     },
-    group: 'block element',
+    group: 'block',
     parseDOM: [
         {
             tag: 'div.affiliation',

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

@@ -3,6 +3,7 @@ export const contributor = {
     attrs: {
         id: { default: '' },
         role: { default: '' },
+        email: { default: '' },
         affiliations: { default: [] },
         footnote: { default: undefined },
         corresp: { default: undefined },
@@ -10,12 +11,13 @@ export const contributor = {
         userID: { default: undefined },
         invitationID: { default: undefined },
         isCorresponding: { default: undefined },
+        isJointContributor: { default: undefined },
         ORCIDIdentifier: { default: undefined },
         priority: { default: undefined },
         dataTracked: { default: null },
         contents: { default: '' },
     },
-    group: 'block element',
+    group: 'block',
     toDOM: (node) => {
         const contributorNode = node;
         return [

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

@@ -40,7 +40,7 @@ const getCellAttrs = (p) => {
     };
 };
 export const tableRow = {
-    content: 'table_cell+',
+    content: '(table_cell | table_header)*',
     tableRole: 'row',
     attrs: {
         placeholder: { default: '' },
@@ -76,10 +76,62 @@ export const tableCell = {
     },
     tableRole: 'cell',
     isolating: true,
-    parseDOM: [
-        { tag: 'td', getAttrs: getCellAttrs },
-        { tag: 'th', getAttrs: getCellAttrs },
-    ],
+    parseDOM: [{ tag: 'td', getAttrs: getCellAttrs }],
+    toDOM: (node) => {
+        const tableCellNode = node;
+        const attrs = {};
+        const tag = tableCellNode.attrs.celltype;
+        if (tableCellNode.attrs.colspan && tableCellNode.attrs.colspan !== 1) {
+            attrs.colspan = String(tableCellNode.attrs.colspan);
+        }
+        if (tableCellNode.attrs.rowspan && tableCellNode.attrs.rowspan !== 1) {
+            attrs.rowspan = String(tableCellNode.attrs.rowspan);
+        }
+        if (tableCellNode.attrs.colwidth) {
+            attrs['data-colwidth'] = tableCellNode.attrs.colwidth.join(',');
+        }
+        if (tableCellNode.attrs.placeholder) {
+            attrs['data-placeholder-text'] = tableCellNode.attrs.placeholder;
+        }
+        if (!tableCellNode.textContent) {
+            attrs.class = 'placeholder';
+        }
+        const styleString = serializeTableCellStyles(tableCellNode.attrs.styles);
+        if (styleString) {
+            attrs.style = styleString;
+        }
+        if (tableCellNode.attrs.valign) {
+            attrs.valign = tableCellNode.attrs.valign;
+        }
+        if (tableCellNode.attrs.align) {
+            attrs.align = tableCellNode.attrs.align;
+        }
+        if (tableCellNode.attrs.scope) {
+            attrs.scope = tableCellNode.attrs.scope;
+        }
+        if (tableCellNode.attrs.style) {
+            attrs.style = tableCellNode.attrs.style;
+        }
+        return [tag, attrs, 0];
+    },
+};
+export const tableHeader = {
+    content: 'inline*',
+    attrs: {
+        celltype: { default: 'th' },
+        colspan: { default: 1 },
+        rowspan: { default: 1 },
+        colwidth: { default: null },
+        placeholder: { default: 'Data' },
+        styles: { default: {} },
+        valign: { default: null },
+        align: { default: null },
+        scope: { default: null },
+        style: { default: null },
+    },
+    tableRole: 'header_cell',
+    isolating: true,
+    parseDOM: [{ tag: 'th', getAttrs: getCellAttrs }],
     toDOM: (node) => {
         const tableCellNode = node;
         const attrs = {};

package/dist/es/transformer/decode.js

@@ -558,6 +558,7 @@ export class Decoder {
                 });
             },
             [ObjectTypes.TableElement]: (data) => {
+                console.log('tableElement');
                 const model = data;
                 const table = this.createTable(model);
                 const tableElementFooter = this.createTableElementFooter(model);
@@ -619,6 +620,8 @@ export class Decoder {
                     addressLine3: model.addressLine3,
                     postCode: model.postCode,
                     country: model.country,
+                    county: model.county,
+                    city: model.city,
                     email: model.email,
                     department: model.department,
                     priority: model.priority,
@@ -630,6 +633,8 @@ export class Decoder {
                     id: model._id,
                     role: model.role,
                     affiliations: model.affiliations,
+                    email: model.email,
+                    isJointContributor: model.isJointContributor,
                     bibliographicName: model.bibliographicName,
                     userID: model.userID,
                     invitationID: model.invitationID,

package/dist/es/transformer/encode.js

@@ -500,8 +500,11 @@ const encoders = {
         addressLine1: node.attrs.addressLine1,
         addressLine2: node.attrs.addressLine2,
         addressLine3: node.attrs.addressLine3,
+        department: node.attrs.department,
         postCode: node.attrs.postCode,
         country: node.attrs.country,
+        county: node.attrs.county,
+        city: node.attrs.city,
         email: node.attrs.email,
         priority: node.attrs.priority,
     }),
@@ -512,6 +515,7 @@ const encoders = {
         userID: node.attrs.userID,
         invitationID: node.attrs.invitationID,
         isCorresponding: node.attrs.isCorresponding,
+        isJointContributor: node.attrs.isJointContributor,
         ORCIDIdentifier: node.attrs.ORCIDIdentifier,
         footnote: node.attrs.footnote,
         corresp: node.attrs.corresp,
@@ -562,6 +566,7 @@ const placeholderTypes = [
 ];
 export const encode = (node) => {
     const models = new Map();
+    console.log('encoding...');
     const priority = {
         value: 1,
     };

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

@@ -13,6 +13,8 @@ interface Attrs {
     addressLine3: string;
     postCode: string;
     country: string;
+    county: string;
+    city: string;
     email: Email;
     priority: number;
 }

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

@@ -1,16 +1,18 @@
-import { Affiliation, BibliographicName } from '@manuscripts/json-schema';
+import { BibliographicName } from '@manuscripts/json-schema';
 import { NodeSpec } from 'prosemirror-model';
 import { ManuscriptNode } from '../types';
 interface Attrs {
     id: string;
     role: string;
-    affiliations: Affiliation[];
+    affiliations: string[];
     bibliographicName: BibliographicName;
     userID: string;
+    email: string;
     invitationID: string;
     isCorresponding: boolean;
     ORCIDIdentifier: string;
     priority: number;
+    isJointContributor: boolean;
 }
 export interface ContributorNode extends ManuscriptNode {
     attrs: Attrs;

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

@@ -39,3 +39,4 @@ export interface TableCellNode extends ManuscriptNode {
     };
 }
 export declare const tableCell: TableNodeSpec;
+export declare const tableHeader: TableNodeSpec;

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_body' | 'table_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'contributor' | 'table_element_footer' | 'title' | 'affiliations' | 'contributors' | 'supplements' | 'supplement';
+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_body' | 'table_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'contributor' | 'table_element_footer' | 'title' | 'affiliations' | 'contributors' | 'supplements' | 'supplement' | 'table_header';
 export type ManuscriptSchema = Schema<Nodes, Marks>;
 export type ManuscriptEditorState = EditorState;
 export type ManuscriptEditorView = EditorView;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.1.0",
+  "version": "2.1.1-LEAN-3336-0",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -78,4 +78,4 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.0.5"
   }
-}
+}