@manuscripts/transform 1.3.5-LEAN-2611 → 1.3.5-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.isInBibliographySection = exports.isInGraphicalAbstractSection = exports.findNodePositions = exports.iterateChildren = void 0;
+exports.modelsEqual = exports.getTrimmedTextContent = exports.findParentNodeClosestToPos = 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) {
@@ -83,3 +83,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/mathjax/mathml-to-svg.js

@@ -18,23 +18,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertMathMLToSVG = void 0;
 require("mathjax-full/js/util/entities/all");
 const HTMLAdaptor_1 = require("mathjax-full/js/adaptors/HTMLAdaptor");
-const MmlFactory_1 = require("mathjax-full/js/core/MmlTree/MmlFactory");
 const HTMLDocument_1 = require("mathjax-full/js/handlers/html/HTMLDocument");
 const mathml_1 = require("mathjax-full/js/input/mathml");
 const svg_1 = require("mathjax-full/js/output/svg");
 const transformer_1 = require("../transformer");
-class ManuscriptsMmlFactory extends MmlFactory_1.MmlFactory {
-    constructor() {
-        super();
-        this.nodeMap.set('image', this.nodeMap.get('none'));
-    }
-    create(kind, properties = {}, children = []) {
-        if (kind === 'image') {
-            return this.node['none'](properties, children);
-        }
-        return this.node[kind](properties, children);
-    }
-}
 class ManuscriptsHTMLAdaptor extends HTMLAdaptor_1.HTMLAdaptor {
     setAttribute(node, name, value, ns) {
         if (name !== 'xmlns') {
@@ -50,7 +37,6 @@ const adaptor = new ManuscriptsHTMLAdaptor(window);
 const doc = new HTMLDocument_1.HTMLDocument(document, adaptor, {
     InputJax,
     OutputJax,
-    MmlFactory: new ManuscriptsMmlFactory(),
 });
 doc.addStyleSheet();
 const convertMathMLToSVG = (mathml, display) => {

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);
@@ -526,7 +527,7 @@ const modelFromNode = (node, parent, path, priority) => {
     return { model, commentAnnotationsMap };
 };
 exports.modelFromNode = modelFromNode;
-const encode = (node) => {
+const encode = (node, preserveWithRepeatedID = false) => {
     const models = new Map();
     const priority = {
         value: 1,
@@ -546,8 +547,14 @@ const encode = (node) => {
             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 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}`);
+            }
         }
         models.set(model._id, model);
         child.forEach(addModel(path.concat(child.attrs.id), child));

package/dist/es/lib/utils.js

@@ -74,3 +74,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/mathjax/mathml-to-svg.js

@@ -15,23 +15,10 @@
  */
 import 'mathjax-full/js/util/entities/all';
 import { HTMLAdaptor } from 'mathjax-full/js/adaptors/HTMLAdaptor';
-import { MmlFactory } from 'mathjax-full/js/core/MmlTree/MmlFactory';
 import { HTMLDocument } from 'mathjax-full/js/handlers/html/HTMLDocument';
 import { MathML } from 'mathjax-full/js/input/mathml';
 import { SVG } from 'mathjax-full/js/output/svg';
 import { xmlSerializer } from '../transformer';
-class ManuscriptsMmlFactory extends MmlFactory {
-    constructor() {
-        super();
-        this.nodeMap.set('image', this.nodeMap.get('none'));
-    }
-    create(kind, properties = {}, children = []) {
-        if (kind === 'image') {
-            return this.node['none'](properties, children);
-        }
-        return this.node[kind](properties, children);
-    }
-}
 class ManuscriptsHTMLAdaptor extends HTMLAdaptor {
     setAttribute(node, name, value, ns) {
         if (name !== 'xmlns') {
@@ -47,7 +34,6 @@ const adaptor = new ManuscriptsHTMLAdaptor(window);
 const doc = new HTMLDocument(document, adaptor, {
     InputJax,
     OutputJax,
-    MmlFactory: new ManuscriptsMmlFactory(),
 });
 doc.addStyleSheet();
 export const convertMathMLToSVG = (mathml, display) => {

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);
@@ -517,7 +518,7 @@ export const modelFromNode = (node, parent, path, priority) => {
     }
     return { model, commentAnnotationsMap };
 };
-export const encode = (node) => {
+export const encode = (node, preserveWithRepeatedID = false) => {
     const models = new Map();
     const priority = {
         value: 1,
@@ -537,8 +538,14 @@ export const encode = (node) => {
             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 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}`);
+            }
         }
         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>;
@@ -26,3 +27,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

@@ -25,5 +25,5 @@ export declare const modelFromNode: (node: ManuscriptNode, parent: ManuscriptNod
 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.3.5-LEAN-2611",
+  "version": "1.3.5-LIT-528106",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",