@manuscripts/transform 1.1.2 → 1.1.3-LEAN-2066

package/dist/cjs/jats/importer/jats-comments.js

@@ -63,6 +63,21 @@ const insertToken = (doc, processingInstructionNode, authorQueriesMap) => {
         return parentElement.insertBefore(tokenNode, processingInstructionNode);
     }
 };
+const extractCommentsFromKeywords = (tokens, model, authorQueriesMap) => {
+    var _a;
+    const commentAnnotations = [];
+    const name = model.name;
+    const filteredTokens = filterAndSortTokens(tokens, name);
+    let content = name;
+    for (const token of filteredTokens) {
+        content = name.replace(token, '');
+        const query = authorQueriesMap.get(token);
+        const commentAnnotation = (0, transformer_1.buildComment)((_a = model.containedGroup) !== null && _a !== void 0 ? _a : (0, uuid_1.v4)(), `${query}`, undefined, [(0, transformer_1.buildContribution)(DEFAULT_PROFILE_ID)], DEFAULT_ANNOTATION_COLOR);
+        model['name'] = content;
+        commentAnnotations.push(commentAnnotation);
+    }
+    return commentAnnotations;
+};
 const createComments = (authorQueriesMap, manuscriptModels) => {
     const tokens = [...authorQueriesMap.keys()];
     const commentAnnotations = [];
@@ -71,10 +86,19 @@ const createComments = (authorQueriesMap, manuscriptModels) => {
             const comments = addCommentsFromMarkedProcessingInstructions(tokens, model, authorQueriesMap);
             commentAnnotations.push(...comments);
         }
+        else if ((0, transformer_1.isKeyword)(model)) {
+            const comments = extractCommentsFromKeywords(tokens, model, authorQueriesMap);
+            commentAnnotations.push(...comments);
+        }
     }
     return commentAnnotations;
 };
 exports.createComments = createComments;
+function filterAndSortTokens(tokens, content) {
+    return tokens
+        .filter((token) => content.indexOf(token) >= 0)
+        .sort((a, b) => content.indexOf(a) - content.indexOf(b));
+}
 const addCommentsFromMarkedProcessingInstructions = (tokens, model, authorQueriesMap) => {
     const commentAnnotations = [];
     for (const field of ['contents', 'caption', 'title']) {

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

@@ -22,5 +22,8 @@ exports.comment = {
         contents: { default: '' },
         target: { default: '' },
         selector: { default: null },
+        resolved: { default: false },
+        contributions: { default: [] },
+        originalText: { default: '' },
     },
 };

package/dist/cjs/transformer/decode.js

@@ -547,6 +547,9 @@ class Decoder {
                     contents: model.contents,
                     selector: model.selector,
                     target: model.target,
+                    resolved: model.resolved,
+                    contributions: model.contributions,
+                    originalText: model.originalText,
                 });
             },
         };

package/dist/cjs/transformer/encode.js

@@ -362,6 +362,9 @@ const encoders = {
         selector: node.attrs.selector,
         target: node.attrs.target,
         contents: node.attrs.contents,
+        resolved: node.attrs.resolved,
+        contributions: node.attrs.contributions,
+        originalText: node.attrs.originalText,
     }),
     footnote: (node, parent) => ({
         containingObject: parent.attrs.id,
@@ -532,12 +535,11 @@ const encode = (node) => {
         if (placeholders.includes(child.type.name)) {
             return;
         }
-        const { model, commentAnnotationsMap } = (0, exports.modelFromNode)(child, parent, path, priority);
+        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}`);
         }
         models.set(model._id, model);
-        commentAnnotationsMap.forEach((val, key) => models.set(key, val));
         child.forEach(addModel(path.concat(child.attrs.id), child));
     };
     node.forEach((cNode) => {

package/dist/cjs/transformer/object-types.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCommentAnnotation = exports.isUserProfile = exports.isTable = exports.isManuscript = exports.isFigure = exports.hasObjectType = exports.isManuscriptModel = exports.manuscriptObjects = exports.elementObjects = exports.ExtraObjectTypes = void 0;
+exports.isKeyword = exports.isCommentAnnotation = exports.isUserProfile = exports.isTable = exports.isManuscript = exports.isFigure = exports.hasObjectType = exports.isManuscriptModel = exports.manuscriptObjects = exports.elementObjects = exports.ExtraObjectTypes = void 0;
 const json_schema_1 = require("@manuscripts/json-schema");
 var ExtraObjectTypes;
 (function (ExtraObjectTypes) {
@@ -55,3 +55,4 @@ exports.isManuscript = (0, exports.hasObjectType)(json_schema_1.ObjectTypes.Manu
 exports.isTable = (0, exports.hasObjectType)(json_schema_1.ObjectTypes.Table);
 exports.isUserProfile = (0, exports.hasObjectType)(json_schema_1.ObjectTypes.UserProfile);
 exports.isCommentAnnotation = (0, exports.hasObjectType)(json_schema_1.ObjectTypes.CommentAnnotation);
+exports.isKeyword = (0, exports.hasObjectType)(json_schema_1.ObjectTypes.Keyword);

package/dist/es/jats/importer/jats-comments.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { v4 as uuidv4 } from 'uuid';
-import { buildComment, buildContribution, isCommentAnnotation, isHighlightableModel, } from '../../transformer';
+import { buildComment, buildContribution, isCommentAnnotation, isHighlightableModel, isKeyword, } from '../../transformer';
 const DEFAULT_ANNOTATION_COLOR = 'rgb(250, 224, 150)';
 const DEFAULT_PROFILE_ID = 'MPUserProfile:0000000000000000000000000000000000000001';
 export const parseProcessingInstruction = (node) => {
@@ -58,6 +58,21 @@ const insertToken = (doc, processingInstructionNode, authorQueriesMap) => {
         return parentElement.insertBefore(tokenNode, processingInstructionNode);
     }
 };
+const extractCommentsFromKeywords = (tokens, model, authorQueriesMap) => {
+    var _a;
+    const commentAnnotations = [];
+    const name = model.name;
+    const filteredTokens = filterAndSortTokens(tokens, name);
+    let content = name;
+    for (const token of filteredTokens) {
+        content = name.replace(token, '');
+        const query = authorQueriesMap.get(token);
+        const commentAnnotation = buildComment((_a = model.containedGroup) !== null && _a !== void 0 ? _a : uuidv4(), `${query}`, undefined, [buildContribution(DEFAULT_PROFILE_ID)], DEFAULT_ANNOTATION_COLOR);
+        model['name'] = content;
+        commentAnnotations.push(commentAnnotation);
+    }
+    return commentAnnotations;
+};
 export const createComments = (authorQueriesMap, manuscriptModels) => {
     const tokens = [...authorQueriesMap.keys()];
     const commentAnnotations = [];
@@ -66,9 +81,18 @@ export const createComments = (authorQueriesMap, manuscriptModels) => {
             const comments = addCommentsFromMarkedProcessingInstructions(tokens, model, authorQueriesMap);
             commentAnnotations.push(...comments);
         }
+        else if (isKeyword(model)) {
+            const comments = extractCommentsFromKeywords(tokens, model, authorQueriesMap);
+            commentAnnotations.push(...comments);
+        }
     }
     return commentAnnotations;
 };
+function filterAndSortTokens(tokens, content) {
+    return tokens
+        .filter((token) => content.indexOf(token) >= 0)
+        .sort((a, b) => content.indexOf(a) - content.indexOf(b));
+}
 const addCommentsFromMarkedProcessingInstructions = (tokens, model, authorQueriesMap) => {
     const commentAnnotations = [];
     for (const field of ['contents', 'caption', 'title']) {

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

@@ -19,5 +19,8 @@ export const comment = {
         contents: { default: '' },
         target: { default: '' },
         selector: { default: null },
+        resolved: { default: false },
+        contributions: { default: [] },
+        originalText: { default: '' },
     },
 };

package/dist/es/transformer/decode.js

@@ -537,6 +537,9 @@ export class Decoder {
                     contents: model.contents,
                     selector: model.selector,
                     target: model.target,
+                    resolved: model.resolved,
+                    contributions: model.contributions,
+                    originalText: model.originalText,
                 });
             },
         };

package/dist/es/transformer/encode.js

@@ -354,6 +354,9 @@ const encoders = {
         selector: node.attrs.selector,
         target: node.attrs.target,
         contents: node.attrs.contents,
+        resolved: node.attrs.resolved,
+        contributions: node.attrs.contributions,
+        originalText: node.attrs.originalText,
     }),
     footnote: (node, parent) => ({
         containingObject: parent.attrs.id,
@@ -523,12 +526,11 @@ export const encode = (node) => {
         if (placeholders.includes(child.type.name)) {
             return;
         }
-        const { model, commentAnnotationsMap } = modelFromNode(child, parent, path, priority);
+        const { model } = modelFromNode(child, parent, path, priority);
         if (models.has(model._id)) {
             throw Error(`Encountered duplicate ids in models map while encoding: ${model._id}`);
         }
         models.set(model._id, model);
-        commentAnnotationsMap.forEach((val, key) => models.set(key, val));
         child.forEach(addModel(path.concat(child.attrs.id), child));
     };
     node.forEach((cNode) => {

package/dist/es/transformer/object-types.js

@@ -50,3 +50,4 @@ export const isManuscript = hasObjectType(ObjectTypes.Manuscript);
 export const isTable = hasObjectType(ObjectTypes.Table);
 export const isUserProfile = hasObjectType(ObjectTypes.UserProfile);
 export const isCommentAnnotation = hasObjectType(ObjectTypes.CommentAnnotation);
+export const isKeyword = hasObjectType(ObjectTypes.Keyword);

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

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { Contribution } from '@manuscripts/json-schema';
 import { NodeSpec } from 'prosemirror-model';
 import { ManuscriptNode } from '../types';
 interface Attrs {
@@ -23,6 +24,9 @@ interface Attrs {
         from: number;
         to: number;
     };
+    resolved?: boolean;
+    contributions?: Contribution[];
+    originalText?: string;
 }
 export interface CommentNode extends ManuscriptNode {
     attrs: Attrs;

package/dist/types/transformer/object-types.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { CommentAnnotation, Figure, Manuscript, Model, ObjectTypes, Table } from '@manuscripts/json-schema';
+import { CommentAnnotation, Figure, Keyword, Manuscript, Model, ObjectTypes, Table } from '@manuscripts/json-schema';
 import { ManuscriptModel, UserProfileWithAvatar } from './models';
 export declare enum ExtraObjectTypes {
     PlaceholderElement = "MPPlaceholderElement"
@@ -27,3 +27,4 @@ export declare const isManuscript: (model: Model) => model is Manuscript;
 export declare const isTable: (model: Model) => model is Table;
 export declare const isUserProfile: (model: Model) => model is UserProfileWithAvatar;
 export declare const isCommentAnnotation: (model: Model) => model is CommentAnnotation;
+export declare const isKeyword: (model: Model) => model is Keyword;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/transform",
   "description": "ProseMirror transformer for Manuscripts applications",
-  "version": "1.1.2",
+  "version": "1.1.3-LEAN-2066",
   "repository": "github:Atypon-OpenSource/manuscripts-transform",
   "license": "Apache-2.0",
   "main": "dist/cjs",