@manuscripts/transform 2.3.21 → 2.3.22-JSR

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

@@ -221,7 +221,7 @@ exports.jatsBodyTransformations = {
     moveCaptionsToEnd(body) {
         const captions = body.querySelectorAll('caption');
         for (const caption of captions) {
-            if (caption.parentNode) {
+            if (caption.parentNode && caption.parentNode.nodeName !== 'table-wrap') {
                 caption.parentNode.appendChild(caption);
             }
         }

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

@@ -143,7 +143,7 @@ class JATSExporter {
             const manuscript = (0, project_bundle_1.findManuscriptById)(this.modelMap, manuscriptID);
             article.setAttribute('article-type', manuscript.articleType || 'other');
             if (!frontMatterOnly) {
-                this.labelTargets = (0, labels_1.buildTargets)(fragment, manuscript);
+                this.labelTargets = (0, labels_1.buildTargets)(fragment);
                 const body = this.buildBody(fragment);
                 article.appendChild(body);
                 const back = this.buildBack(body);

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

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Migration2322 {
+    constructor() {
+        this.fromVersion = '2.3.21';
+        this.toVersion = '2.3.22';
+    }
+    migrateNode(node) {
+        if (node.type === 'table_element' && Array.isArray(node.content)) {
+            let figcaptionNode = null;
+            const remainingContent = [];
+            for (const child of node.content) {
+                if (child.type === 'figcaption') {
+                    figcaptionNode = child;
+                }
+                else {
+                    remainingContent.push(child);
+                }
+            }
+            const newContent = figcaptionNode
+                ? [figcaptionNode, ...remainingContent]
+                : remainingContent;
+            return Object.assign(Object.assign({}, node), { content: newContent });
+        }
+        return node;
+    }
+}
+exports.default = Migration2322;

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

@@ -19,5 +19,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1_2_5_1 = __importDefault(require("./1.2.5"));
-const migrations = [new _1_2_5_1.default()];
+const _2_3_22_1 = __importDefault(require("./2.3.22"));
+const migrations = [new _1_2_5_1.default(), new _2_3_22_1.default()];
 exports.default = migrations;

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

@@ -21,6 +21,9 @@ exports.manuscript = {
     attrs: {
         id: { default: '' },
         doi: { default: '' },
+        prototype: { default: '' },
+        primaryLanguageCode: { default: '' },
+        articleType: { default: '' },
     },
     group: 'block',
     parseDOM: [

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

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

package/dist/cjs/transformer/decode.js

@@ -615,14 +615,13 @@ class Decoder {
                 const figcaption = this.getFigcaption(model);
                 const comments = this.createCommentNodes(model);
                 comments.forEach((c) => this.comments.set(c.attrs.id, c));
-                const content = [table];
+                const content = [figcaption, table];
                 if (tableColGroup) {
                     content.push(tableColGroup);
                 }
                 if (tableElementFooter) {
                     content.push(tableElementFooter);
                 }
-                content.push(figcaption);
                 const listing = model.listingID
                     ? this.createListing(model.listingID)
                     : schema_1.schema.nodes.listing.create();
@@ -727,9 +726,13 @@ class Decoder {
                 this.createCommentsNode(),
             ];
             const contents = nodes.filter((node) => node !== false);
+            const props = this.getManuscript();
             return schema_1.schema.nodes.manuscript.create({
                 id: manuscriptID || this.getManuscriptID(),
-                doi: this.getManuscriptDOI() || '',
+                doi: (props === null || props === void 0 ? void 0 : props.DOI) || '',
+                articleType: props === null || props === void 0 ? void 0 : props.articleType,
+                prototype: props === null || props === void 0 ? void 0 : props.prototype,
+                primaryLanguageCode: props === null || props === void 0 ? void 0 : props.primaryLanguageCode,
             }, contents);
         };
         this.addGeneratedLabels = (sections) => {
@@ -775,10 +778,10 @@ class Decoder {
                 }
             }
         };
-        this.getManuscriptDOI = () => {
+        this.getManuscript = () => {
             for (const item of this.modelMap.values()) {
                 if ((0, object_types_1.isManuscript)(item)) {
-                    return item.DOI;
+                    return item;
                 }
             }
         };

package/dist/cjs/transformer/html.js

@@ -75,8 +75,7 @@ class HTMLTransformer {
         this.serializeToHTML = async (fragment, modelMap, options = {}) => {
             const { idGenerator, mediaPathGenerator } = options;
             this.modelMap = modelMap;
-            const manuscript = (0, project_bundle_1.findManuscript)(this.modelMap);
-            this.labelTargets = (0, labels_1.buildTargets)(fragment, manuscript);
+            this.labelTargets = (0, labels_1.buildTargets)(fragment);
             this.document = document.implementation.createDocument('http://www.w3.org/1999/xhtml', 'html', document.implementation.createDocumentType('html', '', ''));
             const article = this.document.createElement('article');
             this.document.documentElement.appendChild(article);

package/dist/cjs/transformer/labels.js

@@ -24,28 +24,15 @@ const labelledNodeTypes = [
     schema_1.schema.nodes.equation_element,
     schema_1.schema.nodes.listing_element,
 ];
-const labelProperties = new Map([
-    [schema_1.schema.nodes.figure_element, 'figureElementLabel'],
-    [schema_1.schema.nodes.table_element, 'tableElementLabel'],
-    [schema_1.schema.nodes.equation_element, 'equationElementLabel'],
-    [schema_1.schema.nodes.listing_element, 'listingElementLabel'],
-]);
 const excludedTypes = [schema_1.schema.nodes.graphical_abstract_section];
-const chooseLabel = (nodeType, manuscript) => {
-    const labelProperty = labelProperties.get(nodeType);
-    if (labelProperty) {
-        const label = manuscript[labelProperty];
-        if (label) {
-            return label;
-        }
-    }
+const chooseLabel = (nodeType) => {
     return node_names_1.nodeNames.get(nodeType);
 };
-const buildTargets = (fragment, manuscript) => {
+const buildTargets = (fragment) => {
     const counters = {};
     for (const nodeType of labelledNodeTypes) {
         counters[nodeType.name] = {
-            label: chooseLabel(nodeType, manuscript),
+            label: chooseLabel(nodeType),
             index: 0,
         };
     }

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.21";
+exports.VERSION = "2.3.22-JSR";

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

@@ -218,7 +218,7 @@ export const jatsBodyTransformations = {
     moveCaptionsToEnd(body) {
         const captions = body.querySelectorAll('caption');
         for (const caption of captions) {
-            if (caption.parentNode) {
+            if (caption.parentNode && caption.parentNode.nodeName !== 'table-wrap') {
                 caption.parentNode.appendChild(caption);
             }
         }

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

@@ -135,7 +135,7 @@ export class JATSExporter {
             const manuscript = findManuscriptById(this.modelMap, manuscriptID);
             article.setAttribute('article-type', manuscript.articleType || 'other');
             if (!frontMatterOnly) {
-                this.labelTargets = buildTargets(fragment, manuscript);
+                this.labelTargets = buildTargets(fragment);
                 const body = this.buildBody(fragment);
                 article.appendChild(body);
                 const back = this.buildBack(body);

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

@@ -0,0 +1,26 @@
+class Migration2322 {
+    constructor() {
+        this.fromVersion = '2.3.21';
+        this.toVersion = '2.3.22';
+    }
+    migrateNode(node) {
+        if (node.type === 'table_element' && Array.isArray(node.content)) {
+            let figcaptionNode = null;
+            const remainingContent = [];
+            for (const child of node.content) {
+                if (child.type === 'figcaption') {
+                    figcaptionNode = child;
+                }
+                else {
+                    remainingContent.push(child);
+                }
+            }
+            const newContent = figcaptionNode
+                ? [figcaptionNode, ...remainingContent]
+                : remainingContent;
+            return Object.assign(Object.assign({}, node), { content: newContent });
+        }
+        return node;
+    }
+}
+export default Migration2322;

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

@@ -14,5 +14,6 @@
  * limitations under the License.
  */
 import Migration125 from './1.2.5';
-const migrations = [new Migration125()];
+import Migration2322 from './2.3.22';
+const migrations = [new Migration125(), new Migration2322()];
 export default migrations;

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

@@ -18,6 +18,9 @@ export const manuscript = {
     attrs: {
         id: { default: '' },
         doi: { default: '' },
+        prototype: { default: '' },
+        primaryLanguageCode: { default: '' },
+        articleType: { default: '' },
     },
     group: 'block',
     parseDOM: [

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

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

package/dist/es/transformer/decode.js

@@ -606,14 +606,13 @@ export class Decoder {
                 const figcaption = this.getFigcaption(model);
                 const comments = this.createCommentNodes(model);
                 comments.forEach((c) => this.comments.set(c.attrs.id, c));
-                const content = [table];
+                const content = [figcaption, table];
                 if (tableColGroup) {
                     content.push(tableColGroup);
                 }
                 if (tableElementFooter) {
                     content.push(tableElementFooter);
                 }
-                content.push(figcaption);
                 const listing = model.listingID
                     ? this.createListing(model.listingID)
                     : schema.nodes.listing.create();
@@ -718,9 +717,13 @@ export class Decoder {
                 this.createCommentsNode(),
             ];
             const contents = nodes.filter((node) => node !== false);
+            const props = this.getManuscript();
             return schema.nodes.manuscript.create({
                 id: manuscriptID || this.getManuscriptID(),
-                doi: this.getManuscriptDOI() || '',
+                doi: (props === null || props === void 0 ? void 0 : props.DOI) || '',
+                articleType: props === null || props === void 0 ? void 0 : props.articleType,
+                prototype: props === null || props === void 0 ? void 0 : props.prototype,
+                primaryLanguageCode: props === null || props === void 0 ? void 0 : props.primaryLanguageCode,
             }, contents);
         };
         this.addGeneratedLabels = (sections) => {
@@ -766,10 +769,10 @@ export class Decoder {
                 }
             }
         };
-        this.getManuscriptDOI = () => {
+        this.getManuscript = () => {
             for (const item of this.modelMap.values()) {
                 if (isManuscript(item)) {
-                    return item.DOI;
+                    return item;
                 }
             }
         };

package/dist/es/transformer/html.js

@@ -69,8 +69,7 @@ export class HTMLTransformer {
         this.serializeToHTML = async (fragment, modelMap, options = {}) => {
             const { idGenerator, mediaPathGenerator } = options;
             this.modelMap = modelMap;
-            const manuscript = findManuscript(this.modelMap);
-            this.labelTargets = buildTargets(fragment, manuscript);
+            this.labelTargets = buildTargets(fragment);
             this.document = document.implementation.createDocument('http://www.w3.org/1999/xhtml', 'html', document.implementation.createDocumentType('html', '', ''));
             const article = this.document.createElement('article');
             this.document.documentElement.appendChild(article);

package/dist/es/transformer/labels.js

@@ -21,28 +21,15 @@ const labelledNodeTypes = [
     schema.nodes.equation_element,
     schema.nodes.listing_element,
 ];
-const labelProperties = new Map([
-    [schema.nodes.figure_element, 'figureElementLabel'],
-    [schema.nodes.table_element, 'tableElementLabel'],
-    [schema.nodes.equation_element, 'equationElementLabel'],
-    [schema.nodes.listing_element, 'listingElementLabel'],
-]);
 const excludedTypes = [schema.nodes.graphical_abstract_section];
-const chooseLabel = (nodeType, manuscript) => {
-    const labelProperty = labelProperties.get(nodeType);
-    if (labelProperty) {
-        const label = manuscript[labelProperty];
-        if (label) {
-            return label;
-        }
-    }
+const chooseLabel = (nodeType) => {
     return nodeNames.get(nodeType);
 };
-export const buildTargets = (fragment, manuscript) => {
+export const buildTargets = (fragment) => {
     const counters = {};
     for (const nodeType of labelledNodeTypes) {
         counters[nodeType.name] = {
-            label: chooseLabel(nodeType, manuscript),
+            label: chooseLabel(nodeType),
             index: 0,
         };
     }

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.21";
+export const VERSION = "2.3.22-JSR";

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

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

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

@@ -14,5 +14,6 @@
  * limitations under the License.
  */
 import Migration125 from './1.2.5';
-declare const migrations: Migration125[];
+import Migration2322 from './2.3.22';
+declare const migrations: (Migration125 | Migration2322)[];
 export default migrations;

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

@@ -19,6 +19,9 @@ export interface ActualManuscriptNode extends ManuscriptNode {
     attrs: {
         id: string;
         doi: string;
+        articleType: string;
+        prototype: string;
+        primaryLanguageCode: string;
     };
 }
 export declare const manuscript: NodeSpec;

package/dist/types/transformer/decode.d.ts

@@ -42,7 +42,7 @@ export declare class Decoder {
     addGeneratedLabels: (sections: Section[]) => Section[];
     parseContents: (contents: string, wrapper?: string, commentAnnotations?: CommentAnnotation[], options?: ParseOptions) => ManuscriptNode;
     private getManuscriptID;
-    private getManuscriptDOI;
+    private getManuscript;
     private getFigcaption;
     private createTable;
     private createTableColGroup;

package/dist/types/transformer/labels.d.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Manuscript } from '@manuscripts/json-schema';
 import { ManuscriptFragment } from '../schema';
 export interface Target {
     type: string;
@@ -21,4 +20,4 @@ export interface Target {
     label: string;
     caption: string;
 }
-export declare const buildTargets: (fragment: ManuscriptFragment, manuscript: Manuscript) => Map<string, Target>;
+export declare const buildTargets: (fragment: ManuscriptFragment) => Map<string, Target>;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.3.21";
+export declare const VERSION = "2.3.22-JSR";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.3.21",
+  "version": "2.3.22-JSR",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -82,4 +82,4 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.0.5"
   }
-}
+}