@manuscripts/transform 3.0.18 → 3.0.20

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

@@ -679,7 +679,7 @@ class JATSExporter {
                     }
                     return graphic;
                 },
-                figure_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.figure, 'figure'),
+                figure_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.figure),
                 footnote: (node) => {
                     const attrs = {};
                     if (node.attrs.id) {
@@ -740,7 +740,7 @@ class JATSExporter {
                     code.textContent = node.attrs.contents;
                     return code;
                 },
-                listing_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.listing, 'listing'),
+                listing_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.listing),
                 manuscript: (node) => ['article', { id: normalizeID(node.attrs.id) }, 0],
                 missing_figure: () => {
                     const graphic = this.document.createElement('graphic');
@@ -912,8 +912,9 @@ class JATSExporter {
                 processChildNodes(element, node, node.type.schema.nodes.section);
                 return element;
             };
-            const createFigureElement = (node, nodeName, contentNodeType, figType) => {
+            const createFigureElement = (node, nodeName, contentNodeType) => {
                 const element = createElement(node, nodeName);
+                const figType = node.attrs.type;
                 if (figType) {
                     element.setAttribute('fig-type', figType);
                 }

package/dist/cjs/jats/importer/create-article-node.js

@@ -22,9 +22,27 @@ const createArticleNode = (attrs) => {
     const title = schema_1.schema.nodes.title.createChecked({
         id: (0, transformer_1.generateNodeID)(schema_1.schema.nodes.title),
     });
-    if (!attrs.id) {
-        throw new Error('Manuscript ID is missing');
-    }
-    return schema_1.schema.nodes.manuscript.createAndFill(attrs, title);
+    const abstracts = schema_1.schema.nodes.abstracts.createChecked({
+        id: (0, transformer_1.generateNodeID)(schema_1.schema.nodes.abstracts),
+    });
+    const paragraph = schema_1.schema.nodes.paragraph.createChecked({
+        id: (0, transformer_1.generateNodeID)(schema_1.schema.nodes.paragraph),
+    });
+    const body = schema_1.schema.nodes.body.createChecked({
+        id: (0, transformer_1.generateNodeID)(schema_1.schema.nodes.body),
+    }, paragraph);
+    const backmatter = schema_1.schema.nodes.backmatter.createChecked({
+        id: (0, transformer_1.generateNodeID)(schema_1.schema.nodes.backmatter),
+    });
+    const comments = schema_1.schema.nodes.comments.createChecked({
+        id: (0, transformer_1.generateNodeID)(schema_1.schema.nodes.comments),
+    });
+    return schema_1.schema.nodes.manuscript.createChecked(attrs, [
+        title,
+        abstracts,
+        body,
+        backmatter,
+        comments,
+    ]);
 };
 exports.createArticleNode = createArticleNode;

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

@@ -647,7 +647,6 @@ const nodes = [
                 element.removeChild(labelNode);
             }
             const attrib = element.querySelector('attrib');
-            const position = element.getAttribute('position');
             const attribution = attrib
                 ? {
                     literal: (_a = (0, utils_1.getTrimmedTextContent)(attrib)) !== null && _a !== void 0 ? _a : '',
@@ -656,8 +655,8 @@ const nodes = [
             return {
                 id: element.getAttribute('id'),
                 label: (_b = (0, utils_1.getTrimmedTextContent)(labelNode)) !== null && _b !== void 0 ? _b : '',
-                attribution: attribution,
-                position,
+                attribution,
+                type: element.getAttribute('fig-type'),
             };
         },
     },

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fixTables = exports.orderTableFootnote = exports.moveReferencesToBackmatter = exports.createSupplementaryMaterialsSection = exports.createKeywordsSection = exports.moveCaptionsToEnd = exports.createBackmatter = exports.createAbstracts = exports.createBody = exports.createBoxedElementSection = exports.moveAbstracts = exports.moveAffiliations = exports.moveContributors = exports.moveAwards = exports.moveAuthorNotes = exports.moveTitle = exports.ensureSection = void 0;
+exports.fixTables = exports.orderTableFootnote = exports.moveReferencesToBackmatter = exports.createSupplementaryMaterialsSection = exports.createKeywordsSection = exports.moveCaptionsToEnd = exports.createBackmatter = exports.createAbstracts = exports.createBody = exports.createBoxedElementSection = exports.moveAbstracts = exports.moveAffiliations = exports.moveContributors = exports.moveAwards = exports.moveAuthorNotes = exports.moveTitle = void 0;
 const deafults_1 = require("../../lib/deafults");
 const section_group_type_1 = require("../../lib/section-group-type");
 const transformer_1 = require("../../transformer");
@@ -30,29 +30,6 @@ const createSectionGroup = (type, createElement) => {
     sec.appendChild(title);
     return sec;
 };
-const ensureSection = (body, createElement) => {
-    let section;
-    const element = body.firstElementChild;
-    if (element && element.tagName === 'sec') {
-        section = element;
-    }
-    else {
-        section = createElement('sec');
-        body.insertBefore(section, body.firstChild);
-    }
-    body.childNodes.forEach((child) => {
-        if (child.nodeType === Node.ELEMENT_NODE) {
-            const element = child;
-            if (element.tagName !== 'sec') {
-                section.appendChild(element);
-            }
-            else {
-                section = element;
-            }
-        }
-    });
-};
-exports.ensureSection = ensureSection;
 const moveTitle = (front, createElement) => {
     var _a, _b;
     let title = front.querySelector('article-meta > title-group > article-title');
@@ -139,6 +116,8 @@ const createBoxedElementSection = (body, createElement) => {
 exports.createBoxedElementSection = createBoxedElementSection;
 const createBody = (doc, body, createElement) => {
     const group = createSectionGroup(section_group_type_1.bodyType, createElement);
+    const paragraphs = doc.querySelectorAll('body > p');
+    group.append(...paragraphs);
     const sections = doc.querySelectorAll('body > sec:not([sec-type="backmatter"]), body > sec:not([sec-type])');
     sections.forEach((section) => {
         removeNodeFromParent(section);

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

@@ -37,7 +37,6 @@ const processJATS = (doc) => {
     if (!body) {
         return;
     }
-    (0, jats_transformations_1.ensureSection)(body, createElement);
     (0, jats_transformations_1.moveCaptionsToEnd)(body);
     (0, jats_transformations_1.createBoxedElementSection)(body, createElement);
     (0, jats_transformations_1.createBody)(doc, body, createElement);

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.body = void 0;
 exports.body = {
-    content: 'sections*',
+    content: 'element* sections*',
     atom: true,
     attrs: {
         id: { default: '' },

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

@@ -22,6 +22,7 @@ exports.figureElement = {
         id: { default: '' },
         attribution: { default: undefined },
         dataTracked: { default: null },
+        type: { default: undefined },
     },
     selectable: false,
     group: 'block element executable',

package/dist/cjs/version.js

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

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

@@ -671,7 +671,7 @@ export class JATSExporter {
                     }
                     return graphic;
                 },
-                figure_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.figure, 'figure'),
+                figure_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.figure),
                 footnote: (node) => {
                     const attrs = {};
                     if (node.attrs.id) {
@@ -732,7 +732,7 @@ export class JATSExporter {
                     code.textContent = node.attrs.contents;
                     return code;
                 },
-                listing_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.listing, 'listing'),
+                listing_element: (node) => createFigureElement(node, 'fig', node.type.schema.nodes.listing),
                 manuscript: (node) => ['article', { id: normalizeID(node.attrs.id) }, 0],
                 missing_figure: () => {
                     const graphic = this.document.createElement('graphic');
@@ -904,8 +904,9 @@ export class JATSExporter {
                 processChildNodes(element, node, node.type.schema.nodes.section);
                 return element;
             };
-            const createFigureElement = (node, nodeName, contentNodeType, figType) => {
+            const createFigureElement = (node, nodeName, contentNodeType) => {
                 const element = createElement(node, nodeName);
+                const figType = node.attrs.type;
                 if (figType) {
                     element.setAttribute('fig-type', figType);
                 }

package/dist/es/jats/importer/create-article-node.js

@@ -19,8 +19,26 @@ export const createArticleNode = (attrs) => {
     const title = schema.nodes.title.createChecked({
         id: generateNodeID(schema.nodes.title),
     });
-    if (!attrs.id) {
-        throw new Error('Manuscript ID is missing');
-    }
-    return schema.nodes.manuscript.createAndFill(attrs, title);
+    const abstracts = schema.nodes.abstracts.createChecked({
+        id: generateNodeID(schema.nodes.abstracts),
+    });
+    const paragraph = schema.nodes.paragraph.createChecked({
+        id: generateNodeID(schema.nodes.paragraph),
+    });
+    const body = schema.nodes.body.createChecked({
+        id: generateNodeID(schema.nodes.body),
+    }, paragraph);
+    const backmatter = schema.nodes.backmatter.createChecked({
+        id: generateNodeID(schema.nodes.backmatter),
+    });
+    const comments = schema.nodes.comments.createChecked({
+        id: generateNodeID(schema.nodes.comments),
+    });
+    return schema.nodes.manuscript.createChecked(attrs, [
+        title,
+        abstracts,
+        body,
+        backmatter,
+        comments,
+    ]);
 };

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

@@ -641,7 +641,6 @@ const nodes = [
                 element.removeChild(labelNode);
             }
             const attrib = element.querySelector('attrib');
-            const position = element.getAttribute('position');
             const attribution = attrib
                 ? {
                     literal: (_a = getTrimmedTextContent(attrib)) !== null && _a !== void 0 ? _a : '',
@@ -650,8 +649,8 @@ const nodes = [
             return {
                 id: element.getAttribute('id'),
                 label: (_b = getTrimmedTextContent(labelNode)) !== null && _b !== void 0 ? _b : '',
-                attribution: attribution,
-                position,
+                attribution,
+                type: element.getAttribute('fig-type'),
             };
         },
     },

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

@@ -27,28 +27,6 @@ const createSectionGroup = (type, createElement) => {
     sec.appendChild(title);
     return sec;
 };
-export const ensureSection = (body, createElement) => {
-    let section;
-    const element = body.firstElementChild;
-    if (element && element.tagName === 'sec') {
-        section = element;
-    }
-    else {
-        section = createElement('sec');
-        body.insertBefore(section, body.firstChild);
-    }
-    body.childNodes.forEach((child) => {
-        if (child.nodeType === Node.ELEMENT_NODE) {
-            const element = child;
-            if (element.tagName !== 'sec') {
-                section.appendChild(element);
-            }
-            else {
-                section = element;
-            }
-        }
-    });
-};
 export const moveTitle = (front, createElement) => {
     var _a, _b;
     let title = front.querySelector('article-meta > title-group > article-title');
@@ -128,6 +106,8 @@ export const createBoxedElementSection = (body, createElement) => {
 };
 export const createBody = (doc, body, createElement) => {
     const group = createSectionGroup(bodyType, createElement);
+    const paragraphs = doc.querySelectorAll('body > p');
+    group.append(...paragraphs);
     const sections = doc.querySelectorAll('body > sec:not([sec-type="backmatter"]), body > sec:not([sec-type])');
     sections.forEach((section) => {
         removeNodeFromParent(section);

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

@@ -17,7 +17,7 @@ import { markComments } from './jats-comments';
 import { jatsDOMParser } from './jats-dom-parser';
 import { parseJournal } from './jats-journal-meta-parser';
 import { updateDocumentIDs } from './jats-parser-utils';
-import { createAbstracts, createBackmatter, createBody, createBoxedElementSection, createKeywordsSection, createSupplementaryMaterialsSection, ensureSection, fixTables, moveAffiliations, moveAuthorNotes, moveAwards, moveCaptionsToEnd, moveContributors, moveReferencesToBackmatter, moveTitle, orderTableFootnote, } from './jats-transformations';
+import { createAbstracts, createBackmatter, createBody, createBoxedElementSection, createKeywordsSection, createSupplementaryMaterialsSection, fixTables, moveAffiliations, moveAuthorNotes, moveAwards, moveCaptionsToEnd, moveContributors, moveReferencesToBackmatter, moveTitle, orderTableFootnote, } from './jats-transformations';
 const processJATS = (doc) => {
     const createElement = createElementFn(doc);
     markComments(doc);
@@ -34,7 +34,6 @@ const processJATS = (doc) => {
     if (!body) {
         return;
     }
-    ensureSection(body, createElement);
     moveCaptionsToEnd(body);
     createBoxedElementSection(body, createElement);
     createBody(doc, body, createElement);

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const body = {
-    content: 'sections*',
+    content: 'element* sections*',
     atom: true,
     attrs: {
         id: { default: '' },

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

@@ -19,6 +19,7 @@ export const figureElement = {
         id: { default: '' },
         attribution: { default: undefined },
         dataTracked: { default: null },
+        type: { default: undefined },
     },
     selectable: false,
     group: 'block element executable',

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.18";
+export const VERSION = "3.0.20";

package/dist/types/jats/importer/create-article-node.d.ts

@@ -13,5 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ManuscriptAttrs } from '../../schema';
-export declare const createArticleNode: (attrs: Partial<ManuscriptAttrs>) => import("prosemirror-model").Node;
+import { ManuscriptAttrs, ManuscriptNode } from '../../schema';
+export declare const createArticleNode: (attrs: Partial<ManuscriptAttrs> & {
+    id: string;
+}) => ManuscriptNode;

package/dist/types/jats/importer/jats-transformations.d.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 export type CreateElement = (tagName: string) => HTMLElement;
-export declare const ensureSection: (body: Element, createElement: CreateElement) => void;
 export declare const moveTitle: (front: Element, createElement: CreateElement) => void;
 export declare const moveAuthorNotes: (front: Element, createElement: CreateElement) => void;
 export declare const moveAwards: (front: Element) => void;

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

@@ -19,6 +19,7 @@ import { AttributionNode } from './attribution';
 interface Attrs {
     id: string;
     attribution?: AttributionNode;
+    type?: string;
 }
 export interface FigureElementNode extends ManuscriptNode {
     attrs: Attrs;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.18";
+export declare const VERSION = "3.0.20";

package/package.json

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