final fix

Author: larbish

src/module/src/runtime/host.dev.ts

@@ -36,7 +36,7 @@ export function useStudioHost(user: StudioUser, repository: Repository) {
     }
 
     const id = generateIdFromFsPath(fsPath, collectionInfo)
-    const doc = createCollectionDocument(collectionInfo, id, upsertedDocument)
+    const doc = createCollectionDocument(id, collectionInfo, upsertedDocument)
 
     const content = await generateContentFromDocument(doc)
 

src/module/src/runtime/host.ts

@@ -185,16 +185,16 @@ export function useStudioHost(user: StudioUser, repository: Repository): StudioH
     },
 
     document: {
-      get: async (fsPath: string): Promise<DatabaseItem> => {
+      get: async (fsPath: string): Promise<DatabaseItem | undefined> => {
         const collectionInfo = getCollectionByFilePath(fsPath, useContentCollections())
         if (!collectionInfo) {
           throw new Error(`Collection not found for fsPath: ${fsPath}`)
         }
 
         const id = generateIdFromFsPath(fsPath, collectionInfo)
-        const item = await useContentCollectionQuery(id.split('/')[0] as string).where('id', '=', id).first()
+        const item = await useContentCollectionQuery(collectionInfo.name).where('id', '=', id).first()
 
-        return normalizeDocument(fsPath, item as DatabaseItem)
+        return item ? normalizeDocument(fsPath, item as DatabaseItem) : undefined
       },
       list: async (): Promise<DatabaseItem[]> => {
         const collections = Object.values(useContentCollections()).filter(collection => collection.name !== 'info')
@@ -212,9 +212,10 @@ export function useStudioHost(user: StudioUser, repository: Repository): StudioH
         return documentsByCollection.flat()
       },
       create: async (fsPath: string, content: string) => {
-        const collections = useContentCollections()
-
-        const collectionInfo = getCollectionByFilePath(fsPath, collections)
+        const collectionInfo = getCollectionByFilePath(fsPath, useContentCollections())
+        if (!collectionInfo) {
+          throw new Error(`Collection not found for fsPath: ${fsPath}`)
+        }
 
         const id = generateIdFromFsPath(fsPath, collectionInfo!)
 
@@ -224,24 +225,24 @@ export function useStudioHost(user: StudioUser, repository: Repository): StudioH
         }
 
         const document = await generateDocumentFromContent(id, content)
-        const collectionDocument = createCollectionDocument(collectionInfo!, id, document!)
+        const collectionDocument = createCollectionDocument(id, collectionInfo, document!)
 
-        await host.document.upsert(id, collectionDocument!)
+        await host.document.upsert(fsPath, collectionDocument)
 
-        return collectionDocument!
+        return normalizeDocument(fsPath, collectionDocument!)
       },
       upsert: async (fsPath: string, document: CollectionItemBase) => {
-        const collection = getCollectionByFilePath(fsPath, useContentCollections())
-        if (!collection) {
+        const collectionInfo = getCollectionByFilePath(fsPath, useContentCollections())
+        if (!collectionInfo) {
           throw new Error(`Collection not found for fsPath: ${fsPath}`)
         }
 
-        const id = generateIdFromFsPath(fsPath, collection)
+        const id = generateIdFromFsPath(fsPath, collectionInfo)
 
-        const doc = createCollectionDocument(collection, id, document)
+        const doc = createCollectionDocument(id, collectionInfo, document)
 
-        await useContentDatabaseAdapter(collection.name).exec(generateRecordDeletion(collection, id))
-        await useContentDatabaseAdapter(collection.name).exec(generateRecordInsert(collection, doc))
+        await useContentDatabaseAdapter(collectionInfo.name).exec(generateRecordDeletion(collectionInfo, id))
+        await useContentDatabaseAdapter(collectionInfo.name).exec(generateRecordInsert(collectionInfo, doc))
       },
       delete: async (fsPath: string) => {
         const collection = getCollectionByFilePath(fsPath, useContentCollections())

src/module/src/runtime/utils/document.ts

@@ -3,14 +3,14 @@ import { getOrderedSchemaKeys } from './collection'
 import { pathMetaTransform } from './path-meta'
 import type { DatabaseItem } from 'nuxt-studio/app'
 
-export function createCollectionDocument(collection: CollectionInfo, id: string, document: CollectionItemBase) {
+export function createCollectionDocument(id: string, collectionInfo: CollectionInfo, document: CollectionItemBase) {
   const parsedContent = [
     pathMetaTransform,
-  ].reduce((acc, fn) => collection.type === 'page' ? fn(acc as PageCollectionItemBase) : acc, { ...document, id } as PageCollectionItemBase)
+  ].reduce((acc, fn) => collectionInfo.type === 'page' ? fn(acc as PageCollectionItemBase) : acc, { ...document, id } as PageCollectionItemBase)
   const result = { id } as DatabaseItem
   const meta = parsedContent.meta as Record<string, unknown>
 
-  const collectionKeys = getOrderedSchemaKeys(collection.schema)
+  const collectionKeys = getOrderedSchemaKeys(collectionInfo.schema)
   for (const key of Object.keys(parsedContent)) {
     if (collectionKeys.includes(key)) {
       result[key] = parsedContent[key as keyof PageCollectionItemBase]