@manuscripts/transform 1.5.0-LEAN-3014-B-0 → 1.5.0-LIT-528106

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

@@ -598,8 +598,6 @@ class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                affiliation_list: () => '',
-                contributor_list: () => '',
                 affiliations_section: () => '',
                 contributors_section: () => '',
                 table_element_footer: () => ['table-wrap-foot', 0],

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/index.js

@@ -33,7 +33,6 @@ exports.schema = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
 const marks_1 = require("./marks");
 const affiliation_1 = require("./nodes/affiliation");
-const affiliation_list_1 = require("./nodes/affiliation_list");
 const affiliations_section_1 = require("./nodes/affiliations_section");
 const attribution_1 = require("./nodes/attribution");
 const bibliography_element_1 = require("./nodes/bibliography_element");
@@ -46,7 +45,6 @@ const citation_1 = require("./nodes/citation");
 const comment_1 = require("./nodes/comment");
 const comment_list_1 = require("./nodes/comment_list");
 const contributor_1 = require("./nodes/contributor");
-const contributor_list_1 = require("./nodes/contributor_list");
 const contributors_section_1 = require("./nodes/contributors_section");
 const cross_reference_1 = require("./nodes/cross_reference");
 const doc_1 = require("./nodes/doc");
@@ -220,7 +218,5 @@ exports.schema = new prosemirror_model_1.Schema({
         table_element_footer: table_element_footer_1.tableElementFooter,
         affiliations_section: affiliations_section_1.affiliationsSection,
         contributors_section: contributors_section_1.contributorsSection,
-        affiliation_list: affiliation_list_1.affiliationList,
-        contributor_list: contributor_list_1.contributorList,
     },
 });

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);
@@ -570,7 +571,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,
@@ -590,8 +591,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/jats/jats-exporter.js

@@ -591,8 +591,6 @@ export class JATSExporter {
         this.createSerializer = () => {
             const getModel = (id) => id ? this.modelMap.get(id) : undefined;
             const nodes = {
-                affiliation_list: () => '',
-                contributor_list: () => '',
                 affiliations_section: () => '',
                 contributors_section: () => '',
                 table_element_footer: () => ['table-wrap-foot', 0],

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/index.js

@@ -16,7 +16,6 @@
 import { Schema } from 'prosemirror-model';
 import { bold, code, italic, smallcaps, strikethrough, styled, subscript, superscript, tracked_delete, tracked_insert, underline, } from './marks';
 import { affiliation } from './nodes/affiliation';
-import { affiliationList } from './nodes/affiliation_list';
 import { affiliationsSection } from './nodes/affiliations_section';
 import { attribution } from './nodes/attribution';
 import { bibliographyElement } from './nodes/bibliography_element';
@@ -29,7 +28,6 @@ import { citation } from './nodes/citation';
 import { comment } from './nodes/comment';
 import { commentList } from './nodes/comment_list';
 import { contributor } from './nodes/contributor';
-import { contributorList } from './nodes/contributor_list';
 import { contributorsSection } from './nodes/contributors_section';
 import { crossReference } from './nodes/cross_reference';
 import { doc } from './nodes/doc';
@@ -203,7 +201,5 @@ export const schema = new Schema({
         table_element_footer: tableElementFooter,
         affiliations_section: affiliationsSection,
         contributors_section: contributorsSection,
-        affiliation_list: affiliationList,
-        contributor_list: contributorList,
     },
 });

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);
@@ -561,7 +562,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,
@@ -581,8 +582,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>;
@@ -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/schema/types.d.ts

@@ -17,7 +17,7 @@ import { Fragment, Mark as ProsemirrorMark, MarkType, Node as ProsemirrorNode, N
 import { EditorState, NodeSelection, Plugin, TextSelection, Transaction } from 'prosemirror-state';
 import { EditorView, NodeView } from 'prosemirror-view';
 export type Marks = 'bold' | 'code' | 'italic' | 'smallcaps' | 'strikethrough' | 'styled' | 'subscript' | 'superscript' | 'underline' | 'tracked_insert' | 'tracked_delete';
-export type Nodes = 'attribution' | 'bibliography_item' | 'bibliography_element' | 'bibliography_section' | 'blockquote_element' | 'bullet_list' | 'caption' | 'caption_title' | 'comment' | 'comment_list' | 'citation' | 'cross_reference' | 'doc' | 'equation' | 'equation_element' | 'figcaption' | 'figure' | 'graphical_abstract_section' | 'figure_element' | 'footnote' | 'footnotes_element' | 'footnotes_section' | 'hard_break' | 'highlight_marker' | 'inline_equation' | 'inline_footnote' | 'keyword' | 'keywords_element' | 'keywords_group' | 'keywords_section' | 'link' | 'list_item' | 'listing' | 'listing_element' | 'manuscript' | 'missing_figure' | 'ordered_list' | 'paragraph' | 'placeholder' | 'placeholder_element' | 'pullquote_element' | 'section' | 'section_label' | 'section_title' | 'section_title_plain' | 'table' | 'table_body' | 'table_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'meta_section' | 'contributor' | 'table_element_footer' | 'affiliations_section' | 'contributors_section' | 'affiliation_list' | 'contributor_list';
+export type Nodes = 'attribution' | 'bibliography_item' | 'bibliography_element' | 'bibliography_section' | 'blockquote_element' | 'bullet_list' | 'caption' | 'caption_title' | 'comment' | 'comment_list' | 'citation' | 'cross_reference' | 'doc' | 'equation' | 'equation_element' | 'figcaption' | 'figure' | 'graphical_abstract_section' | 'figure_element' | 'footnote' | 'footnotes_element' | 'footnotes_section' | 'hard_break' | 'highlight_marker' | 'inline_equation' | 'inline_footnote' | 'keyword' | 'keywords_element' | 'keywords_group' | 'keywords_section' | 'link' | 'list_item' | 'listing' | 'listing_element' | 'manuscript' | 'missing_figure' | 'ordered_list' | 'paragraph' | 'placeholder' | 'placeholder_element' | 'pullquote_element' | 'section' | 'section_label' | 'section_title' | 'section_title_plain' | 'table' | 'table_body' | 'table_cell' | 'table_element' | 'table_row' | 'table_colgroup' | 'table_col' | 'text' | 'toc_element' | 'toc_section' | 'affiliation' | 'meta_section' | 'contributor' | 'table_element_footer' | 'affiliations_section' | 'contributors_section';
 export type ManuscriptSchema = Schema<Nodes, Marks>;
 export type ManuscriptEditorState = EditorState;
 export type ManuscriptEditorView = EditorView;

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.5.0-LEAN-3014-B-0",
+  "version": "1.5.0-LIT-528106",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",

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

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.affiliationList = void 0;
-exports.affiliationList = {
-    content: 'affiliation*',
-    attrs: {
-        id: { default: 'AFFILIATION_LIST' },
-    },
-    toDOM: () => ['section', 0],
-};

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

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.contributorList = void 0;
-exports.contributorList = {
-    content: 'contributor*',
-    attrs: {
-        id: { default: 'CONTRIBUTOR_LIST' },
-    },
-    toDOM: () => ['section', 0],
-};

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

@@ -1,7 +0,0 @@
-export const affiliationList = {
-    content: 'affiliation*',
-    attrs: {
-        id: { default: 'AFFILIATION_LIST' },
-    },
-    toDOM: () => ['section', 0],
-};

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

@@ -1,7 +0,0 @@
-export const contributorList = {
-    content: 'contributor*',
-    attrs: {
-        id: { default: 'CONTRIBUTOR_LIST' },
-    },
-    toDOM: () => ['section', 0],
-};

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

@@ -1,10 +0,0 @@
-import { NodeSpec } from 'prosemirror-model';
-import { ManuscriptNode } from '../types';
-interface Attrs {
-    id: string;
-}
-export interface AffiliationListNode extends ManuscriptNode {
-    attrs: Attrs;
-}
-export declare const affiliationList: NodeSpec;
-export {};

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

@@ -1,10 +0,0 @@
-import { NodeSpec } from 'prosemirror-model';
-import { ManuscriptNode } from '../types';
-interface Attrs {
-    id: string;
-}
-export interface ContributorListNode extends ManuscriptNode {
-    attrs: Attrs;
-}
-export declare const contributorList: NodeSpec;
-export {};