@manuscripts/transform 2.1.10 → 2.1.12-LEAN-3509-0

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

@@ -743,6 +743,9 @@ class JATSExporter {
                     return ['fn', attrs, 0];
                 },
                 footnotes_element: (node) => {
+                    if (!node.textContent) {
+                        return '';
+                    }
                     const kind = node.attrs.kind;
                     let tag = 'fn-group';
                     if (kind && kind.includes('table')) {

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

@@ -15,12 +15,7 @@ exports.affiliation = {
         county: { default: '' },
         city: { default: '' },
         priority: { default: undefined },
-        email: {
-            default: {
-                href: undefined,
-                text: undefined,
-            },
-        },
+        email: { default: undefined },
         dataTracked: { default: null },
     },
     group: 'block',

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

@@ -24,6 +24,7 @@ exports.highlightMarker = {
         id: { default: '' },
         tid: { default: '' },
         position: { default: '' },
+        content: { default: null },
         dataTracked: { default: null },
     },
     parseDOM: [
@@ -35,18 +36,14 @@ exports.highlightMarker = {
                     id: dom.getAttribute('id'),
                     tid: dom.getAttribute('data-target-id'),
                     position: dom.getAttribute('data-position'),
+                    content: dom.innerHTML,
                 };
             },
         },
     ],
     toDOM: (node) => {
         const highlightMarkerNode = node;
-        const dom = document.createElement('span');
-        dom.className = 'highlight-marker';
-        dom.setAttribute('id', highlightMarkerNode.attrs.id);
-        dom.setAttribute('data-target-id', highlightMarkerNode.attrs.tid);
-        dom.setAttribute('data-position', highlightMarkerNode.attrs.position);
-        return dom;
+        return highlightMarkerNode.attrs.content || '';
     },
 };
 const isHighlightMarkerNode = (node) => node.type === node.type.schema.nodes.highlight_marker;

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

@@ -19,7 +19,6 @@ exports.tableCol = exports.tableColGroup = void 0;
 exports.tableColGroup = {
     content: 'table_col+',
     group: 'block',
-    tableRole: 'colgroup',
     parseDOM: [
         {
             tag: 'colgroup',
@@ -34,7 +33,6 @@ exports.tableCol = {
         width: { default: '' },
     },
     group: 'block',
-    tableRole: 'col',
     parseDOM: [
         {
             tag: 'col',

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

@@ -19,8 +19,9 @@ exports.tableElementFooter = void 0;
 exports.tableElementFooter = {
     attrs: {
         id: { default: '' },
+        dataTracked: { default: null }
     },
-    content: '(paragraph | footnotes_element)+',
+    content: '(paragraph | footnotes_element)*',
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };

package/dist/cjs/transformer/highlight-markers.js

@@ -106,33 +106,36 @@ const insertHighlightMarkers = (contents, commentAnnotations) => {
         if (comment.selector) {
             if (comment.selector.from === comment.selector.to) {
                 element = createHighlightElement(comment, 'point');
-                output = injectHighlightMarker(element, comment.selector.from, output);
+                output = injectHighlightMarker(element, comment.selector, output);
             }
             else {
-                element = createHighlightElement(comment, 'start');
-                output = injectHighlightMarker(element, comment.selector.from, output);
-                const updatedEndOffset = element.outerHTML.length + comment.selector.to;
-                element = createHighlightElement(comment, 'end');
-                output = injectHighlightMarker(element, updatedEndOffset, output);
+                element = createHighlightElement(comment, 'range', output.substring(comment.selector.from, comment.selector.to));
+                output = injectHighlightMarker(element, comment.selector, output);
             }
         }
     }
     return output;
 };
 exports.insertHighlightMarkers = insertHighlightMarkers;
-function injectHighlightMarker(element, offset, contents) {
+function injectHighlightMarker(element, selector, contents) {
+    if (!selector) {
+        return '';
+    }
     const parts = [
-        contents.substring(0, offset),
+        contents.substring(0, selector.from),
         element.outerHTML,
-        contents.substring(offset),
+        contents.substring(selector.to),
     ];
     return parts.join('');
 }
-const createHighlightElement = (comment, position) => {
+const createHighlightElement = (comment, position, content) => {
     const element = document.createElement('span');
     element.className = 'highlight-marker';
     element.setAttribute('id', comment._id);
     element.setAttribute('data-target-id', comment.target);
     element.setAttribute('data-position', position);
+    if (content) {
+        element.innerHTML = content;
+    }
     return element;
 };

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

@@ -735,6 +735,9 @@ export class JATSExporter {
                     return ['fn', attrs, 0];
                 },
                 footnotes_element: (node) => {
+                    if (!node.textContent) {
+                        return '';
+                    }
                     const kind = node.attrs.kind;
                     let tag = 'fn-group';
                     if (kind && kind.includes('table')) {

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

@@ -12,12 +12,7 @@ export const affiliation = {
         county: { default: '' },
         city: { default: '' },
         priority: { default: undefined },
-        email: {
-            default: {
-                href: undefined,
-                text: undefined,
-            },
-        },
+        email: { default: undefined },
         dataTracked: { default: null },
     },
     group: 'block',

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

@@ -21,6 +21,7 @@ export const highlightMarker = {
         id: { default: '' },
         tid: { default: '' },
         position: { default: '' },
+        content: { default: null },
         dataTracked: { default: null },
     },
     parseDOM: [
@@ -32,18 +33,14 @@ export const highlightMarker = {
                     id: dom.getAttribute('id'),
                     tid: dom.getAttribute('data-target-id'),
                     position: dom.getAttribute('data-position'),
+                    content: dom.innerHTML,
                 };
             },
         },
     ],
     toDOM: (node) => {
         const highlightMarkerNode = node;
-        const dom = document.createElement('span');
-        dom.className = 'highlight-marker';
-        dom.setAttribute('id', highlightMarkerNode.attrs.id);
-        dom.setAttribute('data-target-id', highlightMarkerNode.attrs.tid);
-        dom.setAttribute('data-position', highlightMarkerNode.attrs.position);
-        return dom;
+        return highlightMarkerNode.attrs.content || '';
     },
 };
 export const isHighlightMarkerNode = (node) => node.type === node.type.schema.nodes.highlight_marker;

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

@@ -16,7 +16,6 @@
 export const tableColGroup = {
     content: 'table_col+',
     group: 'block',
-    tableRole: 'colgroup',
     parseDOM: [
         {
             tag: 'colgroup',
@@ -31,7 +30,6 @@ export const tableCol = {
         width: { default: '' },
     },
     group: 'block',
-    tableRole: 'col',
     parseDOM: [
         {
             tag: 'col',

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

@@ -16,8 +16,9 @@
 export const tableElementFooter = {
     attrs: {
         id: { default: '' },
+        dataTracked: { default: null }
     },
-    content: '(paragraph | footnotes_element)+',
+    content: '(paragraph | footnotes_element)*',
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };

package/dist/es/transformer/highlight-markers.js

@@ -101,32 +101,35 @@ export const insertHighlightMarkers = (contents, commentAnnotations) => {
         if (comment.selector) {
             if (comment.selector.from === comment.selector.to) {
                 element = createHighlightElement(comment, 'point');
-                output = injectHighlightMarker(element, comment.selector.from, output);
+                output = injectHighlightMarker(element, comment.selector, output);
             }
             else {
-                element = createHighlightElement(comment, 'start');
-                output = injectHighlightMarker(element, comment.selector.from, output);
-                const updatedEndOffset = element.outerHTML.length + comment.selector.to;
-                element = createHighlightElement(comment, 'end');
-                output = injectHighlightMarker(element, updatedEndOffset, output);
+                element = createHighlightElement(comment, 'range', output.substring(comment.selector.from, comment.selector.to));
+                output = injectHighlightMarker(element, comment.selector, output);
             }
         }
     }
     return output;
 };
-function injectHighlightMarker(element, offset, contents) {
+function injectHighlightMarker(element, selector, contents) {
+    if (!selector) {
+        return '';
+    }
     const parts = [
-        contents.substring(0, offset),
+        contents.substring(0, selector.from),
         element.outerHTML,
-        contents.substring(offset),
+        contents.substring(selector.to),
     ];
     return parts.join('');
 }
-const createHighlightElement = (comment, position) => {
+const createHighlightElement = (comment, position, content) => {
     const element = document.createElement('span');
     element.className = 'highlight-marker';
     element.setAttribute('id', comment._id);
     element.setAttribute('data-target-id', comment.target);
     element.setAttribute('data-position', position);
+    if (content) {
+        element.innerHTML = content;
+    }
     return element;
 };

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

@@ -19,7 +19,7 @@ interface Attrs {
     id: string;
     tid: string;
     position: string;
-    text: string;
+    content?: string;
 }
 export interface HighlightMarkerNode extends ManuscriptNode {
     attrs: Attrs;

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ManuscriptNode, TableNodeSpec } from '../types';
-export type TableColGroupNode = ManuscriptNode;
+import { NodeSpec } from 'prosemirror-model';
+import { ManuscriptNode } from '../types';
 export interface TableColNode extends ManuscriptNode {
     attrs: {
         width: string;
     };
 }
-export declare const tableColGroup: TableNodeSpec;
-export declare const tableCol: TableNodeSpec;
+export declare const tableColGroup: NodeSpec;
+export declare const tableCol: NodeSpec;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "2.1.10",
+  "version": "2.1.12-LEAN-3509-0",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -78,4 +78,4 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.0.5"
   }
-}
+}