@manuscripts/transform 4.4.1 → 4.4.3

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

@@ -722,11 +722,11 @@ class JATSExporter {
                     return this.createElement('boxed-text');
                 },
                 pullquote_element: (node) => {
-                    let type = 'pullquote';
-                    if (node.firstChild?.type === schema_1.schema.nodes.quote_image) {
-                        type = 'quote-with-image';
+                    const attrs = {};
+                    if (node.attrs.type) {
+                        attrs['content-type'] = node.attrs.type;
                     }
-                    return ['disp-quote', { 'content-type': type }, 0];
+                    return ['disp-quote', attrs, 0];
                 },
                 quote_image: (node) => {
                     const img = node;
@@ -760,6 +760,9 @@ class JATSExporter {
                 table_element: (node) => {
                     const element = createTableElement(node);
                     element.setAttribute('position', 'anchor');
+                    if (node.attrs.type) {
+                        element.setAttribute('content-type', node.attrs.type);
+                    }
                     return element;
                 },
                 table_cell: (node) => [
@@ -873,6 +876,9 @@ class JATSExporter {
             };
             const createBoxElement = (node) => {
                 const element = createElement(node, 'boxed-text');
+                if (node.attrs.type) {
+                    element.setAttribute('content-type', node.attrs.type);
+                }
                 appendLabels(element, node);
                 const child = node.firstChild;
                 if (child?.type === schema_1.schema.nodes.caption_title) {
@@ -888,6 +894,10 @@ class JATSExporter {
                     return !!result;
                 });
             };
+            const findParentHeroImage = (targetID) => {
+                const heroes = this.getChildrenOfType(schema_1.schema.nodes.hero_image);
+                return heroes.find((hero) => !!(0, prosemirror_utils_1.findChildrenByAttr)(hero, (attrs) => attrs.id === targetID)[0]);
+            };
             const createImage = (node) => {
                 const graphicNode = node.content.firstChild;
                 if (!graphicNode) {
@@ -906,8 +916,9 @@ class JATSExporter {
             const createGraphic = (node) => {
                 const graphic = this.createElement('graphic');
                 graphic.setAttributeNS(xml_1.XLINK_NAMESPACE, 'xlink:href', node.attrs.src);
-                if (isChildOfNodeType(node.attrs.id, schema_1.schema.nodes.hero_image)) {
-                    graphic.setAttribute('content-type', 'leading');
+                const hero = findParentHeroImage(node.attrs.id);
+                if (hero) {
+                    graphic.setAttribute('content-type', hero.attrs.type || 'leading');
                 }
                 else if (!isChildOfNodeType(node.attrs.id, schema_1.schema.nodes.figure_element) &&
                     node.attrs.type) {

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

@@ -551,6 +551,7 @@ class JATSDOMParser {
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
+                        type: element.getAttribute('content-type'),
                     };
                 },
             },
@@ -651,8 +652,14 @@ class JATSDOMParser {
                 },
             },
             {
-                tag: 'graphic[content-type=leading]',
+                tag: 'graphic[content-type^=leading]',
                 node: 'hero_image',
+                getAttrs: (node) => {
+                    const element = node;
+                    return {
+                        type: element.getAttribute('content-type'),
+                    };
+                },
                 getContent: this.getFigContent,
             },
             {
@@ -866,6 +873,7 @@ class JATSDOMParser {
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
+                        type: element.getAttribute('content-type') ?? '',
                     };
                 },
             },
@@ -959,6 +967,7 @@ class JATSDOMParser {
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
+                        type: element.getAttribute('content-type') ?? '',
                     };
                 },
             },

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

@@ -125,7 +125,7 @@ const moveAbstracts = (front, group, createElement, sectionCategories) => {
 };
 exports.moveAbstracts = moveAbstracts;
 const moveHeroImage = (doc) => {
-    const heroImage = doc.querySelector('graphic[content-type="leading"]');
+    const heroImage = doc.querySelector('graphic[content-type^="leading"]');
     if (!heroImage) {
         return;
     }

package/dist/cjs/schema/migration/migration-scripts/4.4.2.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Migration442 {
+    constructor() {
+        this.fromVersion = '4.4.1';
+        this.toVersion = '4.4.2';
+    }
+    migrateNode(node) {
+        switch (node.type) {
+            case 'hero_image':
+                if (!node.attrs || node.attrs.type === undefined) {
+                    return {
+                        ...node,
+                        attrs: { ...(node.attrs ?? {}), type: 'leading' },
+                    };
+                }
+                return node;
+            case 'pullquote_element':
+                if (!node.attrs || node.attrs.type === undefined) {
+                    const hasImage = node.content?.[0]?.type === 'quote_image';
+                    return {
+                        ...node,
+                        attrs: {
+                            ...(node.attrs ?? {}),
+                            type: hasImage ? 'quote-with-image' : 'pullquote',
+                        },
+                    };
+                }
+                return node;
+            case 'box_element':
+            case 'table_element':
+                if (!node.attrs || node.attrs.type === undefined) {
+                    return {
+                        ...node,
+                        attrs: { ...(node.attrs ?? {}), type: '' },
+                    };
+                }
+                return node;
+            default:
+                return node;
+        }
+    }
+}
+exports.default = Migration442;

package/dist/cjs/schema/migration/migration-scripts/index.js

@@ -32,6 +32,7 @@ const _4_2_15_1 = __importDefault(require("./4.2.15"));
 const _4_3_23_1 = __importDefault(require("./4.3.23"));
 const _4_3_34_1 = __importDefault(require("./4.3.34"));
 const _4_3_35_1 = __importDefault(require("./4.3.35"));
+const _4_4_2_1 = __importDefault(require("./4.4.2"));
 const migrations = [
     new _1_2_5_1.default(),
     new _2_3_22_1.default(),
@@ -47,5 +48,6 @@ const migrations = [
     new _4_3_23_1.default(),
     new _4_3_34_1.default(),
     new _4_3_35_1.default(),
+    new _4_4_2_1.default(),
 ];
 exports.default = migrations;

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

@@ -20,6 +20,7 @@ exports.box_element = {
     content: 'caption_title? caption? section?',
     attrs: {
         id: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block element',
@@ -42,6 +43,9 @@ exports.box_element = {
         if (boxElementNode.attrs.id) {
             attrs.id = boxElementNode.attrs.id;
         }
+        if (boxElementNode.attrs.type) {
+            attrs['data-content-type'] = boxElementNode.attrs.type;
+        }
         return [
             'div',
             {

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

@@ -20,6 +20,7 @@ exports.heroImage = {
     content: 'figure? alt_text long_desc',
     attrs: {
         id: { default: '' },
+        type: { default: 'leading' },
         dataTracked: { default: null },
     },
     group: 'block element',
@@ -29,6 +30,7 @@ exports.heroImage = {
             {
                 class: 'hero_image',
                 id: node.attrs.id,
+                'data-content-type': node.attrs.type,
             },
         ];
     },

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

@@ -21,6 +21,7 @@ exports.pullquoteElement = {
     attrs: {
         id: { default: '' },
         placeholder: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block element',
@@ -51,6 +52,9 @@ exports.pullquoteElement = {
         if (pullquoteElementNode.attrs.placeholder) {
             attrs['data-placeholder-text'] = pullquoteElementNode.attrs.placeholder;
         }
+        if (pullquoteElementNode.attrs.type) {
+            attrs['data-content-type'] = pullquoteElementNode.attrs.type;
+        }
         return ['aside', attrs, 0];
     },
 };

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

@@ -20,6 +20,7 @@ exports.tableElement = {
     content: 'caption_title (table | placeholder) table_colgroup? table_element_footer? alt_text long_desc (listing | placeholder)',
     attrs: {
         id: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     selectable: false,
@@ -37,14 +38,14 @@ exports.tableElement = {
     ],
     toDOM: (node) => {
         const tableElementNode = node;
-        return [
-            'figure',
-            {
-                class: 'table',
-                id: tableElementNode.attrs.id,
-            },
-            0,
-        ];
+        const attrs = {
+            class: 'table',
+            id: tableElementNode.attrs.id,
+        };
+        if (tableElementNode.attrs.type) {
+            attrs['data-content-type'] = tableElementNode.attrs.type;
+        }
+        return ['figure', attrs, 0];
     },
 };
 const isTableElementNode = (node) => node.type === node.type.schema.nodes.table_element;

package/dist/cjs/version.js

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

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

@@ -682,11 +682,11 @@ export class JATSExporter {
                     return this.createElement('boxed-text');
                 },
                 pullquote_element: (node) => {
-                    let type = 'pullquote';
-                    if (node.firstChild?.type === schema.nodes.quote_image) {
-                        type = 'quote-with-image';
+                    const attrs = {};
+                    if (node.attrs.type) {
+                        attrs['content-type'] = node.attrs.type;
                     }
-                    return ['disp-quote', { 'content-type': type }, 0];
+                    return ['disp-quote', attrs, 0];
                 },
                 quote_image: (node) => {
                     const img = node;
@@ -720,6 +720,9 @@ export class JATSExporter {
                 table_element: (node) => {
                     const element = createTableElement(node);
                     element.setAttribute('position', 'anchor');
+                    if (node.attrs.type) {
+                        element.setAttribute('content-type', node.attrs.type);
+                    }
                     return element;
                 },
                 table_cell: (node) => [
@@ -833,6 +836,9 @@ export class JATSExporter {
             };
             const createBoxElement = (node) => {
                 const element = createElement(node, 'boxed-text');
+                if (node.attrs.type) {
+                    element.setAttribute('content-type', node.attrs.type);
+                }
                 appendLabels(element, node);
                 const child = node.firstChild;
                 if (child?.type === schema.nodes.caption_title) {
@@ -848,6 +854,10 @@ export class JATSExporter {
                     return !!result;
                 });
             };
+            const findParentHeroImage = (targetID) => {
+                const heroes = this.getChildrenOfType(schema.nodes.hero_image);
+                return heroes.find((hero) => !!findChildrenByAttr(hero, (attrs) => attrs.id === targetID)[0]);
+            };
             const createImage = (node) => {
                 const graphicNode = node.content.firstChild;
                 if (!graphicNode) {
@@ -866,8 +876,9 @@ export class JATSExporter {
             const createGraphic = (node) => {
                 const graphic = this.createElement('graphic');
                 graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', node.attrs.src);
-                if (isChildOfNodeType(node.attrs.id, schema.nodes.hero_image)) {
-                    graphic.setAttribute('content-type', 'leading');
+                const hero = findParentHeroImage(node.attrs.id);
+                if (hero) {
+                    graphic.setAttribute('content-type', hero.attrs.type || 'leading');
                 }
                 else if (!isChildOfNodeType(node.attrs.id, schema.nodes.figure_element) &&
                     node.attrs.type) {

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

@@ -548,6 +548,7 @@ export class JATSDOMParser {
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
+                        type: element.getAttribute('content-type'),
                     };
                 },
             },
@@ -648,8 +649,14 @@ export class JATSDOMParser {
                 },
             },
             {
-                tag: 'graphic[content-type=leading]',
+                tag: 'graphic[content-type^=leading]',
                 node: 'hero_image',
+                getAttrs: (node) => {
+                    const element = node;
+                    return {
+                        type: element.getAttribute('content-type'),
+                    };
+                },
                 getContent: this.getFigContent,
             },
             {
@@ -863,6 +870,7 @@ export class JATSDOMParser {
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
+                        type: element.getAttribute('content-type') ?? '',
                     };
                 },
             },
@@ -956,6 +964,7 @@ export class JATSDOMParser {
                     const element = node;
                     return {
                         id: element.getAttribute('id'),
+                        type: element.getAttribute('content-type') ?? '',
                     };
                 },
             },

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

@@ -114,7 +114,7 @@ export const moveAbstracts = (front, group, createElement, sectionCategories) =>
     });
 };
 export const moveHeroImage = (doc) => {
-    const heroImage = doc.querySelector('graphic[content-type="leading"]');
+    const heroImage = doc.querySelector('graphic[content-type^="leading"]');
     if (!heroImage) {
         return;
     }

package/dist/es/schema/migration/migration-scripts/4.4.2.js

@@ -0,0 +1,42 @@
+class Migration442 {
+    constructor() {
+        this.fromVersion = '4.4.1';
+        this.toVersion = '4.4.2';
+    }
+    migrateNode(node) {
+        switch (node.type) {
+            case 'hero_image':
+                if (!node.attrs || node.attrs.type === undefined) {
+                    return {
+                        ...node,
+                        attrs: { ...(node.attrs ?? {}), type: 'leading' },
+                    };
+                }
+                return node;
+            case 'pullquote_element':
+                if (!node.attrs || node.attrs.type === undefined) {
+                    const hasImage = node.content?.[0]?.type === 'quote_image';
+                    return {
+                        ...node,
+                        attrs: {
+                            ...(node.attrs ?? {}),
+                            type: hasImage ? 'quote-with-image' : 'pullquote',
+                        },
+                    };
+                }
+                return node;
+            case 'box_element':
+            case 'table_element':
+                if (!node.attrs || node.attrs.type === undefined) {
+                    return {
+                        ...node,
+                        attrs: { ...(node.attrs ?? {}), type: '' },
+                    };
+                }
+                return node;
+            default:
+                return node;
+        }
+    }
+}
+export default Migration442;

package/dist/es/schema/migration/migration-scripts/index.js

@@ -27,6 +27,7 @@ import Migration4215 from './4.2.15';
 import Migration4323 from './4.3.23';
 import Migration4334 from './4.3.34';
 import Migration4335 from './4.3.35';
+import Migration442 from './4.4.2';
 const migrations = [
     new Migration125(),
     new Migration2322(),
@@ -42,5 +43,6 @@ const migrations = [
     new Migration4323(),
     new Migration4334(),
     new Migration4335(),
+    new Migration442(),
 ];
 export default migrations;

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

@@ -17,6 +17,7 @@ export const box_element = {
     content: 'caption_title? caption? section?',
     attrs: {
         id: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block element',
@@ -39,6 +40,9 @@ export const box_element = {
         if (boxElementNode.attrs.id) {
             attrs.id = boxElementNode.attrs.id;
         }
+        if (boxElementNode.attrs.type) {
+            attrs['data-content-type'] = boxElementNode.attrs.type;
+        }
         return [
             'div',
             {

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

@@ -17,6 +17,7 @@ export const heroImage = {
     content: 'figure? alt_text long_desc',
     attrs: {
         id: { default: '' },
+        type: { default: 'leading' },
         dataTracked: { default: null },
     },
     group: 'block element',
@@ -26,6 +27,7 @@ export const heroImage = {
             {
                 class: 'hero_image',
                 id: node.attrs.id,
+                'data-content-type': node.attrs.type,
             },
         ];
     },

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

@@ -18,6 +18,7 @@ export const pullquoteElement = {
     attrs: {
         id: { default: '' },
         placeholder: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     group: 'block element',
@@ -48,6 +49,9 @@ export const pullquoteElement = {
         if (pullquoteElementNode.attrs.placeholder) {
             attrs['data-placeholder-text'] = pullquoteElementNode.attrs.placeholder;
         }
+        if (pullquoteElementNode.attrs.type) {
+            attrs['data-content-type'] = pullquoteElementNode.attrs.type;
+        }
         return ['aside', attrs, 0];
     },
 };

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

@@ -17,6 +17,7 @@ export const tableElement = {
     content: 'caption_title (table | placeholder) table_colgroup? table_element_footer? alt_text long_desc (listing | placeholder)',
     attrs: {
         id: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     selectable: false,
@@ -34,14 +35,14 @@ export const tableElement = {
     ],
     toDOM: (node) => {
         const tableElementNode = node;
-        return [
-            'figure',
-            {
-                class: 'table',
-                id: tableElementNode.attrs.id,
-            },
-            0,
-        ];
+        const attrs = {
+            class: 'table',
+            id: tableElementNode.attrs.id,
+        };
+        if (tableElementNode.attrs.type) {
+            attrs['data-content-type'] = tableElementNode.attrs.type;
+        }
+        return ['figure', attrs, 0];
     },
 };
 export const isTableElementNode = (node) => node.type === node.type.schema.nodes.table_element;

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "4.4.1";
+export const VERSION = "4.4.3";

package/dist/types/schema/migration/migration-scripts/4.4.2.d.ts

@@ -0,0 +1,8 @@
+import { JSONProsemirrorNode } from '../../../types';
+import { MigrationScript } from '../migration-script';
+declare class Migration442 implements MigrationScript {
+    fromVersion: string;
+    toVersion: string;
+    migrateNode(node: JSONProsemirrorNode): JSONProsemirrorNode;
+}
+export default Migration442;

package/dist/types/schema/migration/migration-scripts/index.d.ts

@@ -27,5 +27,6 @@ import Migration4215 from './4.2.15';
 import Migration4323 from './4.3.23';
 import Migration4334 from './4.3.34';
 import Migration4335 from './4.3.35';
-declare const migrations: (Migration125 | Migration2322 | Migration3012 | Migration3021 | Migration3030 | Migration3031 | Migration3041 | Migration3055 | Migration3056 | Migration4213 | Migration4215 | Migration4323 | Migration4334 | Migration4335)[];
+import Migration442 from './4.4.2';
+declare const migrations: (Migration125 | Migration2322 | Migration3012 | Migration3021 | Migration3030 | Migration3031 | Migration3041 | Migration3055 | Migration3056 | Migration4213 | Migration4215 | Migration4323 | Migration4334 | Migration4335 | Migration442)[];
 export default migrations;

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

@@ -15,13 +15,12 @@
  */
 import { NodeSpec } from 'prosemirror-model';
 import { ManuscriptNode } from '../types';
-interface Attrs {
+export interface BlockquoteElementAttrs {
     id: string;
     placeholder: string;
 }
 export interface BlockquoteElementNode extends ManuscriptNode {
-    attrs: Attrs;
+    attrs: BlockquoteElementAttrs;
 }
 export declare const blockquoteElement: NodeSpec;
 export declare const isBlockquoteElement: (node: ManuscriptNode) => node is BlockquoteElementNode;
-export {};

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

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

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

@@ -18,6 +18,7 @@ import { ManuscriptNode } from '../types';
 export interface HeroImageNode extends ManuscriptNode {
     attrs: {
         id: string;
+        type: string;
     };
 }
 export declare const heroImage: NodeSpec;

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

@@ -15,12 +15,13 @@
  */
 import { NodeSpec } from 'prosemirror-model';
 import { ManuscriptNode } from '../types';
-interface Attrs {
+interface PullquoteElementAttrs {
     id: string;
     placeholder: string;
+    type: string;
 }
 export interface PullquoteElementNode extends ManuscriptNode {
-    attrs: Attrs;
+    attrs: PullquoteElementAttrs;
 }
 export declare const pullquoteElement: NodeSpec;
 export declare const isPullquoteElement: (node: ManuscriptNode) => node is PullquoteElementNode;

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

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

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.4.1";
+export declare const VERSION = "4.4.3";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "4.4.1",
+  "version": "4.4.3",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -61,6 +61,7 @@
     "eslint-plugin-diff": "2.0.3",
     "eslint-plugin-header": "3.1.1",
     "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-jest": "29.1.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
     "eslint-plugin-mdx": "3.6.2",
     "eslint-plugin-node": "11.1.0",