@manuscripts/transform 1.3.12 → 1.4.1-LEAN-2737

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

@@ -456,12 +456,13 @@ const nodes = [
         },
     },
     {
-        tag: 'list[list-type=order]',
+        tag: 'list[list-type]',
         node: 'ordered_list',
         getAttrs: (node) => {
             const element = node;
             return {
                 id: element.getAttribute('id'),
+                listStyleType: element.getAttribute('list-type'),
             };
         },
     },
@@ -650,9 +651,13 @@ const nodes = [
         getAttrs: (node) => {
             var _a;
             const element = node;
+            const embeddedCitationAttr = element.getAttribute('data-reference-embedded-citation');
             return {
                 rid: element.getAttribute('rid'),
                 contents: (_a = element.textContent) === null || _a === void 0 ? void 0 : _a.trim(),
+                embeddedCitationItems: embeddedCitationAttr
+                    ? JSON.parse(embeddedCitationAttr)
+                    : null,
             };
         },
     },

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

@@ -158,6 +158,7 @@ exports.jatsReferenceParser = {
                             const citation = (0, builders_1.buildCitation)('', rids);
                             modelNodes.push(citation);
                             crossReferenceNode.setAttribute('rid', citation._id);
+                            crossReferenceNode.setAttribute('data-reference-embedded-citation', JSON.stringify(citation.embeddedCitationItems));
                         }
                         else {
                             crossReferenceNode.removeAttribute('rid');

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

@@ -825,7 +825,14 @@ class JATSExporter {
                     graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', '');
                     return graphic;
                 },
-                ordered_list: () => ['list', { 'list-type': 'order' }, 0],
+                ordered_list: (node) => {
+                    var _a;
+                    return [
+                        'list',
+                        { 'list-type': (_a = node.attrs.listStyleType) !== null && _a !== void 0 ? _a : 'order' },
+                        0,
+                    ];
+                },
                 paragraph: (node) => {
                     if (!node.childCount) {
                         return '';

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

@@ -17,7 +17,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bibliographyElement = void 0;
 exports.bibliographyElement = {
-    content: '(bibliography_item | placeholder)+',
+    content: '(bibliography_item | placeholder)*',
     attrs: {
         id: { default: '' },
         contents: { default: '' },

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

@@ -26,16 +26,22 @@ exports.citation = {
         contents: { default: '' },
         selectedText: { default: '' },
         dataTracked: { default: null },
+        embeddedCitationItems: { default: null },
     },
     parseDOM: [
         {
             tag: 'span.citation[data-reference-id]',
             getAttrs: (p) => {
                 const dom = p;
-                return {
+                const attr = {
                     rid: dom.getAttribute('data-reference-id'),
                     contents: dom.innerHTML,
                 };
+                const embeddedCitationAttr = dom.getAttribute('data-reference-embedded-citation');
+                if (embeddedCitationAttr) {
+                    attr['embeddedCitationItems'] = JSON.parse(embeddedCitationAttr);
+                }
+                return attr;
             },
         },
     ],
@@ -44,6 +50,9 @@ exports.citation = {
         const dom = document.createElement('span');
         dom.className = 'citation';
         dom.setAttribute('data-reference-id', citationNode.attrs.rid);
+        if (citationNode.attrs.embeddedCitationItems) {
+            dom.setAttribute('data-reference-embedded-citation', JSON.stringify(citationNode.attrs.embeddedCitationItems));
+        }
         dom.innerHTML = citationNode.attrs.contents;
         return dom;
     },

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

@@ -57,6 +57,7 @@ exports.orderedList = {
     group: 'block list element',
     attrs: {
         id: { default: '' },
+        listStyleType: { default: null },
         paragraphStyle: { default: '' },
         dataTracked: { default: null },
     },
@@ -67,6 +68,7 @@ exports.orderedList = {
                 const dom = p;
                 return {
                     id: dom.getAttribute('id'),
+                    listStyleType: dom.getAttribute('list-type'),
                 };
             },
         },
@@ -78,6 +80,7 @@ exports.orderedList = {
                 'ol',
                 {
                     id: orderedListNode.attrs.id,
+                    'list-type': orderedListNode.attrs.listStyleType,
                     class: (0, attributes_1.buildElementClass)(orderedListNode.attrs),
                     'data-object-type': json_schema_1.ObjectTypes.ListElement,
                 },

package/dist/cjs/transformer/decode.js

@@ -151,6 +151,8 @@ class Decoder {
             },
             [json_schema_1.ObjectTypes.BibliographyItem]: (data) => {
                 const model = data;
+                const commentNodes = this.createCommentsNode(model);
+                commentNodes.forEach((c) => this.comments.set(c.attrs.id, c));
                 return schema_1.schema.nodes.bibliography_item.create({
                     id: model._id,
                     type: model.type,
@@ -164,6 +166,7 @@ class Decoder {
                     page: model.page,
                     title: model.title,
                     literal: model.literal,
+                    comments: commentNodes.map((c) => c.attrs.id),
                 });
             },
             [object_types_1.ExtraObjectTypes.PlaceholderElement]: (data) => {
@@ -330,6 +333,7 @@ class Decoder {
                         return this.parseContents(model.contents || '<ol></ol>', undefined, this.getComments(model), {
                             topNode: schema_1.schema.nodes.ordered_list.create({
                                 id: model._id,
+                                listStyleType: model.listStyleType,
                                 paragraphStyle: model.paragraphStyle,
                                 comments: commentNodes.map((c) => c.attrs.id),
                             }),

package/dist/cjs/transformer/encode.js

@@ -439,6 +439,7 @@ const encoders = {
     ordered_list: (node) => ({
         elementType: 'ol',
         contents: listContents(node),
+        listStyleType: node.attrs.listStyleType,
         paragraphStyle: node.attrs.paragraphStyle || undefined,
     }),
     paragraph: (node) => ({

package/dist/cjs/transformer/node-types.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNodeType = exports.isSectionNodeType = exports.isElementNodeType = exports.isExecutableNodeType = exports.nodeTypesMap = void 0;
+exports.isMetaNode = exports.isNodeType = exports.isSectionNodeType = exports.isElementNodeType = exports.isExecutableNodeType = exports.nodeTypesMap = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 const schema_1 = require("../schema");
 exports.nodeTypesMap = new Map([
@@ -66,3 +66,8 @@ const isSectionNodeType = (type) => (0, schema_1.hasGroup)(type, schema_1.GROUP_
 exports.isSectionNodeType = isSectionNodeType;
 const isNodeType = (node, type) => node.type === node.type.schema.nodes[type];
 exports.isNodeType = isNodeType;
+const isMetaNode = (nodeType) => nodeType === schema_1.schema.nodes.bibliography_item.name ||
+    nodeType === schema_1.schema.nodes.affiliation.name ||
+    nodeType === schema_1.schema.nodes.contributor.name ||
+    nodeType === schema_1.schema.nodes.manuscript.name;
+exports.isMetaNode = isMetaNode;

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

@@ -450,12 +450,13 @@ const nodes = [
         },
     },
     {
-        tag: 'list[list-type=order]',
+        tag: 'list[list-type]',
         node: 'ordered_list',
         getAttrs: (node) => {
             const element = node;
             return {
                 id: element.getAttribute('id'),
+                listStyleType: element.getAttribute('list-type'),
             };
         },
     },
@@ -644,9 +645,13 @@ const nodes = [
         getAttrs: (node) => {
             var _a;
             const element = node;
+            const embeddedCitationAttr = element.getAttribute('data-reference-embedded-citation');
             return {
                 rid: element.getAttribute('rid'),
                 contents: (_a = element.textContent) === null || _a === void 0 ? void 0 : _a.trim(),
+                embeddedCitationItems: embeddedCitationAttr
+                    ? JSON.parse(embeddedCitationAttr)
+                    : null,
             };
         },
     },

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

@@ -155,6 +155,7 @@ export const jatsReferenceParser = {
                             const citation = buildCitation('', rids);
                             modelNodes.push(citation);
                             crossReferenceNode.setAttribute('rid', citation._id);
+                            crossReferenceNode.setAttribute('data-reference-embedded-citation', JSON.stringify(citation.embeddedCitationItems));
                         }
                         else {
                             crossReferenceNode.removeAttribute('rid');

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

@@ -818,7 +818,14 @@ export class JATSExporter {
                     graphic.setAttributeNS(XLINK_NAMESPACE, 'xlink:href', '');
                     return graphic;
                 },
-                ordered_list: () => ['list', { 'list-type': 'order' }, 0],
+                ordered_list: (node) => {
+                    var _a;
+                    return [
+                        'list',
+                        { 'list-type': (_a = node.attrs.listStyleType) !== null && _a !== void 0 ? _a : 'order' },
+                        0,
+                    ];
+                },
                 paragraph: (node) => {
                     if (!node.childCount) {
                         return '';

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 export const bibliographyElement = {
-    content: '(bibliography_item | placeholder)+',
+    content: '(bibliography_item | placeholder)*',
     attrs: {
         id: { default: '' },
         contents: { default: '' },

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

@@ -23,16 +23,22 @@ export const citation = {
         contents: { default: '' },
         selectedText: { default: '' },
         dataTracked: { default: null },
+        embeddedCitationItems: { default: null },
     },
     parseDOM: [
         {
             tag: 'span.citation[data-reference-id]',
             getAttrs: (p) => {
                 const dom = p;
-                return {
+                const attr = {
                     rid: dom.getAttribute('data-reference-id'),
                     contents: dom.innerHTML,
                 };
+                const embeddedCitationAttr = dom.getAttribute('data-reference-embedded-citation');
+                if (embeddedCitationAttr) {
+                    attr['embeddedCitationItems'] = JSON.parse(embeddedCitationAttr);
+                }
+                return attr;
             },
         },
     ],
@@ -41,6 +47,9 @@ export const citation = {
         const dom = document.createElement('span');
         dom.className = 'citation';
         dom.setAttribute('data-reference-id', citationNode.attrs.rid);
+        if (citationNode.attrs.embeddedCitationItems) {
+            dom.setAttribute('data-reference-embedded-citation', JSON.stringify(citationNode.attrs.embeddedCitationItems));
+        }
         dom.innerHTML = citationNode.attrs.contents;
         return dom;
     },

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

@@ -54,6 +54,7 @@ export const orderedList = {
     group: 'block list element',
     attrs: {
         id: { default: '' },
+        listStyleType: { default: null },
         paragraphStyle: { default: '' },
         dataTracked: { default: null },
     },
@@ -64,6 +65,7 @@ export const orderedList = {
                 const dom = p;
                 return {
                     id: dom.getAttribute('id'),
+                    listStyleType: dom.getAttribute('list-type'),
                 };
             },
         },
@@ -75,6 +77,7 @@ export const orderedList = {
                 'ol',
                 {
                     id: orderedListNode.attrs.id,
+                    'list-type': orderedListNode.attrs.listStyleType,
                     class: buildElementClass(orderedListNode.attrs),
                     'data-object-type': ObjectTypes.ListElement,
                 },

package/dist/es/transformer/decode.js

@@ -141,6 +141,8 @@ export class Decoder {
             },
             [ObjectTypes.BibliographyItem]: (data) => {
                 const model = data;
+                const commentNodes = this.createCommentsNode(model);
+                commentNodes.forEach((c) => this.comments.set(c.attrs.id, c));
                 return schema.nodes.bibliography_item.create({
                     id: model._id,
                     type: model.type,
@@ -154,6 +156,7 @@ export class Decoder {
                     page: model.page,
                     title: model.title,
                     literal: model.literal,
+                    comments: commentNodes.map((c) => c.attrs.id),
                 });
             },
             [ExtraObjectTypes.PlaceholderElement]: (data) => {
@@ -320,6 +323,7 @@ export class Decoder {
                         return this.parseContents(model.contents || '<ol></ol>', undefined, this.getComments(model), {
                             topNode: schema.nodes.ordered_list.create({
                                 id: model._id,
+                                listStyleType: model.listStyleType,
                                 paragraphStyle: model.paragraphStyle,
                                 comments: commentNodes.map((c) => c.attrs.id),
                             }),

package/dist/es/transformer/encode.js

@@ -431,6 +431,7 @@ const encoders = {
     ordered_list: (node) => ({
         elementType: 'ol',
         contents: listContents(node),
+        listStyleType: node.attrs.listStyleType,
         paragraphStyle: node.attrs.paragraphStyle || undefined,
     }),
     paragraph: (node) => ({

package/dist/es/transformer/node-types.js

@@ -59,3 +59,7 @@ export const isExecutableNodeType = (type) => hasGroup(type, GROUP_EXECUTABLE);
 export const isElementNodeType = (type) => hasGroup(type, GROUP_ELEMENT);
 export const isSectionNodeType = (type) => hasGroup(type, GROUP_SECTION);
 export const isNodeType = (node, type) => node.type === node.type.schema.nodes[type];
+export const isMetaNode = (nodeType) => nodeType === schema.nodes.bibliography_item.name ||
+    nodeType === schema.nodes.affiliation.name ||
+    nodeType === schema.nodes.contributor.name ||
+    nodeType === schema.nodes.manuscript.name;

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

@@ -18,6 +18,10 @@ import { ManuscriptNode } from '../types';
 interface Attrs {
     rid: string;
     contents: string;
+    embeddedCitationItems: {
+        id: string;
+        bibliographyItem: string;
+    }[];
 }
 export interface CitationNode extends ManuscriptNode {
     attrs: Attrs;

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

@@ -25,6 +25,7 @@ export declare const bulletList: NodeSpec;
 export interface OrderedListNode extends ManuscriptNode {
     attrs: {
         id: string;
+        listStyleType: string;
         paragraphStyle: string;
     };
 }

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

@@ -20,3 +20,4 @@ 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 isMetaNode: (nodeType: string) => boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "1.3.12",
+  "version": "1.4.1-LEAN-2737",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -29,7 +29,7 @@
     "version": "yarn build"
   },
   "dependencies": {
-    "@manuscripts/json-schema": "^2.1.2",
+    "@manuscripts/json-schema": "^2.2.0",
     "debug": "^4.3.4",
     "jszip": "^3.10.1",
     "mathjax-full": "^3.2.2",