@manuscripts/transform 4.2.11 → 4.2.13

package/dist/cjs/getVersion.js

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersion = void 0;
+exports.getVersion = getVersion;
 const version_1 = require("./version");
 function getVersion() {
     return version_1.VERSION;
 }
-exports.getVersion = getVersion;

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

@@ -30,13 +30,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

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

@@ -786,7 +786,7 @@ class JATSDOMParser {
                 getAttrs: (node) => {
                     const element = node;
                     return {
-                        lang: element.getAttribute('xml:lang') ?? '',
+                        lang: element.getAttributeNS(xml_1.XML_NAMESPACE, 'lang') ?? '',
                         category: this.chooseSectionCategory(element),
                     };
                 },
@@ -913,7 +913,7 @@ class JATSDOMParser {
             {
                 tag: 'title',
                 node: 'section_title',
-                context: 'section/|footnotes_section/|bibliography_section/|keywords/|supplements/|author_notes/|graphical_abstract_section/',
+                context: 'section/|footnotes_section/|bibliography_section/|keywords/|supplements/|author_notes/|graphical_abstract_section/|trans_abstract/',
             },
             {
                 tag: 'title',
@@ -1068,7 +1068,7 @@ class JATSDOMParser {
         return false;
     }
     chooseSectionCategory(section) {
-        const secType = section.getAttribute('sec-type') || section.getAttribute('abstract-type');
+        const secType = section.getAttribute('sec-type');
         const titleNode = section.firstElementChild;
         for (const category of this.sectionCategories) {
             if (this.isMatchingCategory(secType, titleNode, category)) {

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

@@ -17,6 +17,7 @@
 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;
 const deafults_1 = require("../../lib/deafults");
+const xml_1 = require("../../lib/xml");
 const jats_parser_utils_1 = require("./jats-parser-utils");
 const removeNodeFromParent = (node) => node.parentNode && node.parentNode.removeChild(node);
 const capitalizeFirstLetter = (str) => str.charAt(0).toUpperCase() + str.slice(1);
@@ -231,11 +232,14 @@ exports.moveCaptionsToEnd = moveCaptionsToEnd;
 const createAbstractSection = (abstract, createElement) => {
     const abstractType = abstract.getAttribute('abstract-type');
     const sectionType = abstractType ? `abstract-${abstractType}` : 'abstract';
+    let section = createElement('sec');
     if (abstract.nodeName === 'trans-abstract') {
-        abstract.setAttribute('abstract-type', sectionType);
-        return abstract;
+        section = createElement('trans-abstract');
+        const lang = abstract.getAttributeNS(xml_1.XML_NAMESPACE, 'lang');
+        if (lang) {
+            section.setAttributeNS(xml_1.XML_NAMESPACE, 'lang', lang);
+        }
     }
-    const section = createElement('sec');
     section.setAttribute('sec-type', sectionType);
     if (!abstract.querySelector(':scope > title')) {
         const title = createElement('title');

package/dist/cjs/lib/credit-roles.js

@@ -32,7 +32,7 @@ var CreditVocabTerm;
     CreditVocabTerm["Visualization"] = "Visualization";
     CreditVocabTerm["WritingOriginalDraft"] = "Writing \u2013 original draft";
     CreditVocabTerm["WritingReviewEditing"] = "Writing \u2013 review & editing";
-})(CreditVocabTerm = exports.CreditVocabTerm || (exports.CreditVocabTerm = {}));
+})(CreditVocabTerm || (exports.CreditVocabTerm = CreditVocabTerm = {}));
 exports.CreditRoleUrls = new Map([
     [
         CreditVocabTerm.Conceptualization,

package/dist/cjs/lib/utils.js

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCreditRole = exports.dateToTimestamp = exports.getHTMLContent = exports.getTrimmedTextContent = exports.findParentNodeClosestToPos = exports.isInBibliographySection = exports.isInGraphicalAbstractSection = exports.findNodePositions = exports.iterateChildren = void 0;
+exports.dateToTimestamp = exports.getHTMLContent = exports.getTrimmedTextContent = exports.findParentNodeClosestToPos = exports.isInBibliographySection = exports.isInGraphicalAbstractSection = exports.findNodePositions = void 0;
+exports.iterateChildren = iterateChildren;
+exports.getCreditRole = getCreditRole;
 const jats_parser_utils_1 = require("../jats/importer/jats-parser-utils");
 const schema_1 = require("../schema");
 const credit_roles_1 = require("./credit-roles");
@@ -30,7 +32,6 @@ function* iterateChildren(node, recurse = false) {
         }
     }
 }
-exports.iterateChildren = iterateChildren;
 const findNodePositions = (state, predicate) => {
     const found = [];
     state.doc.descendants((node, nodePos) => {
@@ -116,4 +117,3 @@ function getCreditRole(elem) {
     });
     return results;
 }
-exports.getCreditRole = getCreditRole;

package/dist/cjs/schema/__tests__/migration.test.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 const prevPackage = __importStar(require("migration-base"));
 const migrate_1 = require("../migration/migrate");

package/dist/cjs/schema/migration/migrate.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.migrateFor = void 0;
+exports.default = migrate;
+exports.migrateFor = migrateFor;
 const lodash_1 = require("lodash");
 const semver_1 = __importDefault(require("semver"));
 const __1 = require("..");
@@ -18,7 +19,6 @@ function migrate(oldDoc, migrationScript) {
     }
     return migrateNode(oldDoc);
 }
-exports.default = migrate;
 function migrateFor(oldDoc, baseVersion) {
     const migrationScripts = ensureVersionAscOrder();
     let migratedDoc = (0, lodash_1.cloneDeep)(oldDoc);
@@ -32,7 +32,6 @@ function migrateFor(oldDoc, baseVersion) {
     }
     return testDoc(migratedDoc, baseVersion);
 }
-exports.migrateFor = migrateFor;
 const ensureVersionAscOrder = () => migration_scripts_1.default.sort((a, b) => semver_1.default.compare(a.toVersion, b.toVersion));
 function testDoc(doc, fromVersion) {
     try {

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

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const __1 = require("../..");
+class Migration4213 {
+    constructor() {
+        this.fromVersion = '4.2.12';
+        this.toVersion = '4.2.13';
+    }
+    migrateNode(node) {
+        if (node.type === 'trans_abstract') {
+            const content = node.content || [];
+            const sectionTitleNode = __1.schema.nodes.section_title.create();
+            return {
+                ...node,
+                content: [sectionTitleNode.toJSON(), ...content],
+            };
+        }
+        return node;
+    }
+}
+exports.default = Migration4213;

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

@@ -27,6 +27,7 @@ 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 _4_2_13_1 = __importDefault(require("./4.2.13"));
 const migrations = [
     new _1_2_5_1.default(),
     new _2_3_22_1.default(),
@@ -37,5 +38,6 @@ const migrations = [
     new _3_0_41_1.default(),
     new _3_0_55_1.default(),
     new _3_0_56_1.default(),
+    new _4_2_13_1.default(),
 ];
 exports.default = migrations;

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

@@ -18,14 +18,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTransAbstractNode = exports.transAbstract = void 0;
 const index_1 = require("../index");
 exports.transAbstract = {
-    content: '(paragraph | element)* sections*',
+    content: 'section_title (paragraph | element)* sections*',
     attrs: {
         id: { default: '' },
         lang: { default: '' },
         category: { default: '' },
         dataTracked: { default: null },
     },
-    group: 'block element',
+    group: 'block sections',
     selectable: false,
     toDOM: (node) => {
         const { id, lang } = node.attrs;

package/dist/cjs/schema/types.js

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNodeOfType = void 0;
+exports.isNodeOfType = isNodeOfType;
 function isNodeOfType(node, type) {
     return node.type === type;
 }
-exports.isNodeOfType = isNodeOfType;

package/dist/cjs/version.js

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

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

@@ -783,7 +783,7 @@ export class JATSDOMParser {
                 getAttrs: (node) => {
                     const element = node;
                     return {
-                        lang: element.getAttribute('xml:lang') ?? '',
+                        lang: element.getAttributeNS(XML_NAMESPACE, 'lang') ?? '',
                         category: this.chooseSectionCategory(element),
                     };
                 },
@@ -910,7 +910,7 @@ export class JATSDOMParser {
             {
                 tag: 'title',
                 node: 'section_title',
-                context: 'section/|footnotes_section/|bibliography_section/|keywords/|supplements/|author_notes/|graphical_abstract_section/',
+                context: 'section/|footnotes_section/|bibliography_section/|keywords/|supplements/|author_notes/|graphical_abstract_section/|trans_abstract/',
             },
             {
                 tag: 'title',
@@ -1065,7 +1065,7 @@ export class JATSDOMParser {
         return false;
     }
     chooseSectionCategory(section) {
-        const secType = section.getAttribute('sec-type') || section.getAttribute('abstract-type');
+        const secType = section.getAttribute('sec-type');
         const titleNode = section.firstElementChild;
         for (const category of this.sectionCategories) {
             if (this.isMatchingCategory(secType, titleNode, category)) {

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

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { defaultTitle } from '../../lib/deafults';
+import { XML_NAMESPACE } from '../../lib/xml';
 import { htmlFromJatsNode } from './jats-parser-utils';
 const removeNodeFromParent = (node) => node.parentNode && node.parentNode.removeChild(node);
 const capitalizeFirstLetter = (str) => str.charAt(0).toUpperCase() + str.slice(1);
@@ -215,11 +216,14 @@ export const moveCaptionsToEnd = (body) => {
 const createAbstractSection = (abstract, createElement) => {
     const abstractType = abstract.getAttribute('abstract-type');
     const sectionType = abstractType ? `abstract-${abstractType}` : 'abstract';
+    let section = createElement('sec');
     if (abstract.nodeName === 'trans-abstract') {
-        abstract.setAttribute('abstract-type', sectionType);
-        return abstract;
+        section = createElement('trans-abstract');
+        const lang = abstract.getAttributeNS(XML_NAMESPACE, 'lang');
+        if (lang) {
+            section.setAttributeNS(XML_NAMESPACE, 'lang', lang);
+        }
     }
-    const section = createElement('sec');
     section.setAttribute('sec-type', sectionType);
     if (!abstract.querySelector(':scope > title')) {
         const title = createElement('title');

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

@@ -0,0 +1,19 @@
+import { schema } from '../..';
+class Migration4213 {
+    constructor() {
+        this.fromVersion = '4.2.12';
+        this.toVersion = '4.2.13';
+    }
+    migrateNode(node) {
+        if (node.type === 'trans_abstract') {
+            const content = node.content || [];
+            const sectionTitleNode = schema.nodes.section_title.create();
+            return {
+                ...node,
+                content: [sectionTitleNode.toJSON(), ...content],
+            };
+        }
+        return node;
+    }
+}
+export default Migration4213;

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

@@ -22,6 +22,7 @@ import Migration3031 from './3.0.31';
 import Migration3041 from './3.0.41';
 import Migration3055 from './3.0.55';
 import Migration3056 from './3.0.56';
+import Migration4213 from './4.2.13';
 const migrations = [
     new Migration125(),
     new Migration2322(),
@@ -32,5 +33,6 @@ const migrations = [
     new Migration3041(),
     new Migration3055(),
     new Migration3056(),
+    new Migration4213(),
 ];
 export default migrations;

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

@@ -15,14 +15,14 @@
  */
 import { schema } from '../index';
 export const transAbstract = {
-    content: '(paragraph | element)* sections*',
+    content: 'section_title (paragraph | element)* sections*',
     attrs: {
         id: { default: '' },
         lang: { default: '' },
         category: { default: '' },
         dataTracked: { default: null },
     },
-    group: 'block element',
+    group: 'block sections',
     selectable: false,
     toDOM: (node) => {
         const { id, lang } = node.attrs;

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "4.2.11";
+export const VERSION = "4.2.13";

package/dist/types/jats/__tests__/utils.d.ts

@@ -18,7 +18,7 @@ import { ManuscriptNode } from '../../schema';
 export declare const createNodeFromJATS: (fileName: string) => Promise<{
     node: import("../../schema").ActualManuscriptNode;
     journal: {
-        objectType: import("@manuscripts/json-schema/dist/types").ObjectTypes;
+        objectType: import("@manuscripts/json-schema").ObjectTypes;
         abbreviatedTitles: import("../importer/jats-journal-meta-parser").AbbreviatedTitle[];
         journalIdentifiers: import("../importer/jats-journal-meta-parser").JournalIdentifier[];
         ISSNs: import("../importer/jats-journal-meta-parser").ISSN[];

package/dist/types/jats/importer/jats-parser-utils.d.ts

@@ -15,4 +15,4 @@
  */
 import { ManuscriptNode } from '../../schema';
 export declare const updateDocumentIDs: (node: ManuscriptNode) => string[];
-export declare const htmlFromJatsNode: (element: Element | undefined | null, createElement?: ((tagName: string) => HTMLElement) | undefined) => string | undefined;
+export declare const htmlFromJatsNode: (element: Element | undefined | null, createElement?: (tagName: string) => HTMLElement) => string | undefined;

package/dist/types/jats/importer/parse-jats-article.d.ts

@@ -17,7 +17,7 @@ import { ActualManuscriptNode, SectionCategory } from '../../schema';
 export declare const parseJATSArticle: (doc: Document, sectionCategories: SectionCategory[], template?: string) => {
     node: ActualManuscriptNode;
     journal: {
-        objectType: import("@manuscripts/json-schema/dist/types").ObjectTypes;
+        objectType: import("@manuscripts/json-schema").ObjectTypes;
         abbreviatedTitles: import("./jats-journal-meta-parser").AbbreviatedTitle[];
         journalIdentifiers: import("./jats-journal-meta-parser").JournalIdentifier[];
         ISSNs: import("./jats-journal-meta-parser").ISSN[];

package/dist/types/lib/html.d.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 export declare const nodeFromHTML: (html: string) => ChildNode | null;
-export declare const textFromHTML: (html: string) => string | null;
+export declare const textFromHTML: (html: string) => string;

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

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

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

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

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

@@ -32,4 +32,4 @@ export interface ManuscriptAttrs {
     receiveDate?: number;
 }
 export declare const manuscript: NodeSpec;
-export declare const isManuscriptNode: (node: ManuscriptNode) => node is import("prosemirror-model").Node;
+export declare const isManuscriptNode: (node: ManuscriptNode) => node is ManuscriptNode;

package/dist/types/transformer/node-types.d.ts

@@ -19,4 +19,4 @@ export declare const nodeTypesMap: Map<ManuscriptNodeType, ObjectTypes>;
 export declare const isExecutableNodeType: (type: ManuscriptNodeType) => boolean;
 export declare const isElementNodeType: (type: ManuscriptNodeType) => boolean;
 export declare const isSectionNodeType: (type: ManuscriptNodeType) => boolean;
-export declare const isNodeType: <T extends import("prosemirror-model").Node>(node: ManuscriptNode, type: Nodes) => node is T;
+export declare const isNodeType: <T extends ManuscriptNode>(node: ManuscriptNode, type: Nodes) => node is T;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.2.11";
+export declare const VERSION = "4.2.13";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "4.2.11",
+  "version": "4.2.13",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -46,7 +46,7 @@
     "@babel/preset-typescript": "7.23.3",
     "@jats4r/dtds": "0.0.10",
     "@manuscripts/eslint-config": "0.5.1",
-    "@types/jest": "29.5.14",
+    "@types/jest": "30.0.0",
     "@types/lodash": "4.17.16",
     "@types/mime": "3.0.4",
     "@types/node": "20.17.46",
@@ -55,7 +55,7 @@
     "@types/w3c-xmlserializer": "2.0.4",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",
-    "babel-jest": "29.7.0",
+    "babel-jest": "30.0.5",
     "eslint": "8.57.1",
     "eslint-config-prettier": "8.10.0",
     "eslint-plugin-header": "3.1.1",
@@ -70,8 +70,8 @@
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-simple-import-sort": "8.0.0",
     "husky": "8.0.3",
-    "jest": "29.7.0",
-    "jest-environment-jsdom": "29.7.0",
+    "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",
@@ -79,7 +79,7 @@
     "prosemirror-state": "1.4.3",
     "prosemirror-view": "1.39.2",
     "rimraf": "6.0.1",
-    "typescript": "4.9.5"
+    "typescript": "5.9.2"
   },
   "engines": {
     "node": ">=20.16.0"