@manuscripts/transform 4.3.8 → 4.3.10

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

@@ -486,7 +486,7 @@ class JATSDOMParser {
             {
                 tag: 'caption',
                 node: 'figcaption',
-                context: 'figure_element/|table_element/|embed/|supplement/',
+                context: 'figure_element/|table_element/|embed/|supplement/|box_element/',
                 getContent: (node, schema) => {
                     const element = node;
                     const content = [];
@@ -813,7 +813,7 @@ class JATSDOMParser {
                 node: 'backmatter',
             },
             {
-                tag: 'sec[sec-type="box-element"]',
+                tag: 'boxed-text',
                 node: 'box_element',
                 getAttrs: (node) => {
                     const element = node;
@@ -890,10 +890,6 @@ class JATSDOMParser {
                 context: 'keyword_group//',
                 node: 'keyword',
             },
-            {
-                tag: 'boxed-text',
-                ignore: true,
-            },
             {
                 tag: 'label',
                 context: 'section/',

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.createAttachments = exports.orderTableFootnote = exports.moveReferencesToBackmatter = exports.createAccessibilityItems = exports.createSupplementaryMaterialsSection = exports.createKeywordsSection = exports.moveCaptionsToEnd = exports.createBackmatter = exports.createAbstracts = exports.createBody = exports.createBoxedElementSection = exports.moveHeroImage = exports.moveAbstracts = exports.moveAffiliations = exports.moveContributors = exports.moveAwards = exports.moveAuthorNotes = exports.createTitles = exports.addMissingCaptions = void 0;
+exports.fixTables = exports.createAttachments = exports.orderTableFootnote = exports.moveReferencesToBackmatter = exports.createAccessibilityItems = exports.createSupplementaryMaterialsSection = exports.createKeywordsSection = exports.moveCaptionsToEnd = exports.createBackmatter = exports.createAbstracts = exports.createBody = exports.moveHeroImage = exports.moveAbstracts = exports.moveAffiliations = exports.moveContributors = exports.moveAwards = exports.moveAuthorNotes = exports.createTitles = exports.createBoxedElementSection = exports.addMissingCaptions = void 0;
 const deafults_1 = require("../../lib/deafults");
 const xml_1 = require("../../lib/xml");
 const jats_parser_utils_1 = require("./jats-parser-utils");
@@ -27,7 +27,7 @@ const createSectionGroup = (type, createElement) => {
     return sec;
 };
 const addMissingCaptions = (doc, createElement) => {
-    const elements = doc.querySelectorAll('fig, table-wrap, media, supplementary-material');
+    const elements = doc.querySelectorAll('fig, table-wrap, media, supplementary-material, boxed-text');
     for (const element of elements) {
         let caption = element.querySelector('caption');
         if (!caption) {
@@ -39,12 +39,22 @@ const addMissingCaptions = (doc, createElement) => {
         if (!caption.querySelector('title')) {
             caption.prepend(createElement('title'));
         }
-        if (!caption.querySelector('p')) {
+        if (!caption.querySelector('p') && element.nodeName !== 'boxed-text') {
             caption.appendChild(createElement('p'));
         }
     }
 };
 exports.addMissingCaptions = addMissingCaptions;
+const createBoxedElementSection = (doc, createElement) => {
+    const boxedTexts = doc.querySelectorAll('boxed-text');
+    for (const boxedText of boxedTexts) {
+        const containerSec = createElement('sec');
+        const children = Array.from(boxedText.children).filter((child) => child.localName !== 'label' && child.localName !== 'caption');
+        containerSec.append(...children);
+        boxedText.appendChild(containerSec);
+    }
+};
+exports.createBoxedElementSection = createBoxedElementSection;
 const createTitles = (front, createElement) => {
     const titles = createElement('titles');
     let title = front.querySelector('article-meta > title-group > article-title');
@@ -126,30 +136,6 @@ const moveHeroImage = (doc) => {
     }
 };
 exports.moveHeroImage = moveHeroImage;
-const createBoxedElementSection = (body, createElement) => {
-    const boxedTexts = body.querySelectorAll('boxed-text');
-    for (const boxedText of boxedTexts) {
-        const boxElementId = boxedText.getAttribute('id');
-        const boxElementSec = createElement('sec');
-        boxElementSec.setAttribute('sec-type', 'box-element');
-        if (boxElementId) {
-            boxElementSec.setAttribute('id', boxElementId);
-        }
-        const title = createElement('title');
-        title.textContent = 'BoxElement';
-        boxElementSec.append(title);
-        for (const element of [...boxedText.children]) {
-            if (element?.tagName === 'label' || element?.tagName === 'caption') {
-                boxElementSec.append(element);
-            }
-        }
-        const containerSection = createElement('sec');
-        containerSection.append(...boxedText.children);
-        boxElementSec.append(containerSection);
-        boxedText.replaceWith(boxElementSec);
-    }
-};
-exports.createBoxedElementSection = createBoxedElementSection;
 const createBody = (doc, body, createElement) => {
     const group = createSectionGroup('body', createElement);
     const elements = body.querySelectorAll(':scope > *:not(sec), :scope > sec:not([sec-type="backmatter"]), :scope > sec:not([sec-type])');

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

@@ -30,6 +30,7 @@ const processJATS = (doc, sectionCategories) => {
         return;
     }
     (0, jats_transformations_1.addMissingCaptions)(doc, createElement);
+    (0, jats_transformations_1.createBoxedElementSection)(doc, createElement);
     (0, jats_transformations_1.createTitles)(front, createElement);
     (0, jats_transformations_1.moveContributors)(front, createElement);
     (0, jats_transformations_1.moveAffiliations)(front, createElement);
@@ -45,7 +46,6 @@ const processJATS = (doc, sectionCategories) => {
         article.append(body);
     }
     (0, jats_transformations_1.moveCaptionsToEnd)(body);
-    (0, jats_transformations_1.createBoxedElementSection)(body, createElement);
     (0, jats_transformations_1.createBody)(doc, body, createElement);
     (0, jats_transformations_1.createAbstracts)(front, body, createElement);
     (0, jats_transformations_1.createBackmatter)(doc, body, sectionCategories, createElement);

package/dist/cjs/version.js

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

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

@@ -483,7 +483,7 @@ export class JATSDOMParser {
             {
                 tag: 'caption',
                 node: 'figcaption',
-                context: 'figure_element/|table_element/|embed/|supplement/',
+                context: 'figure_element/|table_element/|embed/|supplement/|box_element/',
                 getContent: (node, schema) => {
                     const element = node;
                     const content = [];
@@ -810,7 +810,7 @@ export class JATSDOMParser {
                 node: 'backmatter',
             },
             {
-                tag: 'sec[sec-type="box-element"]',
+                tag: 'boxed-text',
                 node: 'box_element',
                 getAttrs: (node) => {
                     const element = node;
@@ -887,10 +887,6 @@ export class JATSDOMParser {
                 context: 'keyword_group//',
                 node: 'keyword',
             },
-            {
-                tag: 'boxed-text',
-                ignore: true,
-            },
             {
                 tag: 'label',
                 context: 'section/',

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

@@ -24,7 +24,7 @@ const createSectionGroup = (type, createElement) => {
     return sec;
 };
 export const addMissingCaptions = (doc, createElement) => {
-    const elements = doc.querySelectorAll('fig, table-wrap, media, supplementary-material');
+    const elements = doc.querySelectorAll('fig, table-wrap, media, supplementary-material, boxed-text');
     for (const element of elements) {
         let caption = element.querySelector('caption');
         if (!caption) {
@@ -36,11 +36,20 @@ export const addMissingCaptions = (doc, createElement) => {
         if (!caption.querySelector('title')) {
             caption.prepend(createElement('title'));
         }
-        if (!caption.querySelector('p')) {
+        if (!caption.querySelector('p') && element.nodeName !== 'boxed-text') {
             caption.appendChild(createElement('p'));
         }
     }
 };
+export const createBoxedElementSection = (doc, createElement) => {
+    const boxedTexts = doc.querySelectorAll('boxed-text');
+    for (const boxedText of boxedTexts) {
+        const containerSec = createElement('sec');
+        const children = Array.from(boxedText.children).filter((child) => child.localName !== 'label' && child.localName !== 'caption');
+        containerSec.append(...children);
+        boxedText.appendChild(containerSec);
+    }
+};
 export const createTitles = (front, createElement) => {
     const titles = createElement('titles');
     let title = front.querySelector('article-meta > title-group > article-title');
@@ -115,29 +124,6 @@ export const moveHeroImage = (doc) => {
         doc.documentElement.appendChild(heroImage);
     }
 };
-export const createBoxedElementSection = (body, createElement) => {
-    const boxedTexts = body.querySelectorAll('boxed-text');
-    for (const boxedText of boxedTexts) {
-        const boxElementId = boxedText.getAttribute('id');
-        const boxElementSec = createElement('sec');
-        boxElementSec.setAttribute('sec-type', 'box-element');
-        if (boxElementId) {
-            boxElementSec.setAttribute('id', boxElementId);
-        }
-        const title = createElement('title');
-        title.textContent = 'BoxElement';
-        boxElementSec.append(title);
-        for (const element of [...boxedText.children]) {
-            if (element?.tagName === 'label' || element?.tagName === 'caption') {
-                boxElementSec.append(element);
-            }
-        }
-        const containerSection = createElement('sec');
-        containerSection.append(...boxedText.children);
-        boxElementSec.append(containerSection);
-        boxedText.replaceWith(boxElementSec);
-    }
-};
 export const createBody = (doc, body, createElement) => {
     const group = createSectionGroup('body', createElement);
     const elements = body.querySelectorAll(':scope > *:not(sec), :scope > sec:not([sec-type="backmatter"]), :scope > sec:not([sec-type])');

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

@@ -27,6 +27,7 @@ const processJATS = (doc, sectionCategories) => {
         return;
     }
     addMissingCaptions(doc, createElement);
+    createBoxedElementSection(doc, createElement);
     createTitles(front, createElement);
     moveContributors(front, createElement);
     moveAffiliations(front, createElement);
@@ -42,7 +43,6 @@ const processJATS = (doc, sectionCategories) => {
         article.append(body);
     }
     moveCaptionsToEnd(body);
-    createBoxedElementSection(body, createElement);
     createBody(doc, body, createElement);
     createAbstracts(front, body, createElement);
     createBackmatter(doc, body, sectionCategories, createElement);

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "4.3.8";
+export const VERSION = "4.3.10";

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

@@ -16,6 +16,7 @@
 import { SectionCategory } from '../../schema';
 export type CreateElement = (tagName: string) => HTMLElement;
 export declare const addMissingCaptions: (doc: Document, createElement: CreateElement) => void;
+export declare const createBoxedElementSection: (doc: Document, createElement: CreateElement) => void;
 export declare const createTitles: (front: Element, createElement: CreateElement) => void;
 export declare const moveAuthorNotes: (front: Element, createElement: CreateElement) => void;
 export declare const moveAwards: (front: Element) => void;
@@ -23,7 +24,6 @@ export declare const moveContributors: (front: Element, createElement: CreateEle
 export declare const moveAffiliations: (front: Element, createElement: CreateElement) => void;
 export declare const moveAbstracts: (front: Element, group: Element, createElement: CreateElement) => void;
 export declare const moveHeroImage: (doc: Document) => void;
-export declare const createBoxedElementSection: (body: Element, createElement: (tagName: string) => HTMLElement) => void;
 export declare const createBody: (doc: Document, body: Element, createElement: CreateElement) => void;
 export declare const createAbstracts: (front: Element, body: Element, createElement: CreateElement) => void;
 export declare const createBackmatter: (doc: Document, body: Element, sectionCategories: SectionCategory[], createElement: CreateElement) => void;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.3.8";
+export declare const VERSION = "4.3.10";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "4.3.8",
+  "version": "4.3.10",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -44,6 +44,8 @@
     "@babel/core": "7.23.7",
     "@babel/preset-env": "7.23.8",
     "@babel/preset-typescript": "7.23.3",
+    "@eslint/eslintrc": "3.3.1",
+    "@eslint/js": "9.39.1",
     "@jats4r/dtds": "0.0.10",
     "@manuscripts/eslint-config": "0.5.1",
     "@types/jest": "30.0.0",
@@ -53,29 +55,30 @@
     "@types/semver": "7.7.0",
     "@types/uuid": "9.0.8",
     "@types/w3c-xmlserializer": "2.0.4",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
+    "@typescript-eslint/eslint-plugin": "8.46.4",
+    "@typescript-eslint/parser": "8.46.4",
     "babel-jest": "30.0.5",
-    "eslint": "8.57.1",
-    "eslint-config-prettier": "8.10.0",
+    "eslint": "9.39.1",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-diff": "2.0.3",
     "eslint-plugin-header": "3.1.1",
-    "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-jest": "27.9.0",
+    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-jest": "29.1.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-mdx": "2.3.4",
+    "eslint-plugin-mdx": "3.6.2",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-promise": "6.6.0",
+    "eslint-plugin-prettier": "5.5.4",
+    "eslint-plugin-promise": "7.2.1",
     "eslint-plugin-react": "7.37.5",
-    "eslint-plugin-react-hooks": "4.6.2",
-    "eslint-plugin-simple-import-sort": "8.0.0",
+    "eslint-plugin-react-hooks": "7.0.1",
+    "eslint-plugin-simple-import-sort": "12.1.1",
     "husky": "8.0.3",
     "jest": "30.0.5",
     "jest-environment-jsdom": "30.0.5",
     "libxmljs2": "0.35.0",
     "migration-base": "npm:@manuscripts/transform@2.3.20",
     "npm-run-all": "4.1.5",
-    "prettier": "2.8.8",
+    "prettier": "3.6.2",
     "prosemirror-state": "1.4.3",
     "prosemirror-view": "1.39.2",
     "rimraf": "6.0.1",