@manuscripts/transform 1.5.5 → 1.5.7-LIT-528106

package/dist/cjs/lib/utils.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrimmedTextContent = exports.findParentNodeClosestToPos = exports.isInAbstractsSection = exports.isInBibliographySection = exports.isInGraphicalAbstractSection = exports.findNodePositions = exports.iterateChildren = void 0;
+exports.modelsEqual = 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,3 +94,16 @@ 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/schema/nodes/graphical_abstract_section.js

@@ -21,6 +21,7 @@ exports.graphicalAbstractSection = {
     attrs: {
         id: { default: '' },
         category: { default: '' },
+        dataTracked: { default: null },
     },
     group: 'block sections',
     selectable: false,

package/dist/cjs/transformer/encode.js

@@ -25,6 +25,7 @@ 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);
@@ -573,10 +574,11 @@ const modelFromNode = (node, parent, path, priority) => {
     if ((0, highlight_markers_1.isHighlightableModel)(model)) {
         (0, highlight_markers_1.extractHighlightMarkers)(model, commentAnnotationsMap);
     }
-    return { model, commentAnnotationsMap };
+    const comments = [...commentAnnotationsMap.values()];
+    return { model, comments };
 };
 exports.modelFromNode = modelFromNode;
-const encode = (node) => {
+const encode = (node, preserveWithRepeatedID = false) => {
     const models = new Map();
     const priority = {
         value: 1,
@@ -595,10 +597,24 @@ const encode = (node) => {
         if (placeholders.includes(child.type.name)) {
             return;
         }
-        const { model } = (0, exports.modelFromNode)(child, parent, path, priority);
-        if (models.has(model._id)) {
-            throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
+        const { model, comments } = (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}`);
+            }
         }
+        comments.forEach((comment) => {
+            const proseMirrorComment = models.get(comment._id);
+            if (proseMirrorComment) {
+                ;
+                proseMirrorComment.selector = comment.selector;
+                models.set(comment._id, proseMirrorComment);
+            }
+        });
         models.set(model._id, model);
         child.forEach(addModel(path.concat(child.attrs.id), child));
     };

package/dist/es/lib/utils.js

@@ -84,3 +84,15 @@ 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/schema/nodes/graphical_abstract_section.js

@@ -18,6 +18,7 @@ export const graphicalAbstractSection = {
     attrs: {
         id: { default: '' },
         category: { default: '' },
+        dataTracked: { default: null },
     },
     group: 'block sections',
     selectable: false,

package/dist/es/transformer/encode.js

@@ -15,10 +15,11 @@
  */
 import { DOMSerializer } from 'prosemirror-model';
 import serializeToXML from 'w3c-xmlserializer';
-import { iterateChildren } from '../lib/utils';
+import { iterateChildren, modelsEqual } 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);
@@ -565,9 +566,10 @@ export const modelFromNode = (node, parent, path, priority) => {
     if (isHighlightableModel(model)) {
         extractHighlightMarkers(model, commentAnnotationsMap);
     }
-    return { model, commentAnnotationsMap };
+    const comments = [...commentAnnotationsMap.values()];
+    return { model, comments };
 };
-export const encode = (node) => {
+export const encode = (node, preserveWithRepeatedID = false) => {
     const models = new Map();
     const priority = {
         value: 1,
@@ -586,10 +588,24 @@ export const encode = (node) => {
         if (placeholders.includes(child.type.name)) {
             return;
         }
-        const { model } = modelFromNode(child, parent, path, priority);
-        if (models.has(model._id)) {
-            throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
+        const { model, comments } = 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}`);
+            }
         }
+        comments.forEach((comment) => {
+            const proseMirrorComment = models.get(comment._id);
+            if (proseMirrorComment) {
+                ;
+                proseMirrorComment.selector = comment.selector;
+                models.set(comment._id, proseMirrorComment);
+            }
+        });
         models.set(model._id, model);
         child.forEach(addModel(path.concat(child.attrs.id), child));
     };

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

@@ -13,6 +13,7 @@
  * 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>;
@@ -27,3 +28,4 @@ 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

@@ -20,10 +20,10 @@ export declare const inlineContents: (node: ManuscriptNode) => string;
 export declare const inlineText: (node: ManuscriptNode) => string;
 export declare const modelFromNode: (node: ManuscriptNode, parent: ManuscriptNode, path: string[], priority: PrioritizedValue) => {
     model: Model;
-    commentAnnotationsMap: Map<string, Build<CommentAnnotation>>;
+    comments: Build<CommentAnnotation>[];
 };
 interface PrioritizedValue {
     value: number;
 }
-export declare const encode: (node: ManuscriptNode) => Map<string, Model>;
+export declare const encode: (node: ManuscriptNode, preserveWithRepeatedID?: boolean) => Map<string, Model>;
 export {};

package/package.json

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