Remove old stores and types

apps/extension/src/Components/InternalEvents.tsx

@@ -14,7 +14,7 @@ import { useEditorStore } from '../Hooks/useEditorStore'
 import { useHighlighter } from '../Hooks/useHighlighter'
 import { useSaveChanges } from '../Hooks/useSaveChanges'
 import { useSputlitContext, VisualState } from '../Hooks/useSputlitContext'
-import { useHighlightStore, useHighlightStore2 } from '../Stores/useHighlightStore'
+import { useHighlightStore2 } from '../Stores/useHighlightStore'
 import { useSputlitStore } from '../Stores/useSputlitStore'
 import { getDibbaText } from '../Utils/getDibbaText'
 import { getSelectionHTML } from '../Utils/getSelectionHTML'

apps/extension/src/Stores/useHighlightStore.ts

@@ -1,21 +1,14 @@
 import create from 'zustand'
 import { persist } from 'zustand/middleware'
 
-import { HighlightStore, HighlightStore2, highlightStoreConstructor, highlightStoreConstructor2 } from '@mexit/core'
+import { HighlightStore2, highlightStoreConstructor2 } from '@mexit/core'
 
 import { asyncLocalStorage } from '../Utils/chromeStorageAdapter'
 
-// DEPRECATED
-export const useHighlightStore = create<HighlightStore>(
-  persist(highlightStoreConstructor, {
-    name: 'highlights-store',
-    getStorage: () => asyncLocalStorage
-  })
-)
-
 export const useHighlightStore2 = create<HighlightStore2>(
   persist(highlightStoreConstructor2, {
-    name: 'highlights-store-2',
-    getStorage: () => asyncLocalStorage
+    name: 'highlights-store',
+    getStorage: () => asyncLocalStorage,
+    version: 2
   })
 )

apps/extension/src/Utils/serializer.ts

@@ -2,14 +2,10 @@ import {
   directKeys,
   DirectProperties,
   directPropertyKeys,
-  ElementHighlightMetadata,
   ElementHighlightMetadata2,
   extractMetadata,
-  generateElementMetadata,
   generateTempId,
   mappedKeys,
-  mog,
-  PartialBy
 } from '@mexit/core'
 
 import { useAuthStore } from '../Hooks/useAuth'

apps/webapp/src/Stores/useHighlightStore.ts

@@ -1,17 +1,11 @@
 import create from 'zustand'
 import { persist } from 'zustand/middleware'
 
-import { HighlightStore, HighlightStore2, highlightStoreConstructor, highlightStoreConstructor2 } from '@mexit/core'
-
-// DEPRECATED
-export const useHighlightStore = create<HighlightStore>(
-  persist(highlightStoreConstructor, {
-    name: 'highlights-store'
-  })
-)
+import { HighlightStore2, highlightStoreConstructor2 } from '@mexit/core'
 
 export const useHighlightStore2 = create<HighlightStore2>(
   persist(highlightStoreConstructor2, {
-    name: 'highlights-store-2'
+    name: 'highlights-store',
+    version: 2
   })
 )

apps/webapp/src/Utils/serializer.ts

@@ -2,10 +2,8 @@ import {
   directKeys,
   DirectProperties,
   directPropertyKeys,
-  ElementHighlightMetadata,
   ElementHighlightMetadata2,
   extractMetadata,
-  generateElementMetadata,
   generateTempId,
   mappedKeys,
   PartialBy

libs/core/src/Stores/contentStoreConstructor.ts

@@ -8,7 +8,7 @@ export interface ContentStoreState {
   setSaved: (saved: boolean) => void
   removeContent: (nodeid: string) => void
   getContent: (nodeid: string) => NodeContent
-  getContentFromLink: (url: string) => NodeContent[]
+  // getContentFromLink: (url: string) => NodeContent[]
   setContent: (nodeid: string, content: NodeEditorContent, metadata?: NodeMetadata, internalUpdate?: boolean) => void
   getAllMetadata: () => Record<string, NodeMetadata>
   getMetadata: (nodeid: string) => NodeMetadata
@@ -75,10 +75,10 @@ export const contentStoreConstructor = (set, get) => ({
   getContent: (nodeid) => {
     return get().contents[nodeid]
   },
-  getContentFromLink: (url) => {
-    const contents: Contents = get().contents
-    return Object.values(contents).filter((item) => item?.metadata?.elementMetadata?.sourceUrl === url)
-  },
+  // getContentFromLink: (url) => {
+  //   const contents: Contents = get().contents
+  //   return Object.values(contents).filter((item) => item?.metadata?.elementMetadata?.sourceUrl === url)
+  // },
   removeContent: (nodeid) => {
     const oldContent = get().contents
     delete oldContent[nodeid]

libs/core/src/Types/Editor.ts

@@ -1,6 +1,6 @@
 import HighlightSource from 'web-highlighter/dist/model/source'
+import { ElementHighlightMetadata2 } from './Highlight'
 
-import { ElementHighlightMetadata } from '../Utils/serializer'
 import { AccessLevel } from './Mentions'
 
 export interface Content {
@@ -32,7 +32,7 @@ export interface NodeMetadata {
   lastEditedBy: string
   updatedAt: number
 
-  elementMetadata: ElementHighlightMetadata
+  elementMetadata: ElementHighlightMetadata2
   publicAccess?: boolean
   iconUrl?: string
   // The snippet ID with which all the children nodes should be populated

libs/core/src/Types/Highlight.ts

@@ -15,7 +15,7 @@ IN STORE
                     "parentIndex": 2,
                     "textOffset": 355
                 },
-                "text": "The species is both terrestrial (ground-living) and arboreal (tree-living); it inhabits savannah, woodland, rocky slopes and in some regions, dense forest. It is diurnal and is known to prey on birds and small mammals. Over suitable surfaces, it can move at speeds up to 16km/h (10mph) for short distances. Adult black mambas have few natural predators.",
+                "text": "The species is both",
                 "id": "f0cda665-6660-47bd-99cd-46b48020e253"
             },
             "sourceUrl": "https://en.wikipedia.org/wiki/Black_mamba"
@@ -37,7 +37,7 @@ IN STORE
       "parentIndex": 56,
       "textOffset": 60
     },
-    "text": "Village pump – Forum for discussions about Wikipedia itself, including policies and technical issues.\nSite news – Sources of news about Wikipedia and the broader Wikimedia movement.\nTeahouse – Ask basic questions about using or editing Wikipedia.\nHelp desk – Ask questions about using or editing Wikipedia.\nReference desk – Ask research questions about encyclopedic topics.\nContent portals – A unique way to navigate the encyclopedia.",
+    "text": "Village pump – Forum for",
     "id": "63023772-32e9-4d85-b0e8-933cd429eab3"
   },
   "sourceUrl": "https://en.wikipedia.org/wiki/Main_Page"

libs/core/src/Utils/serializer.ts

@@ -41,23 +41,6 @@ export const mappedKeys = {
 
 export type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>
 
-export interface HighlightMetaBlock {
-  parentTagName: string
-  parentIndex: number
-  textOffset: number
-}
-
-export interface ElementHighlightMetadata {
-  type: string
-  saveableRange: {
-    startMeta: HighlightMetaBlock
-    endMeta: HighlightMetaBlock
-    text: string
-    id: string
-  }
-  sourceUrl: string
-}
-
 export const generateElementMetadata = (elementMetadata: ElementHighlightMetadata2): ElementHighlightMetadata2 => {
   // delete elementMetadata.saveableRange['__isHighlightSource']
   return {

libs/core/src/index.ts

@@ -12,7 +12,6 @@ export * from './Stores/commentStore'
 export * from './Stores/contentStoreConstructor'
 export * from './Stores/dataStoreConstructor'
 export * from './Stores/descriptionStoreConstructor'
-export * from './Stores/highlightStoreConstructor'
 export * from './Stores/highlightStoreConstructor2'
 export * from './Stores/linkStoreConstructor'
 export * from './Stores/reactionStore'