@manuscripts/transform 3.0.10-date-fix.0 → 3.0.11

package/dist/cjs/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./jats"), exports);
 __exportStar(require("./jats/types"), exports);
 __exportStar(require("./lib/section-group-type"), exports);
 __exportStar(require("./lib/table-cell-styles"), exports);
+__exportStar(require("./lib/footnotes"), exports);
 __exportStar(require("./lib/utils"), exports);
 __exportStar(require("./schema"), exports);
 var migrate_1 = require("./schema/migration/migrate");

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

@@ -25,6 +25,7 @@ const debug_1 = __importDefault(require("debug"));
 const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_utils_1 = require("prosemirror-utils");
 const w3c_xmlserializer_1 = __importDefault(require("w3c-xmlserializer"));
+const footnotes_1 = require("../../lib/footnotes");
 const html_1 = require("../../lib/html");
 const schema_1 = require("../../schema");
 const transformer_1 = require("../../transformer");
@@ -139,6 +140,7 @@ class JATSExporter {
             article.appendChild(front);
             article.setAttribute('article-type', manuscriptNode.attrs.articleType || 'other');
             this.labelTargets = (0, labels_1.buildTargets)(manuscriptNode);
+            this.footnoteLabels = (0, footnotes_1.generateFootnoteLabels)(manuscriptNode);
             const body = this.buildBody();
             article.appendChild(body);
             const back = this.buildBack(body);
@@ -701,17 +703,13 @@ class JATSExporter {
                 hard_break: () => '',
                 highlight_marker: () => '',
                 inline_footnote: (node) => {
-                    const rids = node.attrs.rids.filter((rid) => {
-                        var _a;
-                        return (_a = (0, prosemirror_utils_1.findChildrenByAttr)(this.manuscriptNode, (attrs) => attrs.id === rid)[0]) === null || _a === void 0 ? void 0 : _a.node;
-                    });
-                    if (rids.length == 0) {
-                        return '';
-                    }
+                    const rids = node.attrs.rids;
                     const xref = this.document.createElement('xref');
                     xref.setAttribute('ref-type', 'fn');
                     xref.setAttribute('rid', normalizeID(rids.join(' ')));
-                    xref.textContent = node.attrs.contents;
+                    xref.textContent = rids
+                        .map((rid) => this.footnoteLabels.get(rid))
+                        .join(', ');
                     return xref;
                 },
                 keyword: () => '',

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

@@ -971,7 +971,6 @@ const nodes = [
             const element = node;
             return {
                 rids: ((_a = element.getAttribute('rid')) === null || _a === void 0 ? void 0 : _a.split(/\s+/)) || [],
-                contents: (0, utils_1.getTrimmedTextContent)(element),
             };
         },
     },

package/dist/cjs/lib/footnotes.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateAlphaFootnoteLabel = exports.generateNumericFootnoteLabel = exports.footnoteLabelGenerator = exports.generateFootnoteLabels = void 0;
+const schema_1 = require("../schema");
+const generateFootnoteLabels = (doc) => {
+    const labels = new Map();
+    doc.descendants((node, pos, parent) => {
+        if ((0, schema_1.isFootnotesElementNode)(node) && parent) {
+            const generator = (0, exports.footnoteLabelGenerator)(parent);
+            for (let i = 0; i < node.childCount; i++) {
+                const footnote = node.child(i);
+                const label = generator(i);
+                labels.set(footnote.attrs.id, label);
+            }
+            return false;
+        }
+    });
+    return labels;
+};
+exports.generateFootnoteLabels = generateFootnoteLabels;
+const footnoteLabelGenerator = (parent) => {
+    if ((0, schema_1.isTableElementFooter)(parent)) {
+        return exports.generateNumericFootnoteLabel;
+    }
+    else {
+        return exports.generateAlphaFootnoteLabel;
+    }
+};
+exports.footnoteLabelGenerator = footnoteLabelGenerator;
+const generateNumericFootnoteLabel = (index) => String(index + 1);
+exports.generateNumericFootnoteLabel = generateNumericFootnoteLabel;
+const generateAlphaFootnoteLabel = (index) => {
+    const unicodeInterval = [97, 123];
+    const places = unicodeInterval[1] - unicodeInterval[0];
+    function getClassCount(n, order) {
+        return n * Math.pow(places, order - 1);
+    }
+    let indices = null;
+    for (;;) {
+        let current = index;
+        let position = 1;
+        while (current >= places) {
+            current = current / places;
+            position++;
+        }
+        const newIndex = Math.floor(current);
+        indices = indices ? indices : new Array(position).fill(0);
+        indices.splice(indices.length - position, 1, newIndex);
+        index -= getClassCount(newIndex, position);
+        if (position === 1) {
+            break;
+        }
+    }
+    return (indices || [])
+        .map((v, i, array) => {
+        if (array.length > 1 && i !== array.length - 1) {
+            return String.fromCodePoint(v + unicodeInterval[0] - 1);
+        }
+        return String.fromCodePoint(v + unicodeInterval[0]);
+    })
+        .join('');
+};
+exports.generateAlphaFootnoteLabel = generateAlphaFootnoteLabel;

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generalTableFootnote = void 0;
+exports.isGeneralTableFootnoteNode = exports.generalTableFootnote = void 0;
 exports.generalTableFootnote = {
     content: 'paragraph*',
     attrs: {
@@ -25,3 +25,5 @@ exports.generalTableFootnote = {
     group: 'block',
     toDOM: () => ['div', { class: 'general-table-footnote' }, 0],
 };
+const isGeneralTableFootnoteNode = (node) => node.type === node.type.schema.nodes.general_table_footnote;
+exports.isGeneralTableFootnoteNode = isGeneralTableFootnoteNode;

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

@@ -18,8 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isInlineFootnoteNode = exports.inlineFootnote = void 0;
 exports.inlineFootnote = {
     attrs: {
+        id: { default: '' },
         rids: { default: [] },
-        contents: { default: '' },
         dataTracked: { default: null },
     },
     atom: true,
@@ -28,13 +28,13 @@ exports.inlineFootnote = {
     group: 'inline',
     parseDOM: [
         {
-            tag: 'span.footnote',
+            tag: 'span.footnote-marker',
             getAttrs: (p) => {
                 var _a;
                 const dom = p;
                 return {
+                    id: dom.id,
                     rids: ((_a = dom.getAttribute('data-reference-id')) === null || _a === void 0 ? void 0 : _a.split(/\s+/)) || [],
-                    contents: dom.textContent,
                 };
             },
         },
@@ -42,9 +42,9 @@ exports.inlineFootnote = {
     toDOM: (node) => {
         const footnoteNode = node;
         const dom = document.createElement('span');
-        dom.className = 'footnote';
+        dom.id = footnoteNode.attrs.id;
+        dom.className = 'footnote-marker';
         dom.setAttribute('data-reference-id', footnoteNode.attrs.rids.join(' '));
-        dom.textContent = footnoteNode.attrs.contents;
         return dom;
     },
 };

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableElement = void 0;
+exports.isTableElementNode = exports.tableElement = void 0;
 exports.tableElement = {
     content: ' figcaption? (table | placeholder) table_colgroup? table_element_footer? (listing | placeholder)',
     attrs: {
@@ -48,3 +48,5 @@ exports.tableElement = {
         ];
     },
 };
+const isTableElementNode = (node) => node.type === node.type.schema.nodes.table_element;
+exports.isTableElementNode = isTableElementNode;

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tableElementFooter = void 0;
+exports.isTableElementFooter = exports.tableElementFooter = void 0;
 exports.tableElementFooter = {
     attrs: {
         id: { default: '' },
@@ -25,3 +25,5 @@ exports.tableElementFooter = {
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };
+const isTableElementFooter = (node) => node.type === node.type.schema.nodes.table_element_footer;
+exports.isTableElementFooter = isTableElementFooter;

package/dist/cjs/transformer/id.js

@@ -22,10 +22,12 @@ const generateNodeID = (type) => {
     const uniqueID = ':' + (0, uuid_1.v4)().toUpperCase();
     let name = node_types_1.nodeTypesMap.get(type);
     if (name === undefined) {
-        name = type.name
-            .split('_')
-            .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
-            .join('');
+        name =
+            'MP' +
+                type.name
+                    .split('_')
+                    .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
+                    .join('');
     }
     return name + uniqueID;
 };

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.10-date-fix.0";
+exports.VERSION = "3.0.11";

package/dist/es/index.js

@@ -4,6 +4,7 @@ export * from './jats';
 export * from './jats/types';
 export * from './lib/section-group-type';
 export * from './lib/table-cell-styles';
+export * from './lib/footnotes';
 export * from './lib/utils';
 export * from './schema';
 export { migrateFor } from './schema/migration/migrate';

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

@@ -19,6 +19,7 @@ import debug from 'debug';
 import { DOMParser as ProsemirrorDOMParser, DOMSerializer, } from 'prosemirror-model';
 import { findChildrenByAttr, findChildrenByType } from 'prosemirror-utils';
 import serializeToXML from 'w3c-xmlserializer';
+import { generateFootnoteLabels } from '../../lib/footnotes';
 import { nodeFromHTML, textFromHTML } from '../../lib/html';
 import { isCitationNode, schema, } from '../../schema';
 import { chooseJatsFnType, chooseSecType, isExecutableNodeType, isNodeType, } from '../../transformer';
@@ -131,6 +132,7 @@ export class JATSExporter {
             article.appendChild(front);
             article.setAttribute('article-type', manuscriptNode.attrs.articleType || 'other');
             this.labelTargets = buildTargets(manuscriptNode);
+            this.footnoteLabels = generateFootnoteLabels(manuscriptNode);
             const body = this.buildBody();
             article.appendChild(body);
             const back = this.buildBack(body);
@@ -693,17 +695,13 @@ export class JATSExporter {
                 hard_break: () => '',
                 highlight_marker: () => '',
                 inline_footnote: (node) => {
-                    const rids = node.attrs.rids.filter((rid) => {
-                        var _a;
-                        return (_a = findChildrenByAttr(this.manuscriptNode, (attrs) => attrs.id === rid)[0]) === null || _a === void 0 ? void 0 : _a.node;
-                    });
-                    if (rids.length == 0) {
-                        return '';
-                    }
+                    const rids = node.attrs.rids;
                     const xref = this.document.createElement('xref');
                     xref.setAttribute('ref-type', 'fn');
                     xref.setAttribute('rid', normalizeID(rids.join(' ')));
-                    xref.textContent = node.attrs.contents;
+                    xref.textContent = rids
+                        .map((rid) => this.footnoteLabels.get(rid))
+                        .join(', ');
                     return xref;
                 },
                 keyword: () => '',

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

@@ -965,7 +965,6 @@ const nodes = [
             const element = node;
             return {
                 rids: ((_a = element.getAttribute('rid')) === null || _a === void 0 ? void 0 : _a.split(/\s+/)) || [],
-                contents: getTrimmedTextContent(element),
             };
         },
     },

package/dist/es/lib/footnotes.js

@@ -0,0 +1,56 @@
+import { isFootnotesElementNode, isTableElementFooter, } from '../schema';
+export const generateFootnoteLabels = (doc) => {
+    const labels = new Map();
+    doc.descendants((node, pos, parent) => {
+        if (isFootnotesElementNode(node) && parent) {
+            const generator = footnoteLabelGenerator(parent);
+            for (let i = 0; i < node.childCount; i++) {
+                const footnote = node.child(i);
+                const label = generator(i);
+                labels.set(footnote.attrs.id, label);
+            }
+            return false;
+        }
+    });
+    return labels;
+};
+export const footnoteLabelGenerator = (parent) => {
+    if (isTableElementFooter(parent)) {
+        return generateNumericFootnoteLabel;
+    }
+    else {
+        return generateAlphaFootnoteLabel;
+    }
+};
+export const generateNumericFootnoteLabel = (index) => String(index + 1);
+export const generateAlphaFootnoteLabel = (index) => {
+    const unicodeInterval = [97, 123];
+    const places = unicodeInterval[1] - unicodeInterval[0];
+    function getClassCount(n, order) {
+        return n * Math.pow(places, order - 1);
+    }
+    let indices = null;
+    for (;;) {
+        let current = index;
+        let position = 1;
+        while (current >= places) {
+            current = current / places;
+            position++;
+        }
+        const newIndex = Math.floor(current);
+        indices = indices ? indices : new Array(position).fill(0);
+        indices.splice(indices.length - position, 1, newIndex);
+        index -= getClassCount(newIndex, position);
+        if (position === 1) {
+            break;
+        }
+    }
+    return (indices || [])
+        .map((v, i, array) => {
+        if (array.length > 1 && i !== array.length - 1) {
+            return String.fromCodePoint(v + unicodeInterval[0] - 1);
+        }
+        return String.fromCodePoint(v + unicodeInterval[0]);
+    })
+        .join('');
+};

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

@@ -22,3 +22,4 @@ export const generalTableFootnote = {
     group: 'block',
     toDOM: () => ['div', { class: 'general-table-footnote' }, 0],
 };
+export const isGeneralTableFootnoteNode = (node) => node.type === node.type.schema.nodes.general_table_footnote;

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

@@ -15,8 +15,8 @@
  */
 export const inlineFootnote = {
     attrs: {
+        id: { default: '' },
         rids: { default: [] },
-        contents: { default: '' },
         dataTracked: { default: null },
     },
     atom: true,
@@ -25,13 +25,13 @@ export const inlineFootnote = {
     group: 'inline',
     parseDOM: [
         {
-            tag: 'span.footnote',
+            tag: 'span.footnote-marker',
             getAttrs: (p) => {
                 var _a;
                 const dom = p;
                 return {
+                    id: dom.id,
                     rids: ((_a = dom.getAttribute('data-reference-id')) === null || _a === void 0 ? void 0 : _a.split(/\s+/)) || [],
-                    contents: dom.textContent,
                 };
             },
         },
@@ -39,9 +39,9 @@ export const inlineFootnote = {
     toDOM: (node) => {
         const footnoteNode = node;
         const dom = document.createElement('span');
-        dom.className = 'footnote';
+        dom.id = footnoteNode.attrs.id;
+        dom.className = 'footnote-marker';
         dom.setAttribute('data-reference-id', footnoteNode.attrs.rids.join(' '));
-        dom.textContent = footnoteNode.attrs.contents;
         return dom;
     },
 };

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

@@ -45,3 +45,4 @@ export const tableElement = {
         ];
     },
 };
+export const isTableElementNode = (node) => node.type === node.type.schema.nodes.table_element;

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

@@ -22,3 +22,4 @@ export const tableElementFooter = {
     group: 'block element',
     toDOM: () => ['table-wrap-foot', 0],
 };
+export const isTableElementFooter = (node) => node.type === node.type.schema.nodes.table_element_footer;

package/dist/es/transformer/id.js

@@ -19,10 +19,12 @@ export const generateNodeID = (type) => {
     const uniqueID = ':' + uuid().toUpperCase();
     let name = nodeTypesMap.get(type);
     if (name === undefined) {
-        name = type.name
-            .split('_')
-            .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
-            .join('');
+        name =
+            'MP' +
+                type.name
+                    .split('_')
+                    .map((w) => w.charAt(0).toUpperCase() + w.slice(1))
+                    .join('');
     }
     return name + uniqueID;
 };

package/dist/es/version.js

@@ -1 +1 @@
-export const VERSION = "3.0.10-date-fix.0";
+export const VERSION = "3.0.11";

package/dist/types/index.d.ts

@@ -4,6 +4,7 @@ export * from './jats';
 export * from './jats/types';
 export * from './lib/section-group-type';
 export * from './lib/table-cell-styles';
+export * from './lib/footnotes';
 export * from './lib/utils';
 export * from './schema';
 export { JSONNode, migrateFor } from './schema/migration/migrate';

package/dist/types/jats/exporter/jats-exporter.d.ts

@@ -45,6 +45,7 @@ export declare class JATSExporter {
     protected document: Document;
     protected serializer: DOMSerializer;
     protected labelTargets: Map<string, Target>;
+    protected footnoteLabels: Map<string, string>;
     protected citationTexts: Map<string, string>;
     protected citationProvider: CitationProvider;
     protected manuscriptNode: ManuscriptNode;

package/dist/types/lib/footnotes.d.ts

@@ -0,0 +1,5 @@
+import { ManuscriptNode } from '../schema';
+export declare const generateFootnoteLabels: (doc: ManuscriptNode) => Map<any, any>;
+export declare const footnoteLabelGenerator: (parent: ManuscriptNode) => (index: number) => string;
+export declare const generateNumericFootnoteLabel: (index: number) => string;
+export declare const generateAlphaFootnoteLabel: (index: number) => string;

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

@@ -18,8 +18,9 @@ import { ManuscriptNode } from '../types';
 interface Attrs {
     id: string;
 }
-export interface GeneralTableFootnote extends ManuscriptNode {
+export interface GeneralTableFootnoteNode extends ManuscriptNode {
     attrs: Attrs;
 }
 export declare const generalTableFootnote: NodeSpec;
+export declare const isGeneralTableFootnoteNode: (node: ManuscriptNode) => node is GeneralTableFootnoteNode;
 export {};

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

@@ -16,8 +16,8 @@
 import { NodeSpec } from 'prosemirror-model';
 import { ManuscriptNode } from '../types';
 interface Attrs {
+    id: string;
     rids: string[];
-    contents: string;
 }
 export interface InlineFootnoteNode extends ManuscriptNode {
     attrs: Attrs;

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

@@ -22,4 +22,5 @@ export interface TableElementNode extends ManuscriptNode {
     attrs: Attrs;
 }
 export declare const tableElement: NodeSpec;
+export declare const isTableElementNode: (node: ManuscriptNode) => node is TableElementNode;
 export {};

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

@@ -22,4 +22,5 @@ export interface TableElementFooterNode extends ManuscriptNode {
     attrs: Attrs;
 }
 export declare const tableElementFooter: NodeSpec;
+export declare const isTableElementFooter: (node: ManuscriptNode) => node is TableElementFooterNode;
 export {};

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.0.10-date-fix.0";
+export declare const VERSION = "3.0.11";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "3.0.10-date-fix.0",
+  "version": "3.0.11",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -83,4 +83,4 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.0.5"
   }
-}
+}