@manuscripts/transform 2.3.7-LEAN-3582.0 → 2.3.7-LEAN-3307.3

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

@@ -87,13 +87,9 @@ const createBibliographyModels = (references) => {
     models.push(...comments);
     return models;
 };
-const clearUnsupportedChars = (input = '') => {
-    return input.replace(/[\u2028\u2029]/gim, '<break/>');
-};
 const createElementFn = (doc) => (tagName) => doc.createElement(tagName);
 const generateIDs = (models) => models.map((m) => m._id ? m : Object.assign(Object.assign({}, m), { _id: (0, id_1.generateID)(m.objectType) }));
-const parseJATSArticle = (rawDoc) => {
-    const doc = new DOMParser().parseFromString(clearUnsupportedChars(rawDoc), 'application/xml');
+const parseJATSArticle = (doc) => {
     const article = doc.querySelector('article');
     const front = doc.querySelector('front');
     const body = doc.querySelector('body');

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

@@ -18,10 +18,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.backmatter = void 0;
 exports.backmatter = {
     content: 'sections*',
-    atom: true,
     attrs: {
         id: { default: '' },
+        placeholder: { default: ' ' },
     },
-    group: 'block',
+    group: 'block element',
+    parseDOM: [{ tag: 'div.backmatter' }],
     toDOM: () => ['div', { class: 'backmatter' }, 0],
 };

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

@@ -20,6 +20,7 @@ exports.contributors = {
     content: 'contributor* author_notes?',
     attrs: {
         id: { default: '' },
+        firstInitials: { default: false },
     },
     group: 'block',
     selectable: false,

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

@@ -20,6 +20,7 @@ exports.title = {
     content: '(text | highlight_marker)*',
     attrs: {
         id: { default: '' },
+        placeholder: { default: 'Insert title here...' },
         dataTracked: { default: null },
     },
     group: 'block element',

package/dist/cjs/transformer/decode.js

@@ -86,6 +86,9 @@ class Decoder {
         const affiliations = getAffiliations(this.modelMap)
             .map((a) => this.decode(a))
             .filter(Boolean);
+        if (!affiliations.length) {
+            return false;
+        }
         return schema_1.schema.nodes.affiliations.createAndFill({}, affiliations);
     }
     createContributorsNode() {
@@ -96,12 +99,18 @@ class Decoder {
             .map((authorNote) => this.decode(authorNote))
             .filter(Boolean);
         const content = [...contributors, ...authorNotes];
+        if (!content.length) {
+            return false;
+        }
         return schema_1.schema.nodes.contributors.createAndFill({}, content);
     }
     createKeywordsNode() {
         const elements = getKeywordElements(this.modelMap)
             .map((e) => this.decode(e))
             .filter(Boolean);
+        if (!elements.length) {
+            return false;
+        }
         return schema_1.schema.nodes.keywords.createAndFill({}, [
             schema_1.schema.nodes.section_title.create({}, schema_1.schema.text('Keywords')),
             ...elements,
@@ -111,6 +120,9 @@ class Decoder {
         const elements = getSupplements(this.modelMap)
             .map((e) => this.decode(e))
             .filter(Boolean);
+        if (!elements.length) {
+            return false;
+        }
         return schema_1.schema.nodes.supplements.createAndFill({}, [
             schema_1.schema.nodes.section_title.create({}, schema_1.schema.text('SupplementaryMaterials')),
             ...elements,
@@ -143,11 +155,7 @@ class Decoder {
         const abstracts = schema_1.schema.nodes.abstracts.createAndFill({}, groups[section_group_type_1.abstractsType._id]);
         const body = schema_1.schema.nodes.body.createAndFill({}, groups[section_group_type_1.bodyType._id]);
         const backmatter = schema_1.schema.nodes.backmatter.createAndFill({}, groups[section_group_type_1.backmatterType._id]);
-        return {
-            abstracts,
-            body,
-            backmatter,
-        };
+        return [abstracts, body, backmatter];
     }
     createCommentNodes(model) {
         const comments = [];
@@ -695,24 +703,16 @@ class Decoder {
         };
         this.getModel = (id) => this.modelMap.get(id);
         this.createArticleNode = (manuscriptID) => {
-            const title = this.createTitleNode();
-            const contributors = this.createContributorsNode();
-            const affiliations = this.createAffiliationsNode();
-            const keywords = this.createKeywordsNode();
-            const suppl = this.createSupplementsNode();
-            const { abstracts, body, backmatter } = this.createContentSections();
-            const comments = this.createCommentsNode();
-            const contents = [
-                title,
-                contributors,
-                affiliations,
-                keywords,
-                suppl,
-                abstracts,
-                body,
-                backmatter,
-                comments,
+            const nodes = [
+                this.createTitleNode(),
+                this.createContributorsNode(),
+                this.createAffiliationsNode(),
+                this.createKeywordsNode(),
+                this.createSupplementsNode(),
+                ...this.createContentSections(),
+                this.createCommentsNode(),
             ];
+            const contents = nodes.filter((node) => node !== false);
             return schema_1.schema.nodes.manuscript.create({
                 id: manuscriptID || this.getManuscriptID(),
             }, contents);

package/dist/cjs/transformer/encode.js

@@ -262,6 +262,7 @@ const encoders = {
         title: (0, exports.inlineContents)(node),
         subtitle: node.attrs.subtitle,
         runningTitle: node.attrs.runningTitle,
+        placeholder: node.attrs.placeholder,
         _id: node.attrs._id,
     }),
     bibliography_element: (node) => ({

package/dist/cjs/version.js

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

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

@@ -82,13 +82,9 @@ const createBibliographyModels = (references) => {
     models.push(...comments);
     return models;
 };
-const clearUnsupportedChars = (input = '') => {
-    return input.replace(/[\u2028\u2029]/gim, '<break/>');
-};
 const createElementFn = (doc) => (tagName) => doc.createElement(tagName);
 const generateIDs = (models) => models.map((m) => m._id ? m : Object.assign(Object.assign({}, m), { _id: generateID(m.objectType) }));
-export const parseJATSArticle = (rawDoc) => {
-    const doc = new DOMParser().parseFromString(clearUnsupportedChars(rawDoc), 'application/xml');
+export const parseJATSArticle = (doc) => {
     const article = doc.querySelector('article');
     const front = doc.querySelector('front');
     const body = doc.querySelector('body');

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

@@ -15,10 +15,11 @@
  */
 export const backmatter = {
     content: 'sections*',
-    atom: true,
     attrs: {
         id: { default: '' },
+        placeholder: { default: ' ' },
     },
-    group: 'block',
+    group: 'block element',
+    parseDOM: [{ tag: 'div.backmatter' }],
     toDOM: () => ['div', { class: 'backmatter' }, 0],
 };

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

@@ -17,6 +17,7 @@ export const contributors = {
     content: 'contributor* author_notes?',
     attrs: {
         id: { default: '' },
+        firstInitials: { default: false },
     },
     group: 'block',
     selectable: false,

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

@@ -17,6 +17,7 @@ export const title = {
     content: '(text | highlight_marker)*',
     attrs: {
         id: { default: '' },
+        placeholder: { default: 'Insert title here...' },
         dataTracked: { default: null },
     },
     group: 'block element',

package/dist/es/transformer/decode.js

@@ -77,6 +77,9 @@ export class Decoder {
         const affiliations = getAffiliations(this.modelMap)
             .map((a) => this.decode(a))
             .filter(Boolean);
+        if (!affiliations.length) {
+            return false;
+        }
         return schema.nodes.affiliations.createAndFill({}, affiliations);
     }
     createContributorsNode() {
@@ -87,12 +90,18 @@ export class Decoder {
             .map((authorNote) => this.decode(authorNote))
             .filter(Boolean);
         const content = [...contributors, ...authorNotes];
+        if (!content.length) {
+            return false;
+        }
         return schema.nodes.contributors.createAndFill({}, content);
     }
     createKeywordsNode() {
         const elements = getKeywordElements(this.modelMap)
             .map((e) => this.decode(e))
             .filter(Boolean);
+        if (!elements.length) {
+            return false;
+        }
         return schema.nodes.keywords.createAndFill({}, [
             schema.nodes.section_title.create({}, schema.text('Keywords')),
             ...elements,
@@ -102,6 +111,9 @@ export class Decoder {
         const elements = getSupplements(this.modelMap)
             .map((e) => this.decode(e))
             .filter(Boolean);
+        if (!elements.length) {
+            return false;
+        }
         return schema.nodes.supplements.createAndFill({}, [
             schema.nodes.section_title.create({}, schema.text('SupplementaryMaterials')),
             ...elements,
@@ -134,11 +146,7 @@ export class Decoder {
         const abstracts = schema.nodes.abstracts.createAndFill({}, groups[abstractsType._id]);
         const body = schema.nodes.body.createAndFill({}, groups[bodyType._id]);
         const backmatter = schema.nodes.backmatter.createAndFill({}, groups[backmatterType._id]);
-        return {
-            abstracts,
-            body,
-            backmatter,
-        };
+        return [abstracts, body, backmatter];
     }
     createCommentNodes(model) {
         const comments = [];
@@ -686,24 +694,16 @@ export class Decoder {
         };
         this.getModel = (id) => this.modelMap.get(id);
         this.createArticleNode = (manuscriptID) => {
-            const title = this.createTitleNode();
-            const contributors = this.createContributorsNode();
-            const affiliations = this.createAffiliationsNode();
-            const keywords = this.createKeywordsNode();
-            const suppl = this.createSupplementsNode();
-            const { abstracts, body, backmatter } = this.createContentSections();
-            const comments = this.createCommentsNode();
-            const contents = [
-                title,
-                contributors,
-                affiliations,
-                keywords,
-                suppl,
-                abstracts,
-                body,
-                backmatter,
-                comments,
+            const nodes = [
+                this.createTitleNode(),
+                this.createContributorsNode(),
+                this.createAffiliationsNode(),
+                this.createKeywordsNode(),
+                this.createSupplementsNode(),
+                ...this.createContentSections(),
+                this.createCommentsNode(),
             ];
+            const contents = nodes.filter((node) => node !== false);
             return schema.nodes.manuscript.create({
                 id: manuscriptID || this.getManuscriptID(),
             }, contents);

package/dist/es/transformer/encode.js

@@ -254,6 +254,7 @@ const encoders = {
         title: inlineContents(node),
         subtitle: node.attrs.subtitle,
         runningTitle: node.attrs.runningTitle,
+        placeholder: node.attrs.placeholder,
         _id: node.attrs._id,
     }),
     bibliography_element: (node) => ({

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.7-LEAN-3582.0";
+export const VERSION = "2.3.7-LEAN-3307.3";

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

@@ -17,4 +17,4 @@ import { Model } from '@manuscripts/json-schema';
 import { References } from './jats-references';
 export declare const parseJATSFront: (doc: Document, front: Element) => Model[];
 export declare const parseJATSBody: (doc: Document, body: Element, references?: References) => IterableIterator<Model>;
-export declare const parseJATSArticle: (rawDoc: string) => Model[];
+export declare const parseJATSArticle: (doc: Document) => Model[];

package/dist/types/lib/table-cell-styles.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export declare const TABLE_CELL_STYLES: readonly ["backgroundColor", "border-top", "border-right", "border-bottom", "border-left", "verticalAlign", "textAlign"];
-export type TableCellStyleKey = typeof TABLE_CELL_STYLES[number];
+export type TableCellStyleKey = (typeof TABLE_CELL_STYLES)[number];
 export declare const serializeTableCellStyles: (styles: {
     backgroundColor?: string | null | undefined;
     "border-top"?: string | null | undefined;

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

@@ -20,6 +20,7 @@ interface Attrs {
     title: string;
     subtitle: string;
     runningTitle: string;
+    placeholder: string;
 }
 export interface TitleNode extends ManuscriptNode {
     attrs: Attrs;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.3.7-LEAN-3582.0";
+export declare const VERSION = "2.3.7-LEAN-3307.3";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.3.7-LEAN-3582.0",
+  "version": "2.3.7-LEAN-3307.3",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -25,14 +25,13 @@
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\" \"*.{js,json}\"",
     "preversion": "npm-run-all --parallel typecheck lint build test",
     "test": "jest --runInBand",
-    "test-inv": "jest -i src/jats/__tests__/jats-importer-invalid.test.ts",
     "test:debug": "DEBUG=manuscripts-transform yarn test",
     "typecheck": "tsc --noEmit",
     "version": "yarn build"
   },
   "dependencies": {
-    "@manuscripts/json-schema": "2.2.8",
-    "@manuscripts/library": "1.3.7",
+    "@manuscripts/json-schema": "2.2.9-LEAN-3307.0",
+    "@manuscripts/library": "1.3.8-LEAN-3307.0",
     "debug": "^4.3.4",
     "jszip": "^3.10.1",
     "mime": "^3.0.0",