@bigfootai/bigfoot-types 3.5.5 → 3.5.6

package/editor.js

@@ -1,58 +1,48 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bigfootSchema = void 0;
 const prosemirror_model_1 = require("prosemirror-model");
 const prosemirror_schema_basic_1 = require("prosemirror-schema-basic");
 const prosemirror_schema_list_1 = require("prosemirror-schema-list");
-const tag = {
-    attrs: {
-        tagId: { default: null },
-        tagType: { default: null },
-        recommendationId: { default: null },
-    },
-    inclusive: false,
-    parseDOM: [
-        {
-            tag: 'span[data-tag-id][data-recommendation-id][data-tag-type]',
-            getAttrs(dom) {
-                return {
-                    tagId: dom.getAttribute('data-tag-id'),
-                    tagType: dom.getAttribute('data-tag-type'),
-                    recommendationId: dom.getAttribute('data-recommendation-id'),
-                };
-            },
+const orderedmap_1 = __importDefault(require("orderedmap"));
+exports.bigfootSchema = new prosemirror_model_1.Schema({
+    nodes: (0, prosemirror_schema_list_1.addListNodes)(prosemirror_schema_basic_1.schema.spec.nodes, 'paragraph block*', 'block'),
+    marks: orderedmap_1.default.from(prosemirror_schema_basic_1.schema.spec.marks).addToEnd('tag', {
+        attrs: {
+            tagId: { default: null },
+            tagType: { default: null },
+            recommendationId: { default: null },
+            ignore: { default: null },
         },
-    ],
-    toDOM(node) {
-        const { tagId, tagType, recommendationId } = node.attrs;
-        return [
-            'span',
+        inclusive: false,
+        parseDOM: [
             {
-                'data-tag-id': tagId,
-                'data-tag-type': tagType,
-                'data-recommendation-id': recommendationId,
+                tag: 'span[data-tag-id][data-tag-type][data-recommendation-id][data-ignore]',
+                getAttrs(dom) {
+                    return {
+                        tagId: dom.getAttribute('data-tag-id'),
+                        tagType: dom.getAttribute('data-tag-type'),
+                        recommendationId: dom.getAttribute('data-recommendation-id'),
+                        ignore: dom.getAttribute('data-ignore'),
+                    };
+                },
             },
-            0,
-        ];
-    },
-};
-const strong = {
-    parseDOM: [
-        { tag: 'strong' },
-        {
-            tag: 'b',
-            getAttrs: (node) => node.style.fontWeight != 'normal' && null,
+        ],
+        toDOM(node) {
+            const { tagId, tagType, recommendationId, ignore } = node.attrs;
+            return [
+                'span',
+                {
+                    'data-tag-id': tagId,
+                    'data-tag-type': tagType,
+                    'data-recommendation-id': recommendationId,
+                    'data-ignore': ignore,
+                },
+                0,
+            ];
         },
-    ],
-    toDOM: () => ['strong', 0],
-};
-exports.bigfootSchema = new prosemirror_model_1.Schema({
-    nodes: (0, prosemirror_schema_list_1.addListNodes)(prosemirror_schema_basic_1.schema.spec.nodes, 'paragraph block*', 'block'),
-    marks: {
-        ...prosemirror_schema_basic_1.schema.spec.marks,
-        // @ts-expect-error - I will do a better job typing this later. Your friend in time, past you.
-        tag,
-        // @ts-expect-error - I will do a better job typing this later. Your friend in time, past you.
-        strong,
-    },
+    }),
 });

package/editor.ts

@@ -1,63 +1,49 @@
 import { Schema } from 'prosemirror-model';
 import { schema } from 'prosemirror-schema-basic';
 import { addListNodes } from 'prosemirror-schema-list';
+import orderedMap from 'orderedmap';
 
-const tag = {
-	attrs: {
-		tagId: { default: null },
-		tagType: { default: null },
-		recommendationId: { default: null },
-	},
-	inclusive: false,
-	parseDOM: [
-		{
-			tag: 'span[data-tag-id][data-recommendation-id][data-tag-type]',
-			getAttrs(dom: HTMLElement) {
-				return {
-					tagId: (dom as HTMLElement).getAttribute('data-tag-id'),
-					tagType: (dom as HTMLElement).getAttribute('data-tag-type'),
-					recommendationId: (dom as HTMLElement).getAttribute(
-						'data-recommendation-id'
-					),
-				};
-			},
+export const bigfootSchema = new Schema({
+	nodes: addListNodes(schema.spec.nodes, 'paragraph block*', 'block'),
+	marks: orderedMap.from(schema.spec.marks).addToEnd('tag', {
+		attrs: {
+			tagId: { default: null },
+			tagType: { default: null },
+			recommendationId: { default: null },
+			ignore: { default: null },
 		},
-	],
-	toDOM(node: {
-		attrs: { tagId: string; tagType: string; recommendationId: string };
-	}) {
-		const { tagId, tagType, recommendationId } = node.attrs;
-		return [
-			'span',
+		inclusive: false,
+		parseDOM: [
 			{
-				'data-tag-id': tagId,
-				'data-tag-type': tagType,
-				'data-recommendation-id': recommendationId,
+				tag: 'span[data-tag-id][data-tag-type][data-recommendation-id][data-ignore]',
+				getAttrs(dom) {
+					return {
+						tagId: (dom as HTMLElement).getAttribute('data-tag-id'),
+						tagType: (dom as HTMLElement).getAttribute(
+							'data-tag-type'
+						),
+						recommendationId: (dom as HTMLElement).getAttribute(
+							'data-recommendation-id'
+						),
+						ignore: (dom as HTMLElement).getAttribute(
+							'data-ignore'
+						),
+					};
+				},
 			},
-			0,
-		];
-	},
-};
-
-const strong = {
-	parseDOM: [
-		{ tag: 'strong' },
-		{
-			tag: 'b',
-			getAttrs: (node: HTMLElement) =>
-				node.style.fontWeight != 'normal' && null,
+		],
+		toDOM(node) {
+			const { tagId, tagType, recommendationId, ignore } = node.attrs;
+			return [
+				'span',
+				{
+					'data-tag-id': tagId,
+					'data-tag-type': tagType,
+					'data-recommendation-id': recommendationId,
+					'data-ignore': ignore,
+				},
+				0,
+			];
 		},
-	],
-	toDOM: () => ['strong', 0],
-};
-
-export const bigfootSchema = new Schema({
-	nodes: addListNodes(schema.spec.nodes, 'paragraph block*', 'block'),
-	marks: {
-		...schema.spec.marks,
-		// @ts-expect-error - I will do a better job typing this later. Your friend in time, past you.
-		tag,
-		// @ts-expect-error - I will do a better job typing this later. Your friend in time, past you.
-		strong,
-	},
+	}),
 });

package/model.js

@@ -384,6 +384,7 @@ exports.TagFields = `${exports.PrimitiveFields}
   email: String
   avatar: String
   inviteStatus: Int
+	originNoteId: String
   tenantIdVerified: String`;
 exports.TagQL = `
 type Tag {${exports.TagFields}

package/model.ts

@@ -573,6 +573,7 @@ export const TagFields = `${PrimitiveFields}
   email: String
   avatar: String
   inviteStatus: Int
+	originNoteId: String
   tenantIdVerified: String`;
 export const TagQL = `
 type Tag {${TagFields}
@@ -589,6 +590,7 @@ export class Tag extends Primitive {
 	email?: string;
 	avatar?: string;
 	inviteStatus?: InviteStatus;
+	originNoteId?: string; // If the tag originated from a note, we store that here
 	tenantIdVerified?: string; // The tenant._id that claimed/verified this tag as being them
 
 	constructor(tenantIdCreated: string, alias: string, tagType: TagType) {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"author": "Bigfoot",
 	"name": "@bigfootai/bigfoot-types",
-	"version": "3.5.5",
+	"version": "3.5.6",
 	"description": "The internal library for the types used in the Bigfoot platform",
 	"main": "model.js",
 	"license": "ISC",
@@ -14,6 +14,7 @@
 		"dev": "node model.js"
 	},
 	"dependencies": {
+		"orderedmap": "^2.1.1",
 		"prosemirror-model": "^1.19.4",
 		"prosemirror-schema-basic": "^1.2.2",
 		"prosemirror-schema-list": "^1.3.0",