@manuscripts/transform 3.0.29 → 3.0.30

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

@@ -544,7 +544,7 @@ class JATSExporter {
         this.createSerializer = () => {
             const nodes = {
                 image_element: (node) => node.content.firstChild
-                    ? this.serializeNode(node.content.firstChild)
+                    ? createGraphic(node.content.firstChild, false)
                     : '',
                 embed: (node) => {
                     const mediaElement = this.document.createElement('media');
@@ -913,17 +913,18 @@ class JATSExporter {
                 processChildNodes(element, node, node.type.schema.nodes.section);
                 return element;
             };
-            const createGraphic = (node) => {
+            const createGraphic = (node, isChildOfFigure = true) => {
                 const graphic = this.document.createElement('graphic');
                 graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', node.attrs.src);
-                if (node.attrs.contentType) {
-                    graphic.setAttribute('content-type', node.attrs.contentType);
+                if (!isChildOfFigure && node.attrs.type) {
+                    graphic.setAttribute('content-type', node.attrs.type);
                 }
                 return graphic;
             };
             const createFigureElement = (node, contentNodeType) => {
                 const element = createElement(node, 'fig');
-                const figType = node.attrs.type;
+                const figNode = (0, prosemirror_utils_1.findChildrenByType)(node, node.type.schema.nodes.figure)[0];
+                const figType = figNode === null || figNode === void 0 ? void 0 : figNode.node.attrs.type;
                 if (figType) {
                     element.setAttribute('fig-type', figType);
                 }

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

@@ -101,10 +101,12 @@ class JATSDOMParser {
             }
         };
         this.getFigureAttrs = (node) => {
+            var _a, _b;
             const element = node;
+            const parentElement = element.parentElement;
             return {
                 id: element.getAttribute('id'),
-                contentType: element.getAttribute('content-type'),
+                type: (_b = (_a = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('fig-type')) !== null && _a !== void 0 ? _a : element.getAttribute('content-type')) !== null && _b !== void 0 ? _b : '',
                 src: element.getAttributeNS(this.XLINK_NAMESPACE, 'href'),
             };
         };
@@ -606,7 +608,6 @@ class JATSDOMParser {
                     return {
                         id: element.getAttribute('id'),
                         attribution,
-                        type: element.getAttribute('fig-type'),
                     };
                 },
             },

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

@@ -0,0 +1,54 @@
+"use strict";
+/*!
+ * © 2025 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+class Migration3030 {
+    constructor() {
+        this.fromVersion = '3.0.29';
+        this.toVersion = '3.0.30';
+    }
+    addTypeToFigures(node, type) {
+        if (!Array.isArray(node.content)) {
+            return node.content;
+        }
+        return node.content.map((child) => child.type === 'figure'
+            ? Object.assign(Object.assign({}, child), { attrs: Object.assign(Object.assign({}, child.attrs), { type }) }) : child);
+    }
+    migrateFigure(node) {
+        const type = node.attrs.contentType || node.attrs.type || '';
+        if (node.attrs.contentType) {
+            delete node.attrs.contentType;
+        }
+        return Object.assign(Object.assign({}, node), { attrs: Object.assign(Object.assign({}, node.attrs), { type }) });
+    }
+    migrateFigureElement(node) {
+        const newContent = this.addTypeToFigures(node, node.attrs.type || '');
+        if (node.attrs.type) {
+            delete node.attrs.type;
+        }
+        return Object.assign(Object.assign({}, node), { content: newContent, attrs: Object.assign({}, node.attrs) });
+    }
+    migrateNode(node) {
+        if (node.type === 'figure') {
+            return this.migrateFigure(node);
+        }
+        if (node.type === 'figure_element') {
+            return this.migrateFigureElement(node);
+        }
+        return node;
+    }
+}
+exports.default = Migration3030;

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

@@ -22,10 +22,12 @@ const _1_2_5_1 = __importDefault(require("./1.2.5"));
 const _2_3_22_1 = __importDefault(require("./2.3.22"));
 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 migrations = [
     new _1_2_5_1.default(),
     new _2_3_22_1.default(),
     new _3_0_12_1.Migration3012(),
     new _3_0_21_1.default(),
+    new _3_0_30_1.default(),
 ];
 exports.default = migrations;

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

@@ -20,7 +20,7 @@ exports.figure = {
     attrs: {
         id: { default: '' },
         src: { default: '' },
-        contentType: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     selectable: false,

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

@@ -22,7 +22,6 @@ exports.figureElement = {
         id: { default: '' },
         attribution: { default: undefined },
         dataTracked: { default: null },
-        type: { default: undefined },
     },
     selectable: false,
     group: 'block element executable',

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.29";
+exports.VERSION = "3.0.30";

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

@@ -536,7 +536,7 @@ export class JATSExporter {
         this.createSerializer = () => {
             const nodes = {
                 image_element: (node) => node.content.firstChild
-                    ? this.serializeNode(node.content.firstChild)
+                    ? createGraphic(node.content.firstChild, false)
                     : '',
                 embed: (node) => {
                     const mediaElement = this.document.createElement('media');
@@ -905,17 +905,18 @@ export class JATSExporter {
                 processChildNodes(element, node, node.type.schema.nodes.section);
                 return element;
             };
-            const createGraphic = (node) => {
+            const createGraphic = (node, isChildOfFigure = true) => {
                 const graphic = this.document.createElement('graphic');
                 graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', node.attrs.src);
-                if (node.attrs.contentType) {
-                    graphic.setAttribute('content-type', node.attrs.contentType);
+                if (!isChildOfFigure && node.attrs.type) {
+                    graphic.setAttribute('content-type', node.attrs.type);
                 }
                 return graphic;
             };
             const createFigureElement = (node, contentNodeType) => {
                 const element = createElement(node, 'fig');
-                const figType = node.attrs.type;
+                const figNode = findChildrenByType(node, node.type.schema.nodes.figure)[0];
+                const figType = figNode === null || figNode === void 0 ? void 0 : figNode.node.attrs.type;
                 if (figType) {
                     element.setAttribute('fig-type', figType);
                 }

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

@@ -98,10 +98,12 @@ export class JATSDOMParser {
             }
         };
         this.getFigureAttrs = (node) => {
+            var _a, _b;
             const element = node;
+            const parentElement = element.parentElement;
             return {
                 id: element.getAttribute('id'),
-                contentType: element.getAttribute('content-type'),
+                type: (_b = (_a = parentElement === null || parentElement === void 0 ? void 0 : parentElement.getAttribute('fig-type')) !== null && _a !== void 0 ? _a : element.getAttribute('content-type')) !== null && _b !== void 0 ? _b : '',
                 src: element.getAttributeNS(this.XLINK_NAMESPACE, 'href'),
             };
         };
@@ -603,7 +605,6 @@ export class JATSDOMParser {
                     return {
                         id: element.getAttribute('id'),
                         attribution,
-                        type: element.getAttribute('fig-type'),
                     };
                 },
             },

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

@@ -0,0 +1,52 @@
+/*!
+ * © 2025 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+class Migration3030 {
+    constructor() {
+        this.fromVersion = '3.0.29';
+        this.toVersion = '3.0.30';
+    }
+    addTypeToFigures(node, type) {
+        if (!Array.isArray(node.content)) {
+            return node.content;
+        }
+        return node.content.map((child) => child.type === 'figure'
+            ? Object.assign(Object.assign({}, child), { attrs: Object.assign(Object.assign({}, child.attrs), { type }) }) : child);
+    }
+    migrateFigure(node) {
+        const type = node.attrs.contentType || node.attrs.type || '';
+        if (node.attrs.contentType) {
+            delete node.attrs.contentType;
+        }
+        return Object.assign(Object.assign({}, node), { attrs: Object.assign(Object.assign({}, node.attrs), { type }) });
+    }
+    migrateFigureElement(node) {
+        const newContent = this.addTypeToFigures(node, node.attrs.type || '');
+        if (node.attrs.type) {
+            delete node.attrs.type;
+        }
+        return Object.assign(Object.assign({}, node), { content: newContent, attrs: Object.assign({}, node.attrs) });
+    }
+    migrateNode(node) {
+        if (node.type === 'figure') {
+            return this.migrateFigure(node);
+        }
+        if (node.type === 'figure_element') {
+            return this.migrateFigureElement(node);
+        }
+        return node;
+    }
+}
+export default Migration3030;

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

@@ -17,10 +17,12 @@ import Migration125 from './1.2.5';
 import Migration2322 from './2.3.22';
 import { Migration3012 } from './3.0.12';
 import Migration3021 from './3.0.21';
+import Migration3030 from './3.0.30';
 const migrations = [
     new Migration125(),
     new Migration2322(),
     new Migration3012(),
     new Migration3021(),
+    new Migration3030(),
 ];
 export default migrations;

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

@@ -17,7 +17,7 @@ export const figure = {
     attrs: {
         id: { default: '' },
         src: { default: '' },
-        contentType: { default: '' },
+        type: { default: '' },
         dataTracked: { default: null },
     },
     selectable: false,

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

@@ -19,7 +19,6 @@ export const figureElement = {
         id: { default: '' },
         attribution: { default: undefined },
         dataTracked: { default: null },
-        type: { default: undefined },
     },
     selectable: false,
     group: 'block element executable',

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.29";
+export const VERSION = "3.0.30";

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

@@ -0,0 +1,26 @@
+/*!
+ * © 2025 Atypon Systems LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { JSONNode } from '../migrate';
+import { MigrationScript } from '../migration-script';
+declare class Migration3030 implements MigrationScript {
+    fromVersion: string;
+    toVersion: string;
+    private addTypeToFigures;
+    private migrateFigure;
+    private migrateFigureElement;
+    migrateNode(node: JSONNode): JSONNode;
+}
+export default Migration3030;

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

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

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

@@ -19,7 +19,7 @@ export interface FigureNode extends ManuscriptNode {
     attrs: {
         id: string;
         src: string;
-        contentType: string;
+        type: string;
     };
 }
 export declare const figure: NodeSpec;

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

@@ -19,7 +19,6 @@ import { AttributionNode } from './attribution';
 interface Attrs {
     id: string;
     attribution?: AttributionNode;
-    type?: string;
 }
 export interface FigureElementNode extends ManuscriptNode {
     attrs: Attrs;

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.29";
+export declare const VERSION = "3.0.30";

package/package.json

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