@manuscripts/transform 1.5.0-LIT-528106 → 1.5.1

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

@@ -1302,7 +1302,7 @@ class JATSExporter {
                         authorNotesEl.appendChild(correspondingEl);
                     });
                     if (authorNotesEl.childNodes.length > 0) {
-                        articleMeta.appendChild(authorNotesEl);
+                        articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
                     }
                 }
             }
@@ -1626,7 +1626,22 @@ class JATSExporter {
                             authorNoteEl.append(...authorNotes.childNodes);
                         }
                         else {
-                            articleMeta.appendChild(authorNotes);
+                            const appendableSelectors = [
+                                'contrib-group',
+                                'title-group',
+                                'article-id',
+                            ];
+                            const appendable = [
+                                ...articleMeta.querySelectorAll(appendableSelectors.join(', ')),
+                            ];
+                            for (let i = 0; i < appendableSelectors.length; i++) {
+                                const sel = appendableSelectors[i];
+                                const match = appendable.find((el) => el.matches(sel));
+                                if (match) {
+                                    articleMeta.insertBefore(authorNotes, match.nextSibling);
+                                    break;
+                                }
+                            }
                         }
                     }
                 }

package/dist/cjs/lib/utils.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.modelsEqual = exports.getTrimmedTextContent = exports.findParentNodeClosestToPos = exports.isInAbstractsSection = exports.isInBibliographySection = exports.isInGraphicalAbstractSection = exports.findNodePositions = exports.iterateChildren = void 0;
+exports.getTrimmedTextContent = exports.findParentNodeClosestToPos = exports.isInAbstractsSection = exports.isInBibliographySection = exports.isInGraphicalAbstractSection = exports.findNodePositions = exports.iterateChildren = void 0;
 const bibliography_section_1 = require("../schema/nodes/bibliography_section");
 const graphical_abstract_section_1 = require("../schema/nodes/graphical_abstract_section");
 function* iterateChildren(node, recurse = false) {
@@ -94,16 +94,3 @@ const getTrimmedTextContent = (node, querySelector) => {
     return (_b = (_a = node.querySelector(querySelector)) === null || _a === void 0 ? void 0 : _a.textContent) === null || _b === void 0 ? void 0 : _b.trim();
 };
 exports.getTrimmedTextContent = getTrimmedTextContent;
-function modelsEqual(model, model2) {
-    for (const v in model) {
-        for (const v2 in model2) {
-            const prepV = typeof v == 'object' ? JSON.stringify(v) : v;
-            const prepV2 = typeof v2 == 'object' ? JSON.stringify(v2) : v2;
-            if (prepV !== prepV2) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-exports.modelsEqual = modelsEqual;

package/dist/cjs/transformer/encode.js

@@ -25,7 +25,6 @@ const utils_1 = require("../lib/utils");
 const schema_1 = require("../schema");
 const builders_1 = require("./builders");
 const highlight_markers_1 = require("./highlight-markers");
-const id_1 = require("./id");
 const node_types_1 = require("./node-types");
 const section_category_1 = require("./section-category");
 const serializer = prosemirror_model_1.DOMSerializer.fromSchema(schema_1.schema);
@@ -571,7 +570,7 @@ const modelFromNode = (node, parent, path, priority) => {
     return { model, commentAnnotationsMap };
 };
 exports.modelFromNode = modelFromNode;
-const encode = (node, preserveWithRepeatedID = false) => {
+const encode = (node) => {
     const models = new Map();
     const priority = {
         value: 1,
@@ -591,14 +590,8 @@ const encode = (node, preserveWithRepeatedID = false) => {
             return;
         }
         const { model } = (0, exports.modelFromNode)(child, parent, path, priority);
-        const existingModel = models.get(model._id);
-        if (existingModel) {
-            if (preserveWithRepeatedID && !(0, utils_1.modelsEqual)(model, existingModel)) {
-                model._id = (0, id_1.generateID)(model.objectType);
-            }
-            else {
-                throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
-            }
+        if (models.has(model._id)) {
+            throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
         }
         models.set(model._id, model);
         child.forEach(addModel(path.concat(child.attrs.id), child));

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

@@ -1295,7 +1295,7 @@ export class JATSExporter {
                         authorNotesEl.appendChild(correspondingEl);
                     });
                     if (authorNotesEl.childNodes.length > 0) {
-                        articleMeta.appendChild(authorNotesEl);
+                        articleMeta.insertBefore(authorNotesEl, contribGroup.nextSibling);
                     }
                 }
             }
@@ -1619,7 +1619,22 @@ export class JATSExporter {
                             authorNoteEl.append(...authorNotes.childNodes);
                         }
                         else {
-                            articleMeta.appendChild(authorNotes);
+                            const appendableSelectors = [
+                                'contrib-group',
+                                'title-group',
+                                'article-id',
+                            ];
+                            const appendable = [
+                                ...articleMeta.querySelectorAll(appendableSelectors.join(', ')),
+                            ];
+                            for (let i = 0; i < appendableSelectors.length; i++) {
+                                const sel = appendableSelectors[i];
+                                const match = appendable.find((el) => el.matches(sel));
+                                if (match) {
+                                    articleMeta.insertBefore(authorNotes, match.nextSibling);
+                                    break;
+                                }
+                            }
                         }
                     }
                 }

package/dist/es/lib/utils.js

@@ -84,15 +84,3 @@ export const getTrimmedTextContent = (node, querySelector) => {
     }
     return (_b = (_a = node.querySelector(querySelector)) === null || _a === void 0 ? void 0 : _a.textContent) === null || _b === void 0 ? void 0 : _b.trim();
 };
-export function modelsEqual(model, model2) {
-    for (const v in model) {
-        for (const v2 in model2) {
-            const prepV = typeof v == 'object' ? JSON.stringify(v) : v;
-            const prepV2 = typeof v2 == 'object' ? JSON.stringify(v2) : v2;
-            if (prepV !== prepV2) {
-                return false;
-            }
-        }
-    }
-    return true;
-}

package/dist/es/transformer/encode.js

@@ -15,11 +15,10 @@
  */
 import { DOMSerializer } from 'prosemirror-model';
 import serializeToXML from 'w3c-xmlserializer';
-import { iterateChildren, modelsEqual } from '../lib/utils';
+import { iterateChildren } from '../lib/utils';
 import { hasGroup, isHighlightMarkerNode, isSectionNode, schema, } from '../schema';
 import { buildAttribution } from './builders';
 import { extractHighlightMarkers, isHighlightableModel, } from './highlight-markers';
-import { generateID } from './id';
 import { nodeTypesMap } from './node-types';
 import { buildSectionCategory } from './section-category';
 const serializer = DOMSerializer.fromSchema(schema);
@@ -562,7 +561,7 @@ export const modelFromNode = (node, parent, path, priority) => {
     }
     return { model, commentAnnotationsMap };
 };
-export const encode = (node, preserveWithRepeatedID = false) => {
+export const encode = (node) => {
     const models = new Map();
     const priority = {
         value: 1,
@@ -582,14 +581,8 @@ export const encode = (node, preserveWithRepeatedID = false) => {
             return;
         }
         const { model } = modelFromNode(child, parent, path, priority);
-        const existingModel = models.get(model._id);
-        if (existingModel) {
-            if (preserveWithRepeatedID && !modelsEqual(model, existingModel)) {
-                model._id = generateID(model.objectType);
-            }
-            else {
-                throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
-            }
+        if (models.has(model._id)) {
+            throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
         }
         models.set(model._id, model);
         child.forEach(addModel(path.concat(child.attrs.id), child));

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

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Model } from '@manuscripts/json-schema';
 import { Node as ProsemirrorNode, ResolvedPos } from 'prosemirror-model';
 import { ManuscriptEditorState, ManuscriptNode } from '../schema';
 export declare function iterateChildren(node: ManuscriptNode, recurse?: boolean): Iterable<ManuscriptNode>;
@@ -28,4 +27,3 @@ export declare const findParentNodeClosestToPos: ($pos: ResolvedPos, predicate:
     node: ProsemirrorNode;
 } | undefined;
 export declare const getTrimmedTextContent: (node: Element | Document, querySelector: string) => string | null | undefined;
-export declare function modelsEqual(model: Model, model2: Model): boolean;

package/dist/types/transformer/encode.d.ts

@@ -25,5 +25,5 @@ export declare const modelFromNode: (node: ManuscriptNode, parent: ManuscriptNod
 interface PrioritizedValue {
     value: number;
 }
-export declare const encode: (node: ManuscriptNode, preserveWithRepeatedID?: boolean) => Map<string, Model>;
+export declare const encode: (node: ManuscriptNode) => Map<string, Model>;
 export {};

package/package.json

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