@manuscripts/transform 1.5.4 → 1.5.6

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

@@ -18,9 +18,30 @@ exports.affiliation = {
                 text: undefined,
             },
         },
+        dataTracked: { default: null },
     },
     group: 'block element',
-    toDOM: () => ['span'],
+    parseDOM: [
+        {
+            tag: 'div.affiliation',
+            getAttrs: (node) => {
+                const dom = node;
+                return {
+                    id: dom.getAttribute('id'),
+                };
+            },
+        },
+    ],
+    toDOM: (node) => {
+        const affiliationNode = node;
+        return [
+            'div',
+            {
+                class: 'affiliation',
+                id: affiliationNode.attrs.id,
+            },
+        ];
+    },
 };
 const isAffiliationNode = (node) => node.type === node.type.schema.nodes.affiliation;
 exports.isAffiliationNode = isAffiliationNode;

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

@@ -4,12 +4,33 @@ exports.isAffiliationsSectionNode = exports.affiliationsSection = void 0;
 exports.affiliationsSection = {
     content: 'section_title? affiliation*',
     attrs: {
-        id: { default: '' },
+        id: { default: 'META_SECTION_AFFILLIATIONS' },
         dataTracked: { default: null },
     },
     group: 'block sections',
     selectable: false,
-    toDOM: () => ['section', 0],
+    parseDOM: [
+        {
+            tag: 'section.affiliations',
+            getAttrs: (section) => {
+                const dom = section;
+                return {
+                    contents: dom.innerHTML,
+                };
+            },
+        },
+    ],
+    toDOM: (node) => {
+        const affiliationsSectionNode = node;
+        return [
+            'section',
+            {
+                class: 'affiliations',
+                id: affiliationsSectionNode.attrs.id,
+            },
+            0
+        ];
+    },
 };
 const isAffiliationsSectionNode = (node) => node.type === node.type.schema.nodes.affiliations_section;
 exports.isAffiliationsSectionNode = isAffiliationsSectionNode;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isContributorNode = exports.contributor = void 0;
 exports.contributor = {
+    content: 'inline*',
     attrs: {
         id: { default: '' },
         role: { default: '' },
@@ -14,9 +15,20 @@ exports.contributor = {
         isCorresponding: { default: undefined },
         ORCIDIdentifier: { default: undefined },
         priority: { default: undefined },
+        dataTracked: { default: null },
+        contents: { default: '' },
     },
     group: 'block element',
-    toDOM: () => ['span'],
+    toDOM: (node) => {
+        const contributorNode = node;
+        return [
+            'div',
+            {
+                class: 'contributor',
+                id: contributorNode.attrs.id,
+            },
+        ];
+    },
 };
 const isContributorNode = (node) => node.type === node.type.schema.nodes.contributor;
 exports.isContributorNode = isContributorNode;

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

@@ -0,0 +1,49 @@
+"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.contributorsElement = void 0;
+exports.contributorsElement = {
+    content: 'contributor*',
+    attrs: {
+        id: { default: '' },
+        contents: { default: '' },
+        dataTracked: { default: null },
+    },
+    group: 'block element',
+    selectable: false,
+    parseDOM: [
+        {
+            tag: 'div.manuscript-contributors',
+            getAttrs: () => {
+                return {
+                    contents: '',
+                };
+            },
+        },
+    ],
+    toDOM: (node) => {
+        const contributorsElementNode = node;
+        return [
+            'div',
+            {
+                class: 'manuscript-contributors',
+                id: contributorsElementNode.attrs.id,
+            },
+            0,
+        ];
+    },
+};

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

@@ -4,12 +4,33 @@ exports.isContributorsSectionNode = exports.contributorsSection = void 0;
 exports.contributorsSection = {
     content: 'section_title? contributor*',
     attrs: {
-        id: { default: '' },
+        id: { default: 'META_SECTION_CONTRIBUTORS' },
         dataTracked: { default: null },
+        contents: { default: '' },
     },
     group: 'block sections',
     selectable: false,
-    toDOM: () => ['section', 0],
+    parseDOM: [
+        {
+            tag: 'section.contributors',
+            getAttrs: () => {
+                return {
+                    contents: '',
+                };
+            },
+        },
+    ],
+    toDOM: (node) => {
+        const contributorsSectionNode = node;
+        return [
+            'section',
+            {
+                class: 'contributors',
+                id: contributorsSectionNode.attrs.id,
+            },
+            0,
+        ];
+    },
 };
 const isContributorsSectionNode = (node) => node.type === node.type.schema.nodes.contributors_section;
 exports.isContributorsSectionNode = isContributorsSectionNode;

package/dist/cjs/transformer/decode.js

@@ -617,7 +617,7 @@ class Decoder {
                     email: model.email,
                     department: model.department,
                     priority: model.priority,
-                });
+                }, schema_1.schema.text('_'));
             },
             [json_schema_1.ObjectTypes.Contributor]: (data) => {
                 const model = data;
@@ -633,7 +633,7 @@ class Decoder {
                     footnote: model.footnote,
                     corresp: model.corresp,
                     priority: model.priority,
-                });
+                }, schema_1.schema.text('_'));
             },
         };
         this.decode = (model) => {

package/dist/cjs/transformer/encode.js

@@ -573,7 +573,8 @@ const modelFromNode = (node, parent, path, priority) => {
     if ((0, highlight_markers_1.isHighlightableModel)(model)) {
         (0, highlight_markers_1.extractHighlightMarkers)(model, commentAnnotationsMap);
     }
-    return { model, commentAnnotationsMap };
+    const comments = [...commentAnnotationsMap.values()];
+    return { model, comments };
 };
 exports.modelFromNode = modelFromNode;
 const encode = (node) => {
@@ -595,10 +596,18 @@ const encode = (node) => {
         if (placeholders.includes(child.type.name)) {
             return;
         }
-        const { model } = (0, exports.modelFromNode)(child, parent, path, priority);
+        const { model, comments } = (0, exports.modelFromNode)(child, parent, path, priority);
         if (models.has(model._id)) {
             throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
         }
+        comments.forEach((comment) => {
+            const proseMirrorComment = models.get(comment._id);
+            if (proseMirrorComment) {
+                ;
+                proseMirrorComment.selector = comment.selector;
+                models.set(comment._id, proseMirrorComment);
+            }
+        });
         models.set(model._id, model);
         child.forEach(addModel(path.concat(child.attrs.id), child));
     };

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

@@ -15,8 +15,29 @@ export const affiliation = {
                 text: undefined,
             },
         },
+        dataTracked: { default: null },
     },
     group: 'block element',
-    toDOM: () => ['span'],
+    parseDOM: [
+        {
+            tag: 'div.affiliation',
+            getAttrs: (node) => {
+                const dom = node;
+                return {
+                    id: dom.getAttribute('id'),
+                };
+            },
+        },
+    ],
+    toDOM: (node) => {
+        const affiliationNode = node;
+        return [
+            'div',
+            {
+                class: 'affiliation',
+                id: affiliationNode.attrs.id,
+            },
+        ];
+    },
 };
 export const isAffiliationNode = (node) => node.type === node.type.schema.nodes.affiliation;

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

@@ -1,11 +1,32 @@
 export const affiliationsSection = {
     content: 'section_title? affiliation*',
     attrs: {
-        id: { default: '' },
+        id: { default: 'META_SECTION_AFFILLIATIONS' },
         dataTracked: { default: null },
     },
     group: 'block sections',
     selectable: false,
-    toDOM: () => ['section', 0],
+    parseDOM: [
+        {
+            tag: 'section.affiliations',
+            getAttrs: (section) => {
+                const dom = section;
+                return {
+                    contents: dom.innerHTML,
+                };
+            },
+        },
+    ],
+    toDOM: (node) => {
+        const affiliationsSectionNode = node;
+        return [
+            'section',
+            {
+                class: 'affiliations',
+                id: affiliationsSectionNode.attrs.id,
+            },
+            0
+        ];
+    },
 };
 export const isAffiliationsSectionNode = (node) => node.type === node.type.schema.nodes.affiliations_section;

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

@@ -1,4 +1,5 @@
 export const contributor = {
+    content: 'inline*',
     attrs: {
         id: { default: '' },
         role: { default: '' },
@@ -11,8 +12,19 @@ export const contributor = {
         isCorresponding: { default: undefined },
         ORCIDIdentifier: { default: undefined },
         priority: { default: undefined },
+        dataTracked: { default: null },
+        contents: { default: '' },
     },
     group: 'block element',
-    toDOM: () => ['span'],
+    toDOM: (node) => {
+        const contributorNode = node;
+        return [
+            'div',
+            {
+                class: 'contributor',
+                id: contributorNode.attrs.id,
+            },
+        ];
+    },
 };
 export const isContributorNode = (node) => node.type === node.type.schema.nodes.contributor;

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

@@ -0,0 +1,46 @@
+/*!
+ * © 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 contributorsElement = {
+    content: 'contributor*',
+    attrs: {
+        id: { default: '' },
+        contents: { default: '' },
+        dataTracked: { default: null },
+    },
+    group: 'block element',
+    selectable: false,
+    parseDOM: [
+        {
+            tag: 'div.manuscript-contributors',
+            getAttrs: () => {
+                return {
+                    contents: '',
+                };
+            },
+        },
+    ],
+    toDOM: (node) => {
+        const contributorsElementNode = node;
+        return [
+            'div',
+            {
+                class: 'manuscript-contributors',
+                id: contributorsElementNode.attrs.id,
+            },
+            0,
+        ];
+    },
+};

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

@@ -1,11 +1,32 @@
 export const contributorsSection = {
     content: 'section_title? contributor*',
     attrs: {
-        id: { default: '' },
+        id: { default: 'META_SECTION_CONTRIBUTORS' },
         dataTracked: { default: null },
+        contents: { default: '' },
     },
     group: 'block sections',
     selectable: false,
-    toDOM: () => ['section', 0],
+    parseDOM: [
+        {
+            tag: 'section.contributors',
+            getAttrs: () => {
+                return {
+                    contents: '',
+                };
+            },
+        },
+    ],
+    toDOM: (node) => {
+        const contributorsSectionNode = node;
+        return [
+            'section',
+            {
+                class: 'contributors',
+                id: contributorsSectionNode.attrs.id,
+            },
+            0,
+        ];
+    },
 };
 export const isContributorsSectionNode = (node) => node.type === node.type.schema.nodes.contributors_section;

package/dist/es/transformer/decode.js

@@ -607,7 +607,7 @@ export class Decoder {
                     email: model.email,
                     department: model.department,
                     priority: model.priority,
-                });
+                }, schema.text('_'));
             },
             [ObjectTypes.Contributor]: (data) => {
                 const model = data;
@@ -623,7 +623,7 @@ export class Decoder {
                     footnote: model.footnote,
                     corresp: model.corresp,
                     priority: model.priority,
-                });
+                }, schema.text('_'));
             },
         };
         this.decode = (model) => {

package/dist/es/transformer/encode.js

@@ -565,7 +565,8 @@ export const modelFromNode = (node, parent, path, priority) => {
     if (isHighlightableModel(model)) {
         extractHighlightMarkers(model, commentAnnotationsMap);
     }
-    return { model, commentAnnotationsMap };
+    const comments = [...commentAnnotationsMap.values()];
+    return { model, comments };
 };
 export const encode = (node) => {
     const models = new Map();
@@ -586,10 +587,18 @@ export const encode = (node) => {
         if (placeholders.includes(child.type.name)) {
             return;
         }
-        const { model } = modelFromNode(child, parent, path, priority);
+        const { model, comments } = modelFromNode(child, parent, path, priority);
         if (models.has(model._id)) {
             throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
         }
+        comments.forEach((comment) => {
+            const proseMirrorComment = models.get(comment._id);
+            if (proseMirrorComment) {
+                ;
+                proseMirrorComment.selector = comment.selector;
+                models.set(comment._id, proseMirrorComment);
+            }
+        });
         models.set(model._id, model);
         child.forEach(addModel(path.concat(child.attrs.id), child));
     };

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

@@ -0,0 +1,27 @@
+/*!
+ * © 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 {
+    contents: string;
+    id: string;
+    paragraphStyle?: string;
+}
+export interface ContributorsElementNode extends ManuscriptNode {
+    attrs: Attrs;
+}
+export declare const contributorsElement: NodeSpec;
+export {};

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

@@ -2,6 +2,7 @@ import { NodeSpec } from 'prosemirror-model';
 import { ManuscriptNode } from '../types';
 interface Attrs {
     id: string;
+    contents: string;
 }
 export interface ContributorsSectionNode extends ManuscriptNode {
     attrs: Attrs;

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

@@ -20,7 +20,7 @@ export declare const inlineContents: (node: ManuscriptNode) => string;
 export declare const inlineText: (node: ManuscriptNode) => string;
 export declare const modelFromNode: (node: ManuscriptNode, parent: ManuscriptNode, path: string[], priority: PrioritizedValue) => {
     model: Model;
-    commentAnnotationsMap: Map<string, Build<CommentAnnotation>>;
+    comments: Build<CommentAnnotation>[];
 };
 interface PrioritizedValue {
     value: number;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -82,4 +82,4 @@
     "prosemirror-state": "^1.4.2",
     "prosemirror-view": "^1.29.1"
   }
-}
+}