@manuscripts/transform 3.0.40 → 3.0.41-LEAN-4310.1

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

@@ -797,7 +797,9 @@ class JATSExporter {
                     const attrs = {
                         id: normalizeID(node.attrs.id),
                     };
-                    attrs['sec-type'] = 'abstract-graphical';
+                    if (node.attrs.category) {
+                        attrs['sec-type'] = node.attrs.category;
+                    }
                     return ['sec', attrs, 0];
                 },
                 section: (node) => {
@@ -1361,45 +1363,13 @@ class JATSExporter {
             }
         };
         this.moveAbstracts = (front, body) => {
+            var _a;
             const container = body.querySelector(':scope > sec[sec-type="abstracts"]');
-            let abstractSections;
-            if (container) {
-                abstractSections = Array.from(container.querySelectorAll(':scope > sec'));
-            }
-            else {
-                abstractSections = Array.from(body.querySelectorAll(':scope > sec')).filter((section) => {
-                    const sectionType = section.getAttribute('sec-type');
-                    if (sectionType === 'abstract' ||
-                        sectionType === 'abstract-teaser' ||
-                        sectionType === 'abstract-graphical') {
-                        return true;
-                    }
-                    const sectionTitle = section.querySelector(':scope > title');
-                    if (!sectionTitle) {
-                        return false;
-                    }
-                    return sectionTitle.textContent === 'Abstract';
-                });
-            }
+            const abstractsNode = (_a = (0, prosemirror_utils_1.findChildrenByType)(this.manuscriptNode, schema_1.schema.nodes.abstracts)[0]) === null || _a === void 0 ? void 0 : _a.node;
+            const abstractCategories = this.getAbstractCategories(abstractsNode);
+            const abstractSections = this.getAbstractSections(container, body, abstractCategories);
             if (abstractSections.length) {
-                for (const abstractSection of abstractSections) {
-                    const abstractNode = this.document.createElement('abstract');
-                    for (const node of abstractSection.childNodes) {
-                        if (node.nodeName !== 'title') {
-                            abstractNode.appendChild(node.cloneNode(true));
-                        }
-                    }
-                    const sectionType = abstractSection.getAttribute('sec-type');
-                    if (sectionType && sectionType !== 'abstract') {
-                        const [, abstractType] = sectionType.split('-', 2);
-                        abstractNode.setAttribute('abstract-type', abstractType);
-                    }
-                    abstractSection.remove();
-                    const articleMeta = front.querySelector(':scope > article-meta');
-                    if (articleMeta) {
-                        insertAbstractNode(articleMeta, abstractNode);
-                    }
-                }
+                this.processAbstractSections(abstractSections, front);
             }
             if (container) {
                 body.removeChild(container);
@@ -1594,6 +1564,54 @@ class JATSExporter {
             articleMeta.appendChild(kwdGroup);
         });
     }
+    getAbstractCategories(abstractsNode) {
+        const categories = [];
+        abstractsNode === null || abstractsNode === void 0 ? void 0 : abstractsNode.content.descendants((node) => {
+            categories.push(node.attrs.category);
+            return false;
+        });
+        return categories;
+    }
+    getAbstractSections(container, body, abstractCategories) {
+        if (container) {
+            return Array.from(container.querySelectorAll(':scope > sec'));
+        }
+        else {
+            const sections = Array.from(body.querySelectorAll(':scope > sec'));
+            return sections.filter((section) => this.isAbstractSection(section, abstractCategories));
+        }
+    }
+    isAbstractSection(section, abstractCategories) {
+        const sectionType = section.getAttribute('sec-type');
+        return sectionType ? abstractCategories.includes(sectionType) : false;
+    }
+    processAbstractSections(abstractSections, front) {
+        for (const abstractSection of abstractSections) {
+            const abstractNode = this.createAbstractNode(abstractSection);
+            abstractSection.remove();
+            const articleMeta = front.querySelector(':scope > article-meta');
+            if (articleMeta) {
+                insertAbstractNode(articleMeta, abstractNode);
+            }
+        }
+    }
+    createAbstractNode(abstractSection) {
+        const abstractNode = this.document.createElement('abstract');
+        for (const node of abstractSection.childNodes) {
+            if (node.nodeName !== 'title') {
+                abstractNode.appendChild(node.cloneNode(true));
+            }
+        }
+        this.setAbstractType(abstractNode, abstractSection);
+        return abstractNode;
+    }
+    setAbstractType(abstractNode, abstractSection) {
+        const sectionType = abstractSection.getAttribute('sec-type');
+        if (sectionType && sectionType !== 'abstract') {
+            const abstractType = sectionType.replace('abstract-', '');
+            abstractNode.setAttribute('abstract-type', abstractType);
+        }
+    }
     moveCoiStatementToAuthorNotes(back, front) {
         const fnGroups = back.querySelectorAll('fn-group');
         fnGroups.forEach((fnGroup) => {

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

@@ -790,6 +790,22 @@ class JATSDOMParser {
             {
                 tag: 'sec[sec-type="abstract-graphical"]',
                 node: 'graphical_abstract_section',
+                getAttrs: (node) => {
+                    const element = node;
+                    return {
+                        category: this.chooseSectionCategory(element),
+                    };
+                },
+            },
+            {
+                tag: 'sec[sec-type="abstract-key-image"]',
+                node: 'graphical_abstract_section',
+                getAttrs: (node) => {
+                    const element = node;
+                    return {
+                        category: this.chooseSectionCategory(element),
+                    };
+                },
             },
             {
                 tag: 'sec',
@@ -987,7 +1003,8 @@ class JATSDOMParser {
         return this.parser.parse(doc, options);
     }
     isMatchingCategory(secType, titleNode, category) {
-        if (secType && category.synonyms.includes(secType)) {
+        if ((secType && category.synonyms.includes(secType)) ||
+            category.id === secType) {
             return true;
         }
         if (titleNode && titleNode.nodeName === 'title' && titleNode.textContent) {

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

@@ -218,7 +218,7 @@ const createAbstractSection = (abstract, createElement) => {
     if (!abstract.querySelector(':scope > title')) {
         const title = createElement('title');
         title.textContent = abstractType
-            ? `${capitalizeFirstLetter(abstractType)} Abstract`
+            ? `${capitalizeFirstLetter(abstractType.split('-').join(' '))} Abstract`
             : 'Abstract';
         section.appendChild(title);
     }

package/dist/cjs/lib/section-categories.js

@@ -15,6 +15,11 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGroupCateogries = void 0;
-const getGroupCateogries = (sectionsMap, group) => Array.from(sectionsMap.values()).filter((section) => section.group === group);
-exports.getGroupCateogries = getGroupCateogries;
+exports.getGroupCategories = void 0;
+const getGroupCategories = (sections, group) => {
+    const sectionsArray = Array.isArray(sections)
+        ? sections
+        : Array.from(sections.values());
+    return sectionsArray.filter((section) => section.group === group);
+};
+exports.getGroupCategories = getGroupCategories;

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

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Migration3038 {
+    constructor() {
+        this.fromVersion = '3.0.37';
+        this.toVersion = '3.0.38';
+    }
+    migrateNode(node) {
+        if (node.type === 'graphical_abstract_section') {
+            return Object.assign(Object.assign({}, node), { attrs: Object.assign(Object.assign({}, node.attrs), { category: 'abstract-graphical' }) });
+        }
+        return node;
+    }
+}
+exports.default = Migration3038;

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

@@ -24,6 +24,7 @@ const _3_0_12_1 = require("./3.0.12");
 const _3_0_21_1 = __importDefault(require("./3.0.21"));
 const _3_0_30_1 = __importDefault(require("./3.0.30"));
 const _3_0_31_1 = __importDefault(require("./3.0.31"));
+const _3_0_38_1 = __importDefault(require("./3.0.38"));
 const migrations = [
     new _1_2_5_1.default(),
     new _2_3_22_1.default(),
@@ -31,5 +32,6 @@ const migrations = [
     new _3_0_21_1.default(),
     new _3_0_30_1.default(),
     new _3_0_31_1.default(),
+    new _3_0_38_1.default(),
 ];
 exports.default = migrations;

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

@@ -21,6 +21,7 @@ exports.graphicalAbstractSection = {
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },
+        category: { default: '' },
     },
     group: 'block sections',
     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.40";
+exports.VERSION = "3.0.41-LEAN-4310.1";

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

@@ -789,7 +789,9 @@ export class JATSExporter {
                     const attrs = {
                         id: normalizeID(node.attrs.id),
                     };
-                    attrs['sec-type'] = 'abstract-graphical';
+                    if (node.attrs.category) {
+                        attrs['sec-type'] = node.attrs.category;
+                    }
                     return ['sec', attrs, 0];
                 },
                 section: (node) => {
@@ -1353,45 +1355,13 @@ export class JATSExporter {
             }
         };
         this.moveAbstracts = (front, body) => {
+            var _a;
             const container = body.querySelector(':scope > sec[sec-type="abstracts"]');
-            let abstractSections;
-            if (container) {
-                abstractSections = Array.from(container.querySelectorAll(':scope > sec'));
-            }
-            else {
-                abstractSections = Array.from(body.querySelectorAll(':scope > sec')).filter((section) => {
-                    const sectionType = section.getAttribute('sec-type');
-                    if (sectionType === 'abstract' ||
-                        sectionType === 'abstract-teaser' ||
-                        sectionType === 'abstract-graphical') {
-                        return true;
-                    }
-                    const sectionTitle = section.querySelector(':scope > title');
-                    if (!sectionTitle) {
-                        return false;
-                    }
-                    return sectionTitle.textContent === 'Abstract';
-                });
-            }
+            const abstractsNode = (_a = findChildrenByType(this.manuscriptNode, schema.nodes.abstracts)[0]) === null || _a === void 0 ? void 0 : _a.node;
+            const abstractCategories = this.getAbstractCategories(abstractsNode);
+            const abstractSections = this.getAbstractSections(container, body, abstractCategories);
             if (abstractSections.length) {
-                for (const abstractSection of abstractSections) {
-                    const abstractNode = this.document.createElement('abstract');
-                    for (const node of abstractSection.childNodes) {
-                        if (node.nodeName !== 'title') {
-                            abstractNode.appendChild(node.cloneNode(true));
-                        }
-                    }
-                    const sectionType = abstractSection.getAttribute('sec-type');
-                    if (sectionType && sectionType !== 'abstract') {
-                        const [, abstractType] = sectionType.split('-', 2);
-                        abstractNode.setAttribute('abstract-type', abstractType);
-                    }
-                    abstractSection.remove();
-                    const articleMeta = front.querySelector(':scope > article-meta');
-                    if (articleMeta) {
-                        insertAbstractNode(articleMeta, abstractNode);
-                    }
-                }
+                this.processAbstractSections(abstractSections, front);
             }
             if (container) {
                 body.removeChild(container);
@@ -1586,6 +1556,54 @@ export class JATSExporter {
             articleMeta.appendChild(kwdGroup);
         });
     }
+    getAbstractCategories(abstractsNode) {
+        const categories = [];
+        abstractsNode === null || abstractsNode === void 0 ? void 0 : abstractsNode.content.descendants((node) => {
+            categories.push(node.attrs.category);
+            return false;
+        });
+        return categories;
+    }
+    getAbstractSections(container, body, abstractCategories) {
+        if (container) {
+            return Array.from(container.querySelectorAll(':scope > sec'));
+        }
+        else {
+            const sections = Array.from(body.querySelectorAll(':scope > sec'));
+            return sections.filter((section) => this.isAbstractSection(section, abstractCategories));
+        }
+    }
+    isAbstractSection(section, abstractCategories) {
+        const sectionType = section.getAttribute('sec-type');
+        return sectionType ? abstractCategories.includes(sectionType) : false;
+    }
+    processAbstractSections(abstractSections, front) {
+        for (const abstractSection of abstractSections) {
+            const abstractNode = this.createAbstractNode(abstractSection);
+            abstractSection.remove();
+            const articleMeta = front.querySelector(':scope > article-meta');
+            if (articleMeta) {
+                insertAbstractNode(articleMeta, abstractNode);
+            }
+        }
+    }
+    createAbstractNode(abstractSection) {
+        const abstractNode = this.document.createElement('abstract');
+        for (const node of abstractSection.childNodes) {
+            if (node.nodeName !== 'title') {
+                abstractNode.appendChild(node.cloneNode(true));
+            }
+        }
+        this.setAbstractType(abstractNode, abstractSection);
+        return abstractNode;
+    }
+    setAbstractType(abstractNode, abstractSection) {
+        const sectionType = abstractSection.getAttribute('sec-type');
+        if (sectionType && sectionType !== 'abstract') {
+            const abstractType = sectionType.replace('abstract-', '');
+            abstractNode.setAttribute('abstract-type', abstractType);
+        }
+    }
     moveCoiStatementToAuthorNotes(back, front) {
         const fnGroups = back.querySelectorAll('fn-group');
         fnGroups.forEach((fnGroup) => {

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

@@ -787,6 +787,22 @@ export class JATSDOMParser {
             {
                 tag: 'sec[sec-type="abstract-graphical"]',
                 node: 'graphical_abstract_section',
+                getAttrs: (node) => {
+                    const element = node;
+                    return {
+                        category: this.chooseSectionCategory(element),
+                    };
+                },
+            },
+            {
+                tag: 'sec[sec-type="abstract-key-image"]',
+                node: 'graphical_abstract_section',
+                getAttrs: (node) => {
+                    const element = node;
+                    return {
+                        category: this.chooseSectionCategory(element),
+                    };
+                },
             },
             {
                 tag: 'sec',
@@ -984,7 +1000,8 @@ export class JATSDOMParser {
         return this.parser.parse(doc, options);
     }
     isMatchingCategory(secType, titleNode, category) {
-        if (secType && category.synonyms.includes(secType)) {
+        if ((secType && category.synonyms.includes(secType)) ||
+            category.id === secType) {
             return true;
         }
         if (titleNode && titleNode.nodeName === 'title' && titleNode.textContent) {

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

@@ -203,7 +203,7 @@ const createAbstractSection = (abstract, createElement) => {
     if (!abstract.querySelector(':scope > title')) {
         const title = createElement('title');
         title.textContent = abstractType
-            ? `${capitalizeFirstLetter(abstractType)} Abstract`
+            ? `${capitalizeFirstLetter(abstractType.split('-').join(' '))} Abstract`
             : 'Abstract';
         section.appendChild(title);
     }

package/dist/es/lib/section-categories.js

@@ -13,4 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const getGroupCateogries = (sectionsMap, group) => Array.from(sectionsMap.values()).filter((section) => section.group === group);
+export const getGroupCategories = (sections, group) => {
+    const sectionsArray = Array.isArray(sections)
+        ? sections
+        : Array.from(sections.values());
+    return sectionsArray.filter((section) => section.group === group);
+};

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

@@ -0,0 +1,13 @@
+class Migration3038 {
+    constructor() {
+        this.fromVersion = '3.0.37';
+        this.toVersion = '3.0.38';
+    }
+    migrateNode(node) {
+        if (node.type === 'graphical_abstract_section') {
+            return Object.assign(Object.assign({}, node), { attrs: Object.assign(Object.assign({}, node.attrs), { category: 'abstract-graphical' }) });
+        }
+        return node;
+    }
+}
+export default Migration3038;

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

@@ -19,6 +19,7 @@ import { Migration3012 } from './3.0.12';
 import Migration3021 from './3.0.21';
 import Migration3030 from './3.0.30';
 import Migration3031 from './3.0.31';
+import Migration3038 from './3.0.38';
 const migrations = [
     new Migration125(),
     new Migration2322(),
@@ -26,5 +27,6 @@ const migrations = [
     new Migration3021(),
     new Migration3030(),
     new Migration3031(),
+    new Migration3038(),
 ];
 export default migrations;

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

@@ -18,6 +18,7 @@ export const graphicalAbstractSection = {
     attrs: {
         id: { default: '' },
         dataTracked: { default: null },
+        category: { default: '' },
     },
     group: 'block sections',
     selectable: false,

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.40";
+export const VERSION = "3.0.41-LEAN-4310.1";

package/dist/types/jats/exporter/jats-exporter.d.ts

@@ -88,6 +88,12 @@ export declare class JATSExporter {
     private removeBackContainer;
     private moveAwards;
     private moveAbstracts;
+    private getAbstractCategories;
+    private getAbstractSections;
+    private isAbstractSection;
+    private processAbstractSections;
+    private createAbstractNode;
+    private setAbstractType;
     private moveSectionsToBack;
     sectionToFootnote: (section: Element, fnType: string) => HTMLElement;
     private moveFloatsGroup;

package/dist/types/lib/section-categories.d.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 import { SectionCategory, SectionGroup } from '../schema';
-export declare const getGroupCateogries: (sectionsMap: Map<string, SectionCategory>, group: SectionGroup) => SectionCategory[];
+export declare const getGroupCategories: (sections: Map<string, SectionCategory> | SectionCategory[], group: SectionGroup) => SectionCategory[];

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

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

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

@@ -19,5 +19,6 @@ import { Migration3012 } from './3.0.12';
 import Migration3021 from './3.0.21';
 import Migration3030 from './3.0.30';
 import Migration3031 from './3.0.31';
-declare const migrations: (Migration125 | Migration2322 | Migration3012 | Migration3021 | Migration3030 | Migration3031)[];
+import Migration3038 from './3.0.38';
+declare const migrations: (Migration125 | Migration2322 | Migration3012 | Migration3021 | Migration3030 | Migration3031 | Migration3038)[];
 export default migrations;

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

@@ -15,12 +15,12 @@
  */
 import { NodeSpec } from 'prosemirror-model';
 import { ManuscriptNode } from '../types';
-interface Attrs {
+export interface GraphicalAbstractSectionAttrs {
     id: string;
+    category: string;
 }
 export interface GraphicalAbstractSectionNode extends ManuscriptNode {
-    attrs: Attrs;
+    attrs: GraphicalAbstractSectionAttrs;
 }
 export declare const graphicalAbstractSection: NodeSpec;
 export declare const isGraphicalAbstractSectionNode: (node: ManuscriptNode) => node is GraphicalAbstractSectionNode;
-export {};

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

@@ -43,7 +43,7 @@ export type DataTrackedAttrs = {
     userID: string;
     createdAt: number;
 };
-export type SectionGroup = 'abstracts' | 'body' | 'backmatter';
+export type SectionGroup = 'abstracts' | 'body' | 'backmatter' | 'abstracts-graphic';
 export type SectionCategory = {
     id: string;
     synonyms: string[];

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.40";
+export declare const VERSION = "3.0.41-LEAN-4310.1";

package/package.json

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