@manuscripts/transform 3.0.24-LEAN-4192.0 → 3.0.25

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

@@ -872,12 +872,7 @@ class JATSExporter {
                 return element;
             };
             const appendLabels = (element, node) => {
-                if (node.attrs.label) {
-                    const label = this.document.createElement('label');
-                    label.textContent = node.attrs.label;
-                    element.appendChild(label);
-                }
-                else if (this.labelTargets) {
+                if (this.labelTargets) {
                     const target = this.labelTargets.get(node.attrs.id);
                     if (target) {
                         const label = this.document.createElement('label');

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

@@ -443,7 +443,7 @@ class JATSDOMParser {
             {
                 tag: 'caption',
                 node: 'figcaption',
-                context: 'figure_element/',
+                context: 'figure_element/|table_element/',
                 getContent: (node, schema) => {
                     const element = node;
                     const content = [];
@@ -462,11 +462,6 @@ class JATSDOMParser {
                     return prosemirror_model_1.Fragment.from(content);
                 },
             },
-            {
-                tag: 'caption',
-                node: 'figcaption',
-                context: 'table_element/',
-            },
             {
                 tag: 'caption',
                 node: 'figcaption',
@@ -504,11 +499,9 @@ class JATSDOMParser {
                 tag: 'disp-formula',
                 node: 'equation_element',
                 getAttrs: (node) => {
-                    var _a;
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
-                        label: (_a = (0, utils_1.getTrimmedTextContent)(element, 'label')) !== null && _a !== void 0 ? _a : '',
                     };
                 },
                 getContent: (node, schema) => {
@@ -614,12 +607,8 @@ class JATSDOMParser {
                 tag: 'fig',
                 node: 'figure_element',
                 getAttrs: (node) => {
-                    var _a, _b;
+                    var _a;
                     const element = node;
-                    const labelNode = element.querySelector('label');
-                    if (labelNode) {
-                        element.removeChild(labelNode);
-                    }
                     const attrib = element.querySelector('attrib');
                     const attribution = attrib
                         ? {
@@ -628,7 +617,6 @@ class JATSDOMParser {
                         : undefined;
                     return {
                         id: element.getAttribute('id'),
-                        label: (_b = (0, utils_1.getTrimmedTextContent)(labelNode)) !== null && _b !== void 0 ? _b : '',
                         attribution,
                         type: element.getAttribute('fig-type'),
                     };
@@ -775,7 +763,6 @@ class JATSDOMParser {
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
-                        label: (0, utils_1.getTrimmedTextContent)(element, 'label'),
                     };
                 },
             },
@@ -831,11 +818,6 @@ class JATSDOMParser {
                 context: 'keyword_group//',
                 node: 'keyword',
             },
-            {
-                tag: 'label',
-                context: 'box_element/',
-                ignore: true,
-            },
             {
                 tag: 'boxed-text',
                 ignore: true,
@@ -845,16 +827,6 @@ class JATSDOMParser {
                 context: 'section/',
                 node: 'section_label',
             },
-            {
-                tag: 'label',
-                context: 'table_element/',
-                ignore: true,
-            },
-            {
-                tag: 'label',
-                context: 'figure/',
-                ignore: true,
-            },
             {
                 tag: 'table',
                 node: 'table',
@@ -954,10 +926,13 @@ class JATSDOMParser {
                     const element = node;
                     return {
                         rids: ((_a = element.getAttribute('rid')) === null || _a === void 0 ? void 0 : _a.split(/\s+/)) || [],
-                        label: (0, utils_1.getTrimmedTextContent)(element),
                     };
                 },
             },
+            {
+                tag: 'label',
+                ignore: true,
+            },
         ];
         this.marks = [
             {

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 = 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 = exports.addMissingCaptions = void 0;
 const deafults_1 = require("../../lib/deafults");
 const jats_parser_utils_1 = require("./jats-parser-utils");
 const removeNodeFromParent = (node) => node.parentNode && node.parentNode.removeChild(node);
@@ -25,6 +25,25 @@ const createSectionGroup = (type, createElement) => {
     sec.setAttribute('sec-type', type);
     return sec;
 };
+const addMissingCaptions = (doc, createElement) => {
+    const elements = doc.querySelectorAll('fig, table-wrap');
+    for (const element of elements) {
+        let caption = element.querySelector('caption');
+        if (!caption) {
+            caption = createElement('caption');
+            element.nodeName === 'fig'
+                ? element.appendChild(caption)
+                : element.prepend(caption);
+        }
+        if (!caption.querySelector('title')) {
+            caption.prepend(createElement('title'));
+        }
+        if (!caption.querySelector('p')) {
+            caption.appendChild(createElement('p'));
+        }
+    }
+};
+exports.addMissingCaptions = addMissingCaptions;
 const moveTitle = (front, createElement) => {
     var _a, _b;
     let title = front.querySelector('article-meta > title-group > article-title');

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

@@ -29,6 +29,7 @@ const processJATS = (doc, sectionCategories) => {
     if (!front) {
         return;
     }
+    (0, jats_transformations_1.addMissingCaptions)(doc, createElement);
     (0, jats_transformations_1.moveTitle)(front, createElement);
     (0, jats_transformations_1.moveContributors)(front, createElement);
     (0, jats_transformations_1.moveAffiliations)(front, createElement);

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

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

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

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

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

@@ -20,7 +20,6 @@ exports.box_element = {
     content: 'figcaption? section?',
     attrs: {
         id: { default: '' },
-        label: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block element',
@@ -32,7 +31,6 @@ exports.box_element = {
                 const dom = p;
                 const attrs = {
                     id: dom.getAttribute('id') || undefined,
-                    label: dom.getAttribute('label') || undefined,
                 };
                 return attrs;
             },
@@ -44,9 +42,6 @@ exports.box_element = {
         if (boxElementNode.attrs.id) {
             attrs.id = boxElementNode.attrs.id;
         }
-        if (boxElementNode.attrs.label) {
-            attrs.label = boxElementNode.attrs.label;
-        }
         return [
             'div',
             Object.assign({ class: 'boxed-text' }, attrs),

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

@@ -20,7 +20,6 @@ exports.tableElement = {
     content: ' figcaption? (table | placeholder) table_colgroup? table_element_footer? (listing | placeholder)',
     attrs: {
         id: { default: '' },
-        label: { default: '' },
         dataTracked: { default: null },
     },
     selectable: false,

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.24-LEAN-4192.0";
+exports.VERSION = "3.0.25";

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

@@ -864,12 +864,7 @@ export class JATSExporter {
                 return element;
             };
             const appendLabels = (element, node) => {
-                if (node.attrs.label) {
-                    const label = this.document.createElement('label');
-                    label.textContent = node.attrs.label;
-                    element.appendChild(label);
-                }
-                else if (this.labelTargets) {
+                if (this.labelTargets) {
                     const target = this.labelTargets.get(node.attrs.id);
                     if (target) {
                         const label = this.document.createElement('label');

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

@@ -437,7 +437,7 @@ export class JATSDOMParser {
             {
                 tag: 'caption',
                 node: 'figcaption',
-                context: 'figure_element/',
+                context: 'figure_element/|table_element/',
                 getContent: (node, schema) => {
                     const element = node;
                     const content = [];
@@ -456,11 +456,6 @@ export class JATSDOMParser {
                     return Fragment.from(content);
                 },
             },
-            {
-                tag: 'caption',
-                node: 'figcaption',
-                context: 'table_element/',
-            },
             {
                 tag: 'caption',
                 node: 'figcaption',
@@ -498,11 +493,9 @@ export class JATSDOMParser {
                 tag: 'disp-formula',
                 node: 'equation_element',
                 getAttrs: (node) => {
-                    var _a;
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
-                        label: (_a = getTrimmedTextContent(element, 'label')) !== null && _a !== void 0 ? _a : '',
                     };
                 },
                 getContent: (node, schema) => {
@@ -608,12 +601,8 @@ export class JATSDOMParser {
                 tag: 'fig',
                 node: 'figure_element',
                 getAttrs: (node) => {
-                    var _a, _b;
+                    var _a;
                     const element = node;
-                    const labelNode = element.querySelector('label');
-                    if (labelNode) {
-                        element.removeChild(labelNode);
-                    }
                     const attrib = element.querySelector('attrib');
                     const attribution = attrib
                         ? {
@@ -622,7 +611,6 @@ export class JATSDOMParser {
                         : undefined;
                     return {
                         id: element.getAttribute('id'),
-                        label: (_b = getTrimmedTextContent(labelNode)) !== null && _b !== void 0 ? _b : '',
                         attribution,
                         type: element.getAttribute('fig-type'),
                     };
@@ -769,7 +757,6 @@ export class JATSDOMParser {
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
-                        label: getTrimmedTextContent(element, 'label'),
                     };
                 },
             },
@@ -825,11 +812,6 @@ export class JATSDOMParser {
                 context: 'keyword_group//',
                 node: 'keyword',
             },
-            {
-                tag: 'label',
-                context: 'box_element/',
-                ignore: true,
-            },
             {
                 tag: 'boxed-text',
                 ignore: true,
@@ -839,16 +821,6 @@ export class JATSDOMParser {
                 context: 'section/',
                 node: 'section_label',
             },
-            {
-                tag: 'label',
-                context: 'table_element/',
-                ignore: true,
-            },
-            {
-                tag: 'label',
-                context: 'figure/',
-                ignore: true,
-            },
             {
                 tag: 'table',
                 node: 'table',
@@ -948,10 +920,13 @@ export class JATSDOMParser {
                     const element = node;
                     return {
                         rids: ((_a = element.getAttribute('rid')) === null || _a === void 0 ? void 0 : _a.split(/\s+/)) || [],
-                        label: getTrimmedTextContent(element),
                     };
                 },
             },
+            {
+                tag: 'label',
+                ignore: true,
+            },
         ];
         this.marks = [
             {

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

@@ -22,6 +22,24 @@ const createSectionGroup = (type, createElement) => {
     sec.setAttribute('sec-type', type);
     return sec;
 };
+export const addMissingCaptions = (doc, createElement) => {
+    const elements = doc.querySelectorAll('fig, table-wrap');
+    for (const element of elements) {
+        let caption = element.querySelector('caption');
+        if (!caption) {
+            caption = createElement('caption');
+            element.nodeName === 'fig'
+                ? element.appendChild(caption)
+                : element.prepend(caption);
+        }
+        if (!caption.querySelector('title')) {
+            caption.prepend(createElement('title'));
+        }
+        if (!caption.querySelector('p')) {
+            caption.appendChild(createElement('p'));
+        }
+    }
+};
 export const moveTitle = (front, createElement) => {
     var _a, _b;
     let title = front.querySelector('article-meta > title-group > article-title');

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

@@ -18,7 +18,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, fixTables, moveAffiliations, moveAuthorNotes, moveAwards, moveCaptionsToEnd, moveContributors, moveReferencesToBackmatter, moveTitle, orderTableFootnote, } from './jats-transformations';
+import { addMissingCaptions, createAbstracts, createBackmatter, createBody, createBoxedElementSection, createKeywordsSection, createSupplementaryMaterialsSection, fixTables, moveAffiliations, moveAuthorNotes, moveAwards, moveCaptionsToEnd, moveContributors, moveReferencesToBackmatter, moveTitle, orderTableFootnote, } from './jats-transformations';
 const processJATS = (doc, sectionCategories) => {
     const createElement = createElementFn(doc);
     markComments(doc);
@@ -26,6 +26,7 @@ const processJATS = (doc, sectionCategories) => {
     if (!front) {
         return;
     }
+    addMissingCaptions(doc, createElement);
     moveTitle(front, createElement);
     moveContributors(front, createElement);
     moveAffiliations(front, createElement);

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

@@ -15,6 +15,7 @@
  */
 export const abstracts = {
     content: 'sections*',
+    atom: true,
     attrs: {
         id: { default: '' },
     },

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

@@ -15,6 +15,7 @@
  */
 export const body = {
     content: 'element* sections*',
+    atom: true,
     attrs: {
         id: { default: '' },
     },

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

@@ -17,7 +17,6 @@ export const box_element = {
     content: 'figcaption? section?',
     attrs: {
         id: { default: '' },
-        label: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block element',
@@ -29,7 +28,6 @@ export const box_element = {
                 const dom = p;
                 const attrs = {
                     id: dom.getAttribute('id') || undefined,
-                    label: dom.getAttribute('label') || undefined,
                 };
                 return attrs;
             },
@@ -41,9 +39,6 @@ export const box_element = {
         if (boxElementNode.attrs.id) {
             attrs.id = boxElementNode.attrs.id;
         }
-        if (boxElementNode.attrs.label) {
-            attrs.label = boxElementNode.attrs.label;
-        }
         return [
             'div',
             Object.assign({ class: 'boxed-text' }, attrs),

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

@@ -17,7 +17,6 @@ export const tableElement = {
     content: ' figcaption? (table | placeholder) table_colgroup? table_element_footer? (listing | placeholder)',
     attrs: {
         id: { default: '' },
-        label: { default: '' },
         dataTracked: { default: null },
     },
     selectable: false,

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.24-LEAN-4192.0";
+export const VERSION = "3.0.25";

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

@@ -15,6 +15,7 @@
  */
 import { SectionCategory } from '../../schema';
 export type CreateElement = (tagName: string) => HTMLElement;
+export declare const addMissingCaptions: (doc: Document, 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/box_element.d.ts

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

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.24-LEAN-4192.0";
+export declare const VERSION = "3.0.25";

package/package.json

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