fix(snippets): scope content mutations to snippets (#792) (#799)

Author: antonreshetov

src/main/api/routes/snippets.ts

@@ -337,6 +337,7 @@ app
     ({ params, status }) => {
       const storage = useStorage()
       const { deleted } = storage.snippets.deleteSnippetContent(
+        Number(params.id),
         Number(params.contentId),
       )
 

src/main/storage/contracts.ts

@@ -170,7 +170,10 @@ export interface SnippetsStorage {
     input: SnippetContentCreateInput,
   ) => { id: number }
   deleteSnippet: (id: number) => { deleted: boolean }
-  deleteSnippetContent: (contentId: number) => { deleted: boolean }
+  deleteSnippetContent: (
+    snippetId: number,
+    contentId: number,
+  ) => { deleted: boolean }
   deleteTagFromSnippet: (
     snippetId: number,
     tagId: number,

src/main/storage/providers/markdown/runtime/snippets.ts

@@ -532,6 +532,10 @@ export function findSnippetById(
   return snippet
 }
 
+/**
+ * Global content lookup is only safe for non-mutating fallback flows.
+ * Mutation paths with a known owner must scope lookup by snippet id first.
+ */
 export function findSnippetByContentId(
   snippets: MarkdownSnippet[],
   contentId: number,

src/main/storage/providers/markdown/runtime/sync.ts

@@ -333,18 +333,7 @@ export function syncSnippetFileWithDisk(
     snippets[snippetIndexInRuntime] = syncedSnippet
   }
 
-  const maxSnippetContentId = syncedSnippet.contents.reduce(
-    (maxId, content) => Math.max(maxId, content.id),
-    0,
-  )
-  state.counters.snippetId = Math.max(
-    state.counters.snippetId,
-    syncedSnippet.id,
-  )
-  state.counters.contentId = Math.max(
-    state.counters.contentId,
-    maxSnippetContentId,
-  )
+  syncCounters(state, snippets)
 
   saveState(paths, state)
 

src/main/storage/providers/markdown/storages/__tests__/snippets.test.ts

@@ -3,6 +3,7 @@ import path from 'node:path'
 import fs from 'fs-extra'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
+import { getRuntimeCache, writeSnippetToFile } from '../../runtime'
 import { getPaths } from '../../runtime/paths'
 import { ensureStateFile } from '../../runtime/state'
 import { resetRuntimeCache } from '../../runtime/sync'
@@ -217,4 +218,81 @@ describe('code snippets storage validations', () => {
     expect(moved?.name.toLowerCase()).not.toBe('shared')
     expect(moved?.name.toLowerCase()).toContain('shared')
   })
+
+  it('updates content scoped to the requested snippet when content ids are duplicated', () => {
+    const storage = createSnippetsStorage()
+    const first = storage.createSnippet({ name: 'First' })
+    const second = storage.createSnippet({ name: 'Second' })
+    const firstContent = storage.createSnippetContent(first.id, {
+      label: 'Fragment 1',
+      language: 'plain_text',
+      value: 'first value',
+    })
+
+    storage.createSnippetContent(second.id, {
+      label: 'Fragment 1',
+      language: 'plain_text',
+      value: 'second value',
+    })
+
+    const paths = getPaths(tempVaultPath)
+    const cache = getRuntimeCache(paths)
+    const secondSnippet = cache.snippets.find(
+      snippet => snippet.id === second.id,
+    )
+
+    expect(secondSnippet).toBeDefined()
+    secondSnippet!.contents[0]!.id = firstContent.id
+    writeSnippetToFile(paths, secondSnippet!)
+
+    const result = storage.updateSnippetContent(second.id, firstContent.id, {
+      value: 'second updated',
+    })
+
+    expect(result).toEqual({
+      invalidInput: false,
+      notFound: false,
+      parentNotFound: false,
+    })
+    expect(storage.getSnippetById(first.id)?.contents[0]?.value).toBe(
+      'first value',
+    )
+    expect(storage.getSnippetById(second.id)?.contents[0]).toMatchObject({
+      id: firstContent.id,
+      value: 'second updated',
+    })
+  })
+
+  it('deletes content scoped to the requested snippet when content ids are duplicated', () => {
+    const storage = createSnippetsStorage()
+    const first = storage.createSnippet({ name: 'First' })
+    const second = storage.createSnippet({ name: 'Second' })
+    const firstContent = storage.createSnippetContent(first.id, {
+      label: 'Fragment 1',
+      language: 'plain_text',
+      value: 'first value',
+    })
+
+    storage.createSnippetContent(second.id, {
+      label: 'Fragment 1',
+      language: 'plain_text',
+      value: 'second value',
+    })
+
+    const paths = getPaths(tempVaultPath)
+    const cache = getRuntimeCache(paths)
+    const secondSnippet = cache.snippets.find(
+      snippet => snippet.id === second.id,
+    )
+
+    expect(secondSnippet).toBeDefined()
+    secondSnippet!.contents[0]!.id = firstContent.id
+    writeSnippetToFile(paths, secondSnippet!)
+
+    expect(storage.deleteSnippetContent(second.id, firstContent.id)).toEqual({
+      deleted: true,
+    })
+    expect(storage.getSnippetById(first.id)?.contents).toHaveLength(1)
+    expect(storage.getSnippetById(second.id)?.contents).toHaveLength(0)
+  })
 })

src/main/storage/providers/markdown/storages/snippets.ts

@@ -13,7 +13,6 @@ import {
   assertUniqueSiblingEntryName,
   createSnippetRecord,
   findFolderById,
-  findSnippetByContentId,
   findSnippetById,
   getPaths,
   getRuntimeCache,
@@ -28,11 +27,7 @@ import {
   validateEntryName,
   writeSnippetToFile,
 } from '../runtime'
-import {
-  createNestedContent,
-  deleteNestedContent,
-  updateNestedContent,
-} from '../runtime/shared/entityContent'
+import { createNestedContent } from '../runtime/shared/entityContent'
 import { filterAndSortByQuery } from '../runtime/shared/entityQuery'
 import {
   addTagToEntity,
@@ -44,6 +39,13 @@ import {
   getEntityDeleteCounts,
 } from '../runtime/shared/entityStorage'
 
+function findContentIndexById(
+  snippet: MarkdownSnippet,
+  contentId: number,
+): number {
+  return snippet.contents.findIndex(content => content.id === contentId)
+}
+
 export function createSnippetsStorage(): SnippetsStorage {
   return {
     getSnippets: (query: SnippetsQueryInput) => {
@@ -229,39 +231,56 @@ export function createSnippetsStorage(): SnippetsStorage {
     ): SnippetContentUpdateResult => {
       const paths = getPaths(getVaultPath())
       const { state, snippets } = getRuntimeCache(paths)
-      const ownedContent = findSnippetByContentId(snippets, contentId)
-      const result = updateNestedContent({
-        applyPatch: (content, patch) => {
-          if ('label' in patch) {
-            content.label = patch.label || content.label
-          }
 
-          if ('value' in patch) {
-            content.value = patch.value ?? null
-          }
+      if (!('label' in input || 'value' in input || 'language' in input)) {
+        return {
+          invalidInput: true,
+          notFound: false,
+          parentNotFound: false,
+        }
+      }
 
-          if ('language' in patch) {
-            content.language = patch.language || content.language
-          }
-        },
-        findTargetOwnerById: id => findSnippetById(snippets, id),
-        hasAnyField: patch =>
-          'label' in patch || 'value' in patch || 'language' in patch,
-        ownerId: snippetId,
-        ownedContent: ownedContent
-          ? {
-              contentIndex: ownedContent.contentIndex,
-              owner: ownedContent.snippet,
-            }
-          : undefined,
-        patch: input,
-        persistOwner: snippet => writeSnippetToFile(paths, snippet),
-      })
-      if (!result.invalidInput && !result.notFound) {
-        saveState(paths, state)
+      const snippet = findSnippetById(snippets, snippetId)
+      if (!snippet) {
+        return {
+          invalidInput: false,
+          notFound: false,
+          parentNotFound: true,
+        }
       }
 
-      return result
+      const contentIndex = findContentIndexById(snippet, contentId)
+      if (contentIndex === -1) {
+        return {
+          invalidInput: false,
+          notFound: true,
+          parentNotFound: false,
+        }
+      }
+
+      const content = snippet.contents[contentIndex]
+
+      if ('label' in input) {
+        content.label = input.label || content.label
+      }
+
+      if ('value' in input) {
+        content.value = input.value ?? null
+      }
+
+      if ('language' in input) {
+        content.language = input.language || content.language
+      }
+
+      snippet.updatedAt = Date.now()
+      writeSnippetToFile(paths, snippet)
+      saveState(paths, state)
+
+      return {
+        invalidInput: false,
+        notFound: false,
+        parentNotFound: false,
+      }
     },
     addTagToSnippet: (snippetId, tagId): SnippetTagRelationResult => {
       const paths = getPaths(getVaultPath())
@@ -345,26 +364,26 @@ export function createSnippetsStorage(): SnippetsStorage {
 
       return result
     },
-    deleteSnippetContent: (contentId) => {
+    deleteSnippetContent: (snippetId, contentId) => {
       const paths = getPaths(getVaultPath())
       const { state, snippets } = getRuntimeCache(paths)
-      const ownedContent = findSnippetByContentId(snippets, contentId)
-      const result = deleteNestedContent({
-        ownedContent: ownedContent
-          ? {
-              contentIndex: ownedContent.contentIndex,
-              owner: ownedContent.snippet,
-            }
-          : undefined,
-        persistOwner: snippet => writeSnippetToFile(paths, snippet),
-      })
-      if (!result.deleted) {
-        return result
+      const snippet = findSnippetById(snippets, snippetId)
+
+      if (!snippet) {
+        return { deleted: false }
+      }
+
+      const contentIndex = findContentIndexById(snippet, contentId)
+      if (contentIndex === -1) {
+        return { deleted: false }
       }
 
+      snippet.contents.splice(contentIndex, 1)
+      snippet.updatedAt = Date.now()
+      writeSnippetToFile(paths, snippet)
       saveState(paths, state)
 
-      return result
+      return { deleted: true }
     },
   }
 }

src/renderer/services/api/generated/index.ts

@@ -1050,7 +1050,7 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title massCode API
- * @version 5.4.0
+ * @version 5.5.0
  *
  * Development documentation
  */