@manuscripts/transform 2.3.22-LEAN-3828.0 → 2.3.22

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/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/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();

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.22-LEAN-3828.0";
+exports.VERSION = "2.3.22";

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/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/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();

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "2.3.22-LEAN-3828.0";
+export const VERSION = "2.3.22";

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/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.3.22-LEAN-3828.0";
+export declare const VERSION = "2.3.22";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.3.22-LEAN-3828.0",
+  "version": "2.3.22",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@manuscripts/json-schema": "2.2.10",
-    "@manuscripts/library": "1.3.11-LEAN-3828.1",
+    "@manuscripts/library": "1.3.10",
     "debug": "^4.3.4",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",