@manuscripts/transform 2.3.16-LEAN-3753.0 → 2.3.18-LEAN-3753.0

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

@@ -594,7 +594,7 @@ class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                author_notes: () => ['author-notes', 0],
+                author_notes: () => '',
                 corresp: () => '',
                 title: () => '',
                 affiliations: () => '',

package/dist/cjs/schema/index.js

@@ -150,6 +150,8 @@ __exportStar(require("./nodes/affiliations"), exports);
 __exportStar(require("./nodes/contributors"), exports);
 __exportStar(require("./nodes/supplement"), exports);
 __exportStar(require("./nodes/supplements"), exports);
+__exportStar(require("./nodes/corresp"), exports);
+__exportStar(require("./nodes/author_notes"), exports);
 exports.schema = new prosemirror_model_1.Schema({
     marks: {
         bold: marks_1.bold,

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

@@ -21,7 +21,14 @@ exports.authorNotes = {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    content: '(corresp | footnote | paragraph)+',
+    content: 'section_title (corresp | footnote | paragraph)+',
     group: 'block element',
-    toDOM: () => ['author-notes', 0],
+    toDOM: (node) => [
+        'div',
+        {
+            class: 'author-notes',
+            id: node.attrs.id,
+        },
+        0,
+    ],
 };

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contributors = void 0;
 exports.contributors = {
-    content: 'contributor* author_notes?',
+    content: 'contributor*',
     attrs: {
         id: { default: '' },
     },

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.corresp = void 0;
+exports.isCorrespNode = exports.corresp = void 0;
 exports.corresp = {
     content: 'inline*',
     attrs: {
@@ -9,5 +9,16 @@ exports.corresp = {
         dataTracked: { default: null },
     },
     group: 'block',
-    toDOM: () => ['corresp', 0],
+    toDOM: (node) => {
+        return [
+            'div',
+            {
+                class: 'corresp',
+                id: node.attrs.id,
+            },
+            0,
+        ];
+    },
 };
+const isCorrespNode = (node) => node.type === node.type.schema.nodes.corresp;
+exports.isCorrespNode = isCorrespNode;

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isManuscriptNode = exports.manuscript = void 0;
 exports.manuscript = {
-    content: 'title? contributors? affiliations? keywords? supplements? abstracts body backmatter comments',
+    content: 'title? contributors? affiliations? author_notes? keywords? supplements? abstracts body backmatter comments',
     attrs: {
         id: { default: '' },
         doi: { default: '' },

package/dist/cjs/transformer/decode.js

@@ -63,8 +63,8 @@ const sortSectionsByPriority = (a, b) => a.priority === b.priority ? 0 : Number(
 exports.sortSectionsByPriority = sortSectionsByPriority;
 const getSections = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Section).sort(exports.sortSectionsByPriority);
 const getAffiliations = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Affiliation);
-const getAuthorNotes = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.AuthorNotes);
 const getContributors = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Contributor);
+const getAuthorNotes = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.AuthorNotes);
 const getKeywordElements = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.KeywordsElement);
 const getSupplements = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Supplement);
 const getKeywordGroups = (modelMap) => (0, exports.getModelsByType)(modelMap, json_schema_1.ObjectTypes.KeywordGroup);
@@ -96,15 +96,17 @@ class Decoder {
         const contributors = getContributors(this.modelMap)
             .map((c) => this.decode(c))
             .filter(Boolean);
-        const authorNotes = getAuthorNotes(this.modelMap)
-            .map((authorNote) => this.decode(authorNote))
-            .filter(Boolean);
-        const content = [...contributors, ...authorNotes];
+        const content = [...contributors];
         if (!content.length) {
             return false;
         }
         return schema_1.schema.nodes.contributors.createAndFill({}, content);
     }
+    createAuthorNotesNode() {
+        return getAuthorNotes(this.modelMap)
+            .map((authorNote) => this.decode(authorNote))
+            .filter(Boolean);
+    }
     createKeywordsNode() {
         const elements = getKeywordElements(this.modelMap)
             .map((e) => this.decode(e))
@@ -518,9 +520,12 @@ class Decoder {
             [json_schema_1.ObjectTypes.AuthorNotes]: (data) => {
                 const model = data;
                 const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
-                return schema_1.schema.nodes.author_notes.create({
+                return schema_1.schema.nodes.author_notes.createAndFill({
                     id: model._id,
-                }, content);
+                }, [
+                    schema_1.schema.nodes.section_title.create({}, schema_1.schema.text('Correspondence')),
+                    ...content,
+                ]);
             },
             [json_schema_1.ObjectTypes.Corresponding]: (data) => {
                 const model = data;
@@ -715,6 +720,7 @@ class Decoder {
                 this.createTitleNode(),
                 this.createContributorsNode(),
                 this.createAffiliationsNode(),
+                ...this.createAuthorNotesNode(),
                 this.createKeywordsNode(),
                 this.createSupplementsNode(),
                 ...this.createContentSections(),

package/dist/cjs/transformer/encode.js

@@ -206,6 +206,16 @@ const containedParagraphIDs = (node) => {
     const paragraphNodeType = node.type.schema.nodes.paragraph;
     return containedObjectIDs(node, [paragraphNodeType]);
 };
+const containedAuthorNotesIDs = (node) => {
+    const correspNodeType = node.type.schema.nodes.corresp;
+    const footnoteNodetype = node.type.schema.nodes.footnote;
+    const paragraphNodeType = node.type.schema.nodes.paragraph;
+    return containedObjectIDs(node, [
+        correspNodeType,
+        footnoteNodetype,
+        paragraphNodeType,
+    ]);
+};
 const containedBibliographyItemIDs = (node) => {
     const bibliographyItemNodeType = node.type.schema.nodes.bibliography_item;
     return containedObjectIDs(node, [bibliographyItemNodeType]);
@@ -398,7 +408,7 @@ const encoders = {
         containedObjectIDs: tableElementFooterContainedIDs(node),
     }),
     author_notes: (node) => ({
-        containedObjectIDs: containedObjectIDs(node),
+        containedObjectIDs: containedAuthorNotesIDs(node),
     }),
     footnotes_section: (node, parent, path, priority) => ({
         category: (0, section_category_1.buildSectionCategory)(node),
@@ -559,7 +569,6 @@ exports.modelFromNode = modelFromNode;
 const containerTypes = [
     schema_1.schema.nodes.affiliations,
     schema_1.schema.nodes.contributors,
-    schema_1.schema.nodes.affiliations,
     schema_1.schema.nodes.keywords,
     schema_1.schema.nodes.supplements,
     schema_1.schema.nodes.abstracts,

package/dist/cjs/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = "2.3.16-LEAN-3753.0";
+exports.VERSION = "2.3.18-LEAN-3753.0";

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

@@ -586,7 +586,7 @@ export class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                author_notes: () => ['author-notes', 0],
+                author_notes: () => '',
                 corresp: () => '',
                 title: () => '',
                 affiliations: () => '',

package/dist/es/schema/index.js

@@ -133,6 +133,8 @@ export * from './nodes/affiliations';
 export * from './nodes/contributors';
 export * from './nodes/supplement';
 export * from './nodes/supplements';
+export * from './nodes/corresp';
+export * from './nodes/author_notes';
 export const schema = new Schema({
     marks: {
         bold,

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

@@ -18,7 +18,14 @@ export const authorNotes = {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    content: '(corresp | footnote | paragraph)+',
+    content: 'section_title (corresp | footnote | paragraph)+',
     group: 'block element',
-    toDOM: () => ['author-notes', 0],
+    toDOM: (node) => [
+        'div',
+        {
+            class: 'author-notes',
+            id: node.attrs.id,
+        },
+        0,
+    ],
 };

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const contributors = {
-    content: 'contributor* author_notes?',
+    content: 'contributor*',
     attrs: {
         id: { default: '' },
     },

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

@@ -6,5 +6,15 @@ export const corresp = {
         dataTracked: { default: null },
     },
     group: 'block',
-    toDOM: () => ['corresp', 0],
+    toDOM: (node) => {
+        return [
+            'div',
+            {
+                class: 'corresp',
+                id: node.attrs.id,
+            },
+            0,
+        ];
+    },
 };
+export const isCorrespNode = (node) => node.type === node.type.schema.nodes.corresp;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const manuscript = {
-    content: 'title? contributors? affiliations? keywords? supplements? abstracts body backmatter comments',
+    content: 'title? contributors? affiliations? author_notes? keywords? supplements? abstracts body backmatter comments',
     attrs: {
         id: { default: '' },
         doi: { default: '' },

package/dist/es/transformer/decode.js

@@ -54,8 +54,8 @@ export const getModelsByType = (modelMap, objectType) => {
 export const sortSectionsByPriority = (a, b) => a.priority === b.priority ? 0 : Number(a.priority) - Number(b.priority);
 const getSections = (modelMap) => getModelsByType(modelMap, ObjectTypes.Section).sort(sortSectionsByPriority);
 const getAffiliations = (modelMap) => getModelsByType(modelMap, ObjectTypes.Affiliation);
-const getAuthorNotes = (modelMap) => getModelsByType(modelMap, ObjectTypes.AuthorNotes);
 const getContributors = (modelMap) => getModelsByType(modelMap, ObjectTypes.Contributor);
+const getAuthorNotes = (modelMap) => getModelsByType(modelMap, ObjectTypes.AuthorNotes);
 const getKeywordElements = (modelMap) => getModelsByType(modelMap, ObjectTypes.KeywordsElement);
 const getSupplements = (modelMap) => getModelsByType(modelMap, ObjectTypes.Supplement);
 const getKeywordGroups = (modelMap) => getModelsByType(modelMap, ObjectTypes.KeywordGroup);
@@ -87,15 +87,17 @@ export class Decoder {
         const contributors = getContributors(this.modelMap)
             .map((c) => this.decode(c))
             .filter(Boolean);
-        const authorNotes = getAuthorNotes(this.modelMap)
-            .map((authorNote) => this.decode(authorNote))
-            .filter(Boolean);
-        const content = [...contributors, ...authorNotes];
+        const content = [...contributors];
         if (!content.length) {
             return false;
         }
         return schema.nodes.contributors.createAndFill({}, content);
     }
+    createAuthorNotesNode() {
+        return getAuthorNotes(this.modelMap)
+            .map((authorNote) => this.decode(authorNote))
+            .filter(Boolean);
+    }
     createKeywordsNode() {
         const elements = getKeywordElements(this.modelMap)
             .map((e) => this.decode(e))
@@ -509,9 +511,12 @@ export class Decoder {
             [ObjectTypes.AuthorNotes]: (data) => {
                 const model = data;
                 const content = model.containedObjectIDs.map((id) => this.decode(this.modelMap.get(id)));
-                return schema.nodes.author_notes.create({
+                return schema.nodes.author_notes.createAndFill({
                     id: model._id,
-                }, content);
+                }, [
+                    schema.nodes.section_title.create({}, schema.text('Correspondence')),
+                    ...content,
+                ]);
             },
             [ObjectTypes.Corresponding]: (data) => {
                 const model = data;
@@ -706,6 +711,7 @@ export class Decoder {
                 this.createTitleNode(),
                 this.createContributorsNode(),
                 this.createAffiliationsNode(),
+                ...this.createAuthorNotesNode(),
                 this.createKeywordsNode(),
                 this.createSupplementsNode(),
                 ...this.createContentSections(),

package/dist/es/transformer/encode.js

@@ -198,6 +198,16 @@ const containedParagraphIDs = (node) => {
     const paragraphNodeType = node.type.schema.nodes.paragraph;
     return containedObjectIDs(node, [paragraphNodeType]);
 };
+const containedAuthorNotesIDs = (node) => {
+    const correspNodeType = node.type.schema.nodes.corresp;
+    const footnoteNodetype = node.type.schema.nodes.footnote;
+    const paragraphNodeType = node.type.schema.nodes.paragraph;
+    return containedObjectIDs(node, [
+        correspNodeType,
+        footnoteNodetype,
+        paragraphNodeType,
+    ]);
+};
 const containedBibliographyItemIDs = (node) => {
     const bibliographyItemNodeType = node.type.schema.nodes.bibliography_item;
     return containedObjectIDs(node, [bibliographyItemNodeType]);
@@ -390,7 +400,7 @@ const encoders = {
         containedObjectIDs: tableElementFooterContainedIDs(node),
     }),
     author_notes: (node) => ({
-        containedObjectIDs: containedObjectIDs(node),
+        containedObjectIDs: containedAuthorNotesIDs(node),
     }),
     footnotes_section: (node, parent, path, priority) => ({
         category: buildSectionCategory(node),
@@ -550,7 +560,6 @@ export const modelFromNode = (node, parent, path, priority) => {
 const containerTypes = [
     schema.nodes.affiliations,
     schema.nodes.contributors,
-    schema.nodes.affiliations,
     schema.nodes.keywords,
     schema.nodes.supplements,
     schema.nodes.abstracts,

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.16-LEAN-3753.0";
+export const VERSION = "2.3.18-LEAN-3753.0";

package/dist/types/lib/table-cell-styles.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export declare const TABLE_CELL_STYLES: readonly ["backgroundColor", "border-top", "border-right", "border-bottom", "border-left", "verticalAlign", "textAlign"];
-export type TableCellStyleKey = (typeof TABLE_CELL_STYLES)[number];
+export type TableCellStyleKey = typeof TABLE_CELL_STYLES[number];
 export declare const serializeTableCellStyles: (styles: {
     backgroundColor?: string | null | undefined;
     "border-top"?: string | null | undefined;

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

@@ -71,4 +71,6 @@ export * from './nodes/affiliations';
 export * from './nodes/contributors';
 export * from './nodes/supplement';
 export * from './nodes/supplements';
+export * from './nodes/corresp';
+export * from './nodes/author_notes';
 export declare const schema: Schema<Nodes, Marks>;

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

@@ -8,4 +8,5 @@ export interface CorrespNode extends ManuscriptNode {
     attrs: Attrs;
 }
 export declare const corresp: NodeSpec;
+export declare const isCorrespNode: (node: ManuscriptNode) => node is CorrespNode;
 export {};

package/dist/types/transformer/decode.d.ts

@@ -27,6 +27,7 @@ export declare class Decoder {
     private createTitleNode;
     private createAffiliationsNode;
     private createContributorsNode;
+    private createAuthorNotesNode;
     private createKeywordsNode;
     private createSupplementsNode;
     private createCommentsNode;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.3.16-LEAN-3753.0";
+export declare const VERSION = "2.3.18-LEAN-3753.0";

package/package.json

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