@manuscripts/transform 1.5.3 → 1.5.4-LEAN-3030

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

@@ -501,7 +501,7 @@ const nodes = [
     },
     {
         tag: 'sec[sec-type="affiliations"]',
-        node: 'affiliations_section',
+        node: 'affiliations',
         getAttrs: (node) => {
             const element = node;
             return {
@@ -513,7 +513,7 @@ const nodes = [
     {
         tag: 'aff',
         node: 'affiliation',
-        context: 'affiliations_section/',
+        context: 'affiliations/',
         getAttrs: (node) => {
             const element = node;
             const aff = {
@@ -560,7 +560,7 @@ const nodes = [
     },
     {
         tag: 'sec[sec-type="contributors"]',
-        node: 'contributors_section',
+        node: 'contributors',
         getAttrs: (node) => {
             const element = node;
             return {
@@ -572,7 +572,7 @@ const nodes = [
     {
         tag: 'contrib',
         node: 'contributor',
-        context: 'contributors_section/',
+        context: 'contributors/',
         getAttrs: (node) => {
             const element = node;
             const contrib = {
@@ -627,19 +627,19 @@ const nodes = [
     },
     {
         tag: 'sec[sec-type="keywords"]',
-        node: 'keywords_section',
-        getAttrs: (node) => {
-            const element = node;
-            return {
-                id: element.getAttribute('id'),
-                category: chooseSectionCategory(element),
-            };
-        },
+        node: 'keywords',
     },
     {
-        tag: 'kwd-group-list',
-        context: 'keywords_section/',
-        node: 'keywords_element',
+        tag: 'sec[sec-type="abstracts"]',
+        node: 'abstracts',
+    },
+    {
+        tag: 'sec[sec-type="body"]',
+        node: 'body',
+    },
+    {
+        tag: 'sec[sec-type="backmatter"]',
+        node: 'backmatter',
     },
     {
         tag: 'sec',
@@ -652,10 +652,15 @@ const nodes = [
             };
         },
     },
+    {
+        tag: 'kwd-group-list',
+        context: 'keywords/',
+        node: 'keywords_element',
+    },
     {
         tag: 'kwd-group',
         context: 'keywords_element/',
-        node: 'keywords_group',
+        node: 'keyword_group',
         getAttrs: (node) => {
             const element = node;
             return {
@@ -665,7 +670,7 @@ const nodes = [
     },
     {
         tag: 'kwd',
-        context: 'keywords_group//',
+        context: 'keyword_group//',
         node: 'keyword',
     },
     {
@@ -720,7 +725,7 @@ const nodes = [
     {
         tag: 'title',
         node: 'section_title',
-        context: 'section/|footnotes_section/|bibliography_section/|keywords_section/',
+        context: 'section/|footnotes_section/|bibliography_section/|keywords/',
     },
     {
         tag: 'title',

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

@@ -377,9 +377,9 @@ export const jatsBodyTransformations = {
             const title = createElement('title');
             title.textContent = 'Keywords';
             section.append(title);
-            const kwdGroupsEl = createElement('kwd-group-list');
-            kwdGroupsEl.append(keywordGroups[0]);
-            section.append(kwdGroupsEl);
+            const keywordsElement = createElement('kwd-group-list');
+            keywordsElement.append(keywordGroups[0]);
+            section.append(keywordsElement);
             body.prepend(section);
         }
     },

package/dist/es/jats/importer/parse-jats-article.js

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { ObjectTypes, } from '@manuscripts/json-schema';
 import { DOMParser } from 'prosemirror-model';
 import { InvalidInput } from '../../errors';
 import { nodeFromHTML } from '../../lib/html';
@@ -48,9 +49,16 @@ export const parseJATSFront = async (front) => {
     const title = (_a = articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelector('title-group > article-title')) === null || _a === void 0 ? void 0 : _a.innerHTML;
     const subtitle = (_b = articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelector('title-group > subtitle')) === null || _b === void 0 ? void 0 : _b.innerHTML;
     const runningTitle = (_c = articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelector('title-group > alt-title[alt-title-type="right-running"]')) === null || _c === void 0 ? void 0 : _c.innerHTML;
-    const manuscriptMeta = Object.assign({ title: title ? inlineContentsFromJATSTitle(title) : undefined, subtitle: subtitle ? inlineContentsFromJATSTitle(subtitle) : undefined, runningTitle: runningTitle
+    const manuscriptMeta = Object.assign({}, jatsFrontParser.parseCounts(articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelector('counts')));
+    const titles = {
+        objectType: ObjectTypes.Titles,
+        _id: generateID(ObjectTypes.Titles),
+        title: title ? inlineContentsFromJATSTitle(title) : undefined,
+        subtitle: subtitle ? inlineContentsFromJATSTitle(subtitle) : undefined,
+        runningTitle: runningTitle
             ? inlineContentsFromJATSTitle(runningTitle)
-            : undefined }, jatsFrontParser.parseCounts(articleMeta === null || articleMeta === void 0 ? void 0 : articleMeta.querySelector('counts')));
+            : undefined,
+    };
     const { affiliations, affiliationIDs } = jatsFrontParser.parseAffiliationNodes([
         ...front.querySelectorAll('article-meta > contrib-group > aff'),
     ]);
@@ -70,6 +78,7 @@ export const parseJATSFront = async (front) => {
     const manuscript = Object.assign(Object.assign(Object.assign({}, buildManuscript()), manuscriptMeta), history);
     return {
         models: generateModelIDs([
+            titles,
             manuscript,
             ...footnotes,
             ...correspondingList,

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

@@ -25,7 +25,7 @@ import { generateAttachmentFilename } from '../transformer/filename';
 import { buildTargets } from '../transformer/labels';
 import { isExecutableNodeType, isNodeType } from '../transformer/node-types';
 import { hasObjectType } from '../transformer/object-types';
-import { findManuscript, findManuscriptById, } from '../transformer/project-bundle';
+import { findManuscript, findManuscriptById, findTitles, } from '../transformer/project-bundle';
 import { chooseJatsFnType, chooseSecType, } from '../transformer/section-category';
 import { selectVersionIds } from './jats-versions';
 const warn = debug('manuscripts-transform');
@@ -231,6 +231,7 @@ export class JATSExporter {
         this.buildFront = (doi, id, links) => {
             var _a, _b, _c, _d;
             const manuscript = findManuscript(this.modelMap);
+            const titles = findTitles(this.modelMap);
             const front = this.document.createElement('front');
             const journalMeta = this.document.createElement('journal-meta');
             front.appendChild(journalMeta);
@@ -308,20 +309,20 @@ export class JATSExporter {
                     articleMeta.appendChild(link);
                 }
             }
-            if (manuscript.title) {
+            if (titles.title) {
                 const element = this.document.createElement('article-title');
-                this.setTitleContent(element, manuscript.title);
+                this.setTitleContent(element, titles.title);
                 titleGroup.appendChild(element);
             }
-            if (manuscript.subtitle) {
+            if (titles.subtitle) {
                 const element = this.document.createElement('subtitle');
-                this.setTitleContent(element, manuscript.subtitle);
+                this.setTitleContent(element, titles.subtitle);
                 titleGroup.appendChild(element);
             }
-            if (manuscript.runningTitle) {
+            if (titles.runningTitle) {
                 const element = this.document.createElement('alt-title');
                 element.setAttribute('alt-title-type', 'right-running');
-                this.setTitleContent(element, manuscript.runningTitle);
+                this.setTitleContent(element, titles.runningTitle);
                 titleGroup.appendChild(element);
             }
             const supplements = [...this.modelMap.values()].filter((model) => model.objectType === ObjectTypes.Supplement);
@@ -423,9 +424,11 @@ export class JATSExporter {
             }
         };
         this.buildBody = (fragment) => {
-            const content = this.serializeFragment(fragment);
             const body = this.document.createElement('body');
-            body.appendChild(content);
+            fragment.forEach((cFragment) => {
+                const serializedNode = this.serializeNode(cFragment);
+                body.append(...serializedNode.childNodes);
+            });
             this.fixBody(body, fragment);
             return body;
         };
@@ -591,8 +594,9 @@ export class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                affiliations_section: () => '',
-                contributors_section: () => '',
+                title: () => '',
+                affiliations: () => '',
+                contributors: () => '',
                 table_element_footer: () => ['table-wrap-foot', 0],
                 contributor: () => '',
                 affiliation: () => '',
@@ -601,7 +605,10 @@ export class JATSExporter {
                 bibliography_element: () => '',
                 bibliography_item: () => '',
                 comment_list: () => '',
-                keywords_group: () => '',
+                keyword_group: () => '',
+                body: () => ['body', 0],
+                abstracts: () => ['abstract', 0],
+                backmatter: () => ['backmatter', 0],
                 bibliography_section: (node) => [
                     'ref-list',
                     { id: normalizeID(node.attrs.id) },
@@ -780,7 +787,7 @@ export class JATSExporter {
                 },
                 keyword: () => '',
                 keywords_element: () => '',
-                keywords_section: () => '',
+                keywords: () => '',
                 link: (node) => {
                     const text = node.textContent;
                     if (!text) {

package/dist/es/lib/utils.js

@@ -84,3 +84,11 @@ export const getTrimmedTextContent = (node, querySelector) => {
     }
     return (_b = (_a = node.querySelector(querySelector)) === null || _a === void 0 ? void 0 : _a.textContent) === null || _b === void 0 ? void 0 : _b.trim();
 };
+export const groupBy = (list, getKey) => list.reduce((previous, currentItem) => {
+    const group = getKey(currentItem);
+    if (!previous[group]) {
+        previous[group] = [];
+    }
+    previous[group].push(currentItem);
+    return previous;
+}, {});

package/dist/es/schema/index.js

@@ -16,7 +16,7 @@
 import { Schema } from 'prosemirror-model';
 import { bold, code, italic, smallcaps, strikethrough, styled, subscript, superscript, tracked_delete, tracked_insert, underline, } from './marks';
 import { affiliation } from './nodes/affiliation';
-import { affiliationsSection } from './nodes/affiliations_section';
+import { affiliations } from './nodes/affiliations';
 import { attribution } from './nodes/attribution';
 import { bibliographyElement } from './nodes/bibliography_element';
 import { bibliographyItem } from './nodes/bibliography_item';
@@ -28,7 +28,8 @@ import { citation } from './nodes/citation';
 import { comment } from './nodes/comment';
 import { commentList } from './nodes/comment_list';
 import { contributor } from './nodes/contributor';
-import { contributorsSection } from './nodes/contributors_section';
+import { contributors } from './nodes/contributors';
+import { coreSection } from './nodes/core_section';
 import { crossReference } from './nodes/cross_reference';
 import { doc } from './nodes/doc';
 import { equation } from './nodes/equation';
@@ -45,9 +46,8 @@ import { highlightMarker } from './nodes/highlight_marker';
 import { inlineEquation } from './nodes/inline_equation';
 import { inlineFootnote } from './nodes/inline_footnote';
 import { keyword } from './nodes/keyword';
-import { keywordsElement } from './nodes/keywords_element';
-import { keywordsGroup } from './nodes/keywords_group';
-import { keywordsSection } from './nodes/keywords_section';
+import { keywordGroup } from './nodes/keyword_group';
+import { keywords } from './nodes/keywords';
 import { link } from './nodes/link';
 import { bulletList, listItem, orderedList } from './nodes/list';
 import { listing } from './nodes/listing';
@@ -68,8 +68,10 @@ import { tableElement } from './nodes/table_element';
 import { tableElementFooter } from './nodes/table_element_footer';
 import { tableCell, tableRow } from './nodes/table_row';
 import { text } from './nodes/text';
+import { title } from './nodes/title';
 import { tocElement } from './nodes/toc_element';
 import { tocSection } from './nodes/toc_section';
+import { keywordsElement } from "./nodes/keywords_element";
 export * from './groups';
 export * from './types';
 export * from './nodes/comment';
@@ -99,7 +101,7 @@ export * from './nodes/inline_equation';
 export * from './nodes/inline_footnote';
 export * from './nodes/keyword';
 export * from './nodes/keywords_element';
-export * from './nodes/keywords_section';
+export * from './nodes/keywords';
 export * from './nodes/link';
 export * from './nodes/list';
 export * from './nodes/listing';
@@ -123,8 +125,9 @@ export * from './nodes/affiliation';
 export * from './nodes/meta_section';
 export * from './nodes/contributor';
 export * from './nodes/table_element_footer';
-export * from './nodes/affiliations_section';
-export * from './nodes/contributors_section';
+export * from './nodes/title';
+export * from './nodes/affiliations';
+export * from './nodes/contributors';
 export const schema = new Schema({
     marks: {
         bold,
@@ -151,6 +154,9 @@ export const schema = new Schema({
         caption,
         caption_title: captionTitle,
         citation,
+        abstracts: coreSection,
+        body: coreSection,
+        backmatter: coreSection,
         cross_reference: crossReference,
         doc,
         equation,
@@ -168,8 +174,8 @@ export const schema = new Schema({
         inline_footnote: inlineFootnote,
         keyword,
         keywords_element: keywordsElement,
-        keywords_section: keywordsSection,
-        keywords_group: keywordsGroup,
+        keywords: keywords,
+        keyword_group: keywordGroup,
         link,
         list_item: listItem,
         listing,
@@ -199,7 +205,8 @@ export const schema = new Schema({
         meta_section: metaSection,
         contributor: contributor,
         table_element_footer: tableElementFooter,
-        affiliations_section: affiliationsSection,
-        contributors_section: contributorsSection,
+        title: title,
+        affiliations: affiliations,
+        contributors: contributors,
     },
 });

package/dist/es/schema/nodes/{affiliations_section.js → affiliations.js}

@@ -1,11 +1,11 @@
-export const affiliationsSection = {
+export const affiliations = {
     content: 'section_title? affiliation*',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    group: 'block sections',
+    group: 'block',
     selectable: false,
     toDOM: () => ['section', 0],
 };
-export const isAffiliationsSectionNode = (node) => node.type === node.type.schema.nodes.affiliations_section;
+export const isAffiliationsNode = (node) => node.type === node.type.schema.nodes.affiliations;

package/dist/es/schema/nodes/{contributors_section.js → contributors.js}

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

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

@@ -0,0 +1,24 @@
+/*!
+ * © 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 coreSection = {
+    content: 'sections*',
+    atom: true,
+    attrs: {
+        id: { default: '' },
+    },
+    group: 'block',
+    toDOM: () => ['section', 0],
+};

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

@@ -18,7 +18,6 @@ export const keyword = {
     content: 'inline*',
     attrs: {
         id: { default: '' },
-        contents: { default: '' },
         dataTracked: { default: null },
         comments: { default: null },
     },

package/dist/es/schema/nodes/{keywords_group.js → keyword_group.js}

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const keywordsGroup = {
+export const keywordGroup = {
     content: 'keyword*',
     attrs: {
         id: { default: '' },
@@ -28,11 +28,11 @@ export const keywordsGroup = {
         },
     ],
     toDOM: (node) => {
-        const keywordsGroupNode = node;
+        const keywordGroupNode = node;
         return [
             'div',
             {
-                id: keywordsGroupNode.attrs.id,
+                id: keywordGroupNode.attrs.id,
                 class: 'keywords',
                 spellcheck: 'false',
                 contenteditable: false,
@@ -41,4 +41,4 @@ export const keywordsGroup = {
         ];
     },
 };
-export const isKeywordsGroupNode = (node) => node.type === node.type.schema.nodes.keywords_group;
+export const isKeywordGroupNode = (node) => node.type === node.type.schema.nodes.keywords_group;

package/dist/es/schema/nodes/{keywords_section.js → keywords.js}

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const keywordsSection = {
+export const keywords = {
     content: 'section_title (keywords_element | placeholder_element)',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },
     },
-    group: 'block sections',
+    group: 'block',
     selectable: false,
     parseDOM: [
         {
@@ -27,11 +27,11 @@ export const keywordsSection = {
         },
     ],
     toDOM: (node) => {
-        const keywordsSectionNode = node;
+        const keywords = node;
         return [
             'div',
             {
-                id: keywordsSectionNode.attrs.id,
+                id: keywords.attrs.id,
                 class: 'keywords',
                 spellcheck: 'false',
                 contenteditable: false,
@@ -40,4 +40,4 @@ export const keywordsSection = {
         ];
     },
 };
-export const isKeywordsSectionNode = (node) => node.type === node.type.schema.nodes.keywords_section;
+export const isKeywordsNode = (node) => node.type === node.type.schema.nodes.keywords;

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

@@ -15,7 +15,7 @@
  */
 export const keywordsElement = {
     atom: true,
-    content: 'keywords_group*',
+    content: 'keyword_group*',
     attrs: {
         id: { default: '' },
         contents: { default: '' },

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const manuscript = {
-    content: '(section | sections)+ meta_section',
+    content: 'title? contributors? affiliations? keywords? abstracts body backmatter meta_section',
     attrs: {
         id: { default: '' },
     },

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

@@ -0,0 +1,26 @@
+/*!
+ * © 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 title = {
+    content: 'text*',
+    marks: 'italic smallcaps subscript superscript tracked_insert tracked_delete',
+    attrs: {
+        id: { default: '' },
+        dataTracked: { default: null },
+    },
+    group: 'block element',
+    parseDOM: [{ tag: 'div' }],
+    toDOM: () => ['div', 0],
+};

package/dist/es/transformer/builders.js

@@ -28,10 +28,9 @@ export const buildProject = (owner) => ({
     viewers: [],
     title: '',
 });
-export const buildManuscript = (title = '') => ({
+export const buildManuscript = () => ({
     _id: generateID(ObjectTypes.Manuscript),
     objectType: ObjectTypes.Manuscript,
-    title,
 });
 export const buildContributor = (bibliographicName, role = 'author', priority = 0, userID, invitationID) => ({
     _id: generateID(ObjectTypes.Contributor),
@@ -249,3 +248,8 @@ export const buildElementsOrder = (elementType) => ({
     elementType: elementType,
     elements: [],
 });
+export const buildTitles = (title) => ({
+    _id: generateID(ObjectTypes.Titles),
+    objectType: ObjectTypes.Titles,
+    title: title || '',
+});