@manuscripts/transform 3.0.55 → 3.0.56

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

@@ -563,14 +563,20 @@ class JATSExporter {
         this.createSerializer = () => {
             const nodes = {
                 alt_text: (node) => {
-                    const altText = this.createElement('alt-text');
-                    altText.textContent = node.textContent;
-                    return altText;
+                    if (node.textContent) {
+                        const altText = this.createElement('alt-text');
+                        altText.textContent = node.textContent;
+                        return altText;
+                    }
+                    return '';
                 },
                 long_desc: (node) => {
-                    const longDesc = this.createElement('long-desc');
-                    longDesc.textContent = node.textContent;
-                    return longDesc;
+                    if (node.textContent) {
+                        const longDesc = this.createElement('long-desc');
+                        longDesc.textContent = node.textContent;
+                        return longDesc;
+                    }
+                    return '';
                 },
                 attachment: () => '',
                 attachments: () => '',

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.moveAccessibilityItems = 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.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.createBoxedElementSection = exports.moveAbstracts = exports.moveAffiliations = exports.moveContributors = exports.moveAwards = exports.moveAuthorNotes = exports.createTitles = 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);
@@ -341,14 +341,17 @@ const createSupplementaryMaterialsSection = (document, body, createElement) => {
     }
 };
 exports.createSupplementaryMaterialsSection = createSupplementaryMaterialsSection;
-const moveAccessibilityItems = (doc) => {
-    const items = doc.querySelectorAll('alt-text, long-desc');
-    items.forEach((item) => {
-        var _a;
-        (_a = item.parentNode) === null || _a === void 0 ? void 0 : _a.appendChild(item);
+const createAccessibilityItems = (doc, createElement) => {
+    doc
+        .querySelectorAll('media, fig, table-wrap, graphic:not(fig graphic)')
+        .forEach((item) => {
+        const altText = item.querySelector('alt-text') || createElement('alt-text');
+        const longDesc = item.querySelector('long-desc') || createElement('long-desc');
+        item === null || item === void 0 ? void 0 : item.appendChild(altText);
+        item === null || item === void 0 ? void 0 : item.appendChild(longDesc);
     });
 };
-exports.moveAccessibilityItems = moveAccessibilityItems;
+exports.createAccessibilityItems = createAccessibilityItems;
 const moveReferencesToBackmatter = (body, back, createElement) => {
     const backmatter = body.querySelector('sec[sec-type="backmatter"]');
     const refList = back.querySelector('ref-list');

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

@@ -54,7 +54,7 @@ const processJATS = (doc, sectionCategories) => {
         return;
     }
     (0, jats_transformations_1.moveReferencesToBackmatter)(body, back, createElement);
-    (0, jats_transformations_1.moveAccessibilityItems)(doc);
+    (0, jats_transformations_1.createAccessibilityItems)(doc, createElement);
 };
 const createElementFn = (doc) => (tagName) => doc.createElement(tagName);
 const parseJATSArticle = (doc, sectionCategories, template) => {

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

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const transformer_1 = require("../../../transformer");
+const index_1 = require("../../index");
+class Migration3056 {
+    constructor() {
+        this.fromVersion = '3.0.55';
+        this.toVersion = '3.0.66';
+    }
+    migrateNode(node) {
+        const targetNodeTypes = [
+            'figure_element',
+            'table_element',
+            'image_element',
+            'figure',
+            'embed',
+        ];
+        const content = node.content;
+        if (!targetNodeTypes.includes(node.type) || !content) {
+            return node;
+        }
+        if (!content.some((node) => node.type === 'alt_text')) {
+            this.addAltText(node, content);
+        }
+        if (!content.some((node) => node.type === 'long_desc')) {
+            this.addLongDesc(content);
+        }
+        return node;
+    }
+    addAltText(node, content) {
+        const altText = index_1.schema.nodes.alt_text
+            .create({
+            id: (0, transformer_1.generateNodeID)(index_1.schema.nodes.alt_text),
+        })
+            .toJSON();
+        switch (node.type) {
+            case 'image_element':
+                if (content.some((n) => n.type === 'long_desc')) {
+                    const longDescIndex = content.findIndex((n) => n.type === 'long_desc');
+                    content.splice(longDescIndex, 0, altText);
+                }
+                else {
+                    content.push(altText);
+                }
+                break;
+            case 'figure_element':
+            case 'embed': {
+                const figCaption = content.findIndex((n) => n.type === 'figcaption');
+                if (figCaption !== -1) {
+                    content.splice(figCaption + 1, 0, altText);
+                }
+                break;
+            }
+            case 'table_element': {
+                const elementTypes = [
+                    'table_element_footer',
+                    'col_group',
+                    'table',
+                    'placeholder',
+                ];
+                for (const type of elementTypes) {
+                    const index = content.findIndex((n) => n.type === type);
+                    if (index !== -1) {
+                        content.splice(index + 1, 0, altText);
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+    }
+    addLongDesc(content) {
+        const altTextIndex = content.findIndex((n) => n.type === 'alt_text');
+        if (altTextIndex !== -1) {
+            content.splice(altTextIndex + 1, 0, index_1.schema.nodes.long_desc
+                .create({
+                id: (0, transformer_1.generateNodeID)(index_1.schema.nodes.long_desc),
+            })
+                .toJSON());
+        }
+    }
+}
+exports.default = Migration3056;

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

@@ -26,6 +26,7 @@ const _3_0_30_1 = __importDefault(require("./3.0.30"));
 const _3_0_31_1 = __importDefault(require("./3.0.31"));
 const _3_0_41_1 = __importDefault(require("./3.0.41"));
 const _3_0_55_1 = __importDefault(require("./3.0.55"));
+const _3_0_56_1 = __importDefault(require("./3.0.56"));
 const migrations = [
     new _1_2_5_1.default(),
     new _2_3_22_1.default(),
@@ -35,5 +36,6 @@ const migrations = [
     new _3_0_31_1.default(),
     new _3_0_41_1.default(),
     new _3_0_55_1.default(),
+    new _3_0_56_1.default(),
 ];
 exports.default = migrations;

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isEmbedNode = exports.embed = void 0;
 exports.embed = {
-    content: 'figcaption alt_text? long_desc?',
+    content: 'figcaption alt_text long_desc',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isFigureElementNode = exports.figureElement = void 0;
 exports.figureElement = {
-    content: '(paragraph | figure | missing_figure | placeholder)+ attribution*  figcaption alt_text? long_desc? (listing | placeholder)',
+    content: '(paragraph | figure | missing_figure | placeholder)+ attribution*  figcaption alt_text long_desc (listing | placeholder)',
     attrs: {
         id: { default: '' },
         attribution: { default: undefined },

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isImageElementNode = exports.imageElement = void 0;
 exports.imageElement = {
-    content: 'figure? alt_text? long_desc?',
+    content: 'figure? alt_text long_desc',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTableElementNode = exports.tableElement = void 0;
 exports.tableElement = {
-    content: 'figcaption?  (table | placeholder) table_colgroup? table_element_footer? alt_text? long_desc? (listing | placeholder)',
+    content: 'figcaption?  (table | placeholder) table_colgroup? table_element_footer? alt_text long_desc (listing | placeholder)',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

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.55";
+exports.VERSION = "3.0.56";

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

@@ -555,14 +555,20 @@ export class JATSExporter {
         this.createSerializer = () => {
             const nodes = {
                 alt_text: (node) => {
-                    const altText = this.createElement('alt-text');
-                    altText.textContent = node.textContent;
-                    return altText;
+                    if (node.textContent) {
+                        const altText = this.createElement('alt-text');
+                        altText.textContent = node.textContent;
+                        return altText;
+                    }
+                    return '';
                 },
                 long_desc: (node) => {
-                    const longDesc = this.createElement('long-desc');
-                    longDesc.textContent = node.textContent;
-                    return longDesc;
+                    if (node.textContent) {
+                        const longDesc = this.createElement('long-desc');
+                        longDesc.textContent = node.textContent;
+                        return longDesc;
+                    }
+                    return '';
                 },
                 attachment: () => '',
                 attachments: () => '',

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

@@ -324,11 +324,14 @@ export const createSupplementaryMaterialsSection = (document, body, createElemen
         body.prepend(section);
     }
 };
-export const moveAccessibilityItems = (doc) => {
-    const items = doc.querySelectorAll('alt-text, long-desc');
-    items.forEach((item) => {
-        var _a;
-        (_a = item.parentNode) === null || _a === void 0 ? void 0 : _a.appendChild(item);
+export const createAccessibilityItems = (doc, createElement) => {
+    doc
+        .querySelectorAll('media, fig, table-wrap, graphic:not(fig graphic)')
+        .forEach((item) => {
+        const altText = item.querySelector('alt-text') || createElement('alt-text');
+        const longDesc = item.querySelector('long-desc') || createElement('long-desc');
+        item === null || item === void 0 ? void 0 : item.appendChild(altText);
+        item === null || item === void 0 ? void 0 : item.appendChild(longDesc);
     });
 };
 export const moveReferencesToBackmatter = (body, back, createElement) => {

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 { addMissingCaptions, createAbstracts, createAttachments, createBackmatter, createBody, createBoxedElementSection, createKeywordsSection, createSupplementaryMaterialsSection, createTitles, fixTables, moveAccessibilityItems, moveAffiliations, moveAuthorNotes, moveAwards, moveCaptionsToEnd, moveContributors, moveReferencesToBackmatter, orderTableFootnote, } from './jats-transformations';
+import { addMissingCaptions, createAbstracts, createAccessibilityItems, createAttachments, createBackmatter, createBody, createBoxedElementSection, createKeywordsSection, createSupplementaryMaterialsSection, createTitles, fixTables, moveAffiliations, moveAuthorNotes, moveAwards, moveCaptionsToEnd, moveContributors, moveReferencesToBackmatter, orderTableFootnote, } from './jats-transformations';
 const processJATS = (doc, sectionCategories) => {
     const createElement = createElementFn(doc);
     markComments(doc);
@@ -51,7 +51,7 @@ const processJATS = (doc, sectionCategories) => {
         return;
     }
     moveReferencesToBackmatter(body, back, createElement);
-    moveAccessibilityItems(doc);
+    createAccessibilityItems(doc, createElement);
 };
 const createElementFn = (doc) => (tagName) => doc.createElement(tagName);
 export const parseJATSArticle = (doc, sectionCategories, template) => {

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

@@ -0,0 +1,81 @@
+import { generateNodeID } from '../../../transformer';
+import { schema } from '../../index';
+class Migration3056 {
+    constructor() {
+        this.fromVersion = '3.0.55';
+        this.toVersion = '3.0.66';
+    }
+    migrateNode(node) {
+        const targetNodeTypes = [
+            'figure_element',
+            'table_element',
+            'image_element',
+            'figure',
+            'embed',
+        ];
+        const content = node.content;
+        if (!targetNodeTypes.includes(node.type) || !content) {
+            return node;
+        }
+        if (!content.some((node) => node.type === 'alt_text')) {
+            this.addAltText(node, content);
+        }
+        if (!content.some((node) => node.type === 'long_desc')) {
+            this.addLongDesc(content);
+        }
+        return node;
+    }
+    addAltText(node, content) {
+        const altText = schema.nodes.alt_text
+            .create({
+            id: generateNodeID(schema.nodes.alt_text),
+        })
+            .toJSON();
+        switch (node.type) {
+            case 'image_element':
+                if (content.some((n) => n.type === 'long_desc')) {
+                    const longDescIndex = content.findIndex((n) => n.type === 'long_desc');
+                    content.splice(longDescIndex, 0, altText);
+                }
+                else {
+                    content.push(altText);
+                }
+                break;
+            case 'figure_element':
+            case 'embed': {
+                const figCaption = content.findIndex((n) => n.type === 'figcaption');
+                if (figCaption !== -1) {
+                    content.splice(figCaption + 1, 0, altText);
+                }
+                break;
+            }
+            case 'table_element': {
+                const elementTypes = [
+                    'table_element_footer',
+                    'col_group',
+                    'table',
+                    'placeholder',
+                ];
+                for (const type of elementTypes) {
+                    const index = content.findIndex((n) => n.type === type);
+                    if (index !== -1) {
+                        content.splice(index + 1, 0, altText);
+                        break;
+                    }
+                }
+                break;
+            }
+        }
+    }
+    addLongDesc(content) {
+        const altTextIndex = content.findIndex((n) => n.type === 'alt_text');
+        if (altTextIndex !== -1) {
+            content.splice(altTextIndex + 1, 0, schema.nodes.long_desc
+                .create({
+                id: generateNodeID(schema.nodes.long_desc),
+            })
+                .toJSON());
+        }
+    }
+}
+export default Migration3056;

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

@@ -21,6 +21,7 @@ import Migration3030 from './3.0.30';
 import Migration3031 from './3.0.31';
 import Migration3041 from './3.0.41';
 import Migration3055 from './3.0.55';
+import Migration3056 from './3.0.56';
 const migrations = [
     new Migration125(),
     new Migration2322(),
@@ -30,5 +31,6 @@ const migrations = [
     new Migration3031(),
     new Migration3041(),
     new Migration3055(),
+    new Migration3056(),
 ];
 export default migrations;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const embed = {
-    content: 'figcaption alt_text? long_desc?',
+    content: 'figcaption alt_text long_desc',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const figureElement = {
-    content: '(paragraph | figure | missing_figure | placeholder)+ attribution*  figcaption alt_text? long_desc? (listing | placeholder)',
+    content: '(paragraph | figure | missing_figure | placeholder)+ attribution*  figcaption alt_text long_desc (listing | placeholder)',
     attrs: {
         id: { default: '' },
         attribution: { default: undefined },

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

@@ -1,5 +1,5 @@
 export const imageElement = {
-    content: 'figure? alt_text? long_desc?',
+    content: 'figure? alt_text long_desc',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const tableElement = {
-    content: 'figcaption?  (table | placeholder) table_colgroup? table_element_footer? alt_text? long_desc? (listing | placeholder)',
+    content: 'figcaption?  (table | placeholder) table_colgroup? table_element_footer? alt_text long_desc (listing | placeholder)',
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.55";
+export const VERSION = "3.0.56";

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

@@ -29,7 +29,7 @@ export declare const createBackmatter: (doc: Document, body: Element, sectionCat
 export declare const moveCaptionsToEnd: (body: Element) => void;
 export declare const createKeywordsSection: (document: Document, body: Element, createElement: CreateElement) => void;
 export declare const createSupplementaryMaterialsSection: (document: Document, body: Element, createElement: CreateElement) => void;
-export declare const moveAccessibilityItems: (doc: Document) => void;
+export declare const createAccessibilityItems: (doc: Document, createElement: CreateElement) => void;
 export declare const moveReferencesToBackmatter: (body: Element, back: Element, createElement: CreateElement) => void;
 export declare const orderTableFootnote: (doc: Document, body: Element) => void;
 export declare const createAttachments: (doc: Document, createElement: CreateElement) => void;

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

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

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

@@ -21,5 +21,6 @@ import Migration3030 from './3.0.30';
 import Migration3031 from './3.0.31';
 import Migration3041 from './3.0.41';
 import Migration3055 from './3.0.55';
-declare const migrations: (Migration125 | Migration2322 | Migration3012 | Migration3021 | Migration3030 | Migration3031 | Migration3041 | Migration3055)[];
+import Migration3056 from './3.0.56';
+declare const migrations: (Migration125 | Migration2322 | Migration3012 | Migration3021 | Migration3030 | Migration3031 | Migration3041 | Migration3055 | Migration3056)[];
 export default migrations;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.55";
+export declare const VERSION = "3.0.56";

package/package.json

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