!refactor: update tables name and schema and better checksum check

Author: farnabaz

docs/content/docs/2.usage/1.collections.md

@@ -92,7 +92,7 @@ const { data: posts } = await useAsyncData('blog', () => queryCollection('blog')
   <div>
     <h1>Blog</h1>
     <ul>
-      <li v-for="post in posts" :key="post._id">
+      <li v-for="post in posts" :key="post.id">
         <NuxtLink :to="post.path">{{ post.title }}</NuxtLink>
       </li>
     </ul>
@@ -138,7 +138,7 @@ type CollectionSource = {
 
 Every collection includes these default fields:
 
-- `_id`: Unique content identifier
+- `id`: Unique content identifier
 - `stem`: File path without extension (used for sorting and location)
 - `extension`: File extension
 - `meta`: Custom fields not defined in the collection schema

examples/blog/app/pages/index.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 const { data: posts } = await useAsyncData(() => {
   return queryCollection('blog')
-    .select('title', 'description', 'path', '_id', 'date')
+    .select('title', 'description', 'path', 'id', 'date')
     .order('date', 'DESC')
     .all()
 })
@@ -12,7 +12,7 @@ const { data: posts } = await useAsyncData(() => {
     <h1>Blog</h1>
     <p
       v-for="post in posts"
-      :key="post._id"
+      :key="post.id"
     >
       >
       <nuxt-link :to="post.path">

src/module.ts

@@ -213,17 +213,18 @@ async function processCollectionItems(nuxt: Nuxt, collections: ResolvedCollectio
     contentBuild: options.build?.markdown,
   })
 
-  const infoCollection = collections.find(c => c.name === '_info')!
+  const infoCollection = collections.find(c => c.name === 'info')!
 
   const startTime = performance.now()
   let filesCount = 0
   let cachedFilesCount = 0
   let parsedFilesCount = 0
   // Create database dump
   for await (const collection of collections) {
-    if (collection.name === '_info') {
+    if (collection.name === 'info') {
       continue
     }
+    const collectionHash = hash(collection)
     collectionDump[collection.name] = []
     // Collection table definition
     collectionDump[collection.name]!.push(
@@ -249,7 +250,7 @@ async function processCollectionItems(nuxt: Nuxt, collections: ResolvedCollectio
       await Promise.all(chunk.map(async (key) => {
         const keyInCollection = join(collection.name, collection.source?.prefix || '', key)
         const content = await readFile(join(cwd, key), 'utf8')
-        const checksum = getContentChecksum(configHash + content)
+        const checksum = getContentChecksum(configHash + collectionHash + content)
         const cache = databaseContents[keyInCollection]
 
         let parsedContent
@@ -274,14 +275,14 @@ async function processCollectionItems(nuxt: Nuxt, collections: ResolvedCollectio
 
     collectionDump[collection.name]!.push(
       generateCollectionTableDefinition(infoCollection, { drop: false }),
-      `DELETE FROM ${infoCollection.tableName} WHERE _id = 'checksum_${collection.name}'`,
-      generateCollectionInsert(infoCollection, { _id: `checksum_${collection.name}`, version: collectionChecksum[collection.name] }),
+      `DELETE FROM ${infoCollection.tableName} WHERE id = 'checksum_${collection.name}'`,
+      generateCollectionInsert(infoCollection, { id: `checksum_${collection.name}`, value: collectionChecksum[collection.name] }),
     )
   }
 
   const sqlDumpList = Object.values(collectionDump).flatMap(a => a)
 
-  // Drop _info table and recreate it
+  // Drop info table and recreate it
   db.exec(`DROP TABLE IF EXISTS ${infoCollection.tableName}`)
   for (const sql of sqlDumpList) {
     db.exec(sql)

src/runtime/components/ContentRenderer.vue

@@ -214,6 +214,6 @@ function findMappedTag(node: MDCElement, tags: Record<string, string>) {
     :prose="props.prose"
     :unwrap="props.unwrap"
     :components="componentsMap"
-    :data-content-id="debug ? value._id : undefined"
+    :data-content-id="debug ? value.id : undefined"
   />
 </template>

src/runtime/internal/collection.ts

@@ -29,5 +29,5 @@ function findJsonFields(sql: string): string[] {
 }
 
 function getCollectionName(table: string) {
-  return table.replace(/^content_/, '')
+  return table.replace(/^_content_/, '')
 }

src/runtime/internal/database.client.ts

@@ -50,7 +50,7 @@ async function loadAdapter<T>(collection: T) {
   const dumpId = `collection_${collection}`
   let checksumState = 'matched'
   try {
-    const dbChecksum = db.exec({ sql: `SELECT * FROM ${tables._info} where _id = '${checksumId}'`, rowMode: 'object', returnValue: 'resultRows' })
+    const dbChecksum = db.exec({ sql: `SELECT * FROM ${tables.info} where id = '${checksumId}'`, rowMode: 'object', returnValue: 'resultRows' })
       .shift()
 
     if (dbChecksum?.version !== checksums[String(collection)]) {
@@ -90,7 +90,7 @@ async function loadAdapter<T>(collection: T) {
 
     await db.exec({ sql: `DROP TABLE IF EXISTS ${tables[String(collection)]}` })
     if (checksumState === 'mismatch') {
-      await db.exec({ sql: `DELETE FROM ${tables._info} WHERE _id = '${checksumId}'` })
+      await db.exec({ sql: `DELETE FROM ${tables.info} WHERE id = '${checksumId}'` })
     }
 
     for (const command of dump) {

src/runtime/internal/database.server.ts

@@ -39,34 +39,35 @@ export default function loadDatabaseAdapter(config: RuntimeConfig) {
 }
 
 const checkDatabaseIntegrity = {} as Record<string, boolean>
-let integrityCheckPromise: Promise<void> | null = null
+const integrityCheckPromise = {} as Record<string, Promise<void> | null>
 export async function checkAndImportDatabaseIntegrity(event: H3Event, collection: string, config: RuntimeConfig): Promise<void> {
   if (checkDatabaseIntegrity[String(collection)] !== false) {
     checkDatabaseIntegrity[String(collection)] = false
-    integrityCheckPromise = integrityCheckPromise || _checkAndImportDatabaseIntegrity(event, collection, checksums[String(collection)], config)
+    integrityCheckPromise[String(collection)] = integrityCheckPromise[String(collection)] || _checkAndImportDatabaseIntegrity(event, collection, checksums[String(collection)], config)
       .then((isValid) => { checkDatabaseIntegrity[String(collection)] = !isValid })
       .catch((error) => {
         console.log('Database integrity check failed', error)
         checkDatabaseIntegrity[String(collection)] = true
-        integrityCheckPromise = null
+        integrityCheckPromise[String(collection)] = null
       })
   }
 
-  if (integrityCheckPromise) {
-    await integrityCheckPromise
+  if (integrityCheckPromise[String(collection)]) {
+    await integrityCheckPromise[String(collection)]
   }
 }
 
 async function _checkAndImportDatabaseIntegrity(event: H3Event, collection: string, integrityVersion: string, config: RuntimeConfig) {
   const db = await loadDatabaseAdapter(config)
 
-  const before = await db.first<{ version: string }>(`select * from ${tables._info}`).catch(() => ({ version: '' }))
+  const before = await db.first<{ version: string }>(`select * from ${tables.info} where id = 'checksum_${collection}'`).catch(() => ({ version: '' }))
+
   if (before?.version) {
     if (before?.version === integrityVersion) {
       return true
     }
     // Delete old version
-    await db.exec(`DELETE FROM ${tables._info} WHERE version = '${before.version}'`)
+    await db.exec(`DELETE FROM ${tables.info} WHERE id = 'checksum_${collection}'`)
   }
 
   const dump = await loadDatabaseDump(event, collection).then(decompressSQLDump)
@@ -80,7 +81,7 @@ async function _checkAndImportDatabaseIntegrity(event: H3Event, collection: stri
     })
   }, Promise.resolve())
 
-  const after = await db.first<{ version: string }>(`select * from ${tables._info}`).catch(() => ({ version: '' }))
+  const after = await db.first<{ version: string }>(`SELECT * FROM ${tables.info} WHERE id = 'checksum_${collection}'`).catch(() => ({ version: '' }))
   return after?.version === integrityVersion
 }
 

src/types/collection.ts

@@ -70,7 +70,7 @@ export interface CollectionInfo {
 }
 
 export interface CollectionItemBase {
-  _id: string
+  id: string
   stem: string
   extension: string
   meta: Record<string, unknown>

src/utils/collection.ts

@@ -8,8 +8,8 @@ import { logger } from './dev'
 
 const JSON_FIELDS_TYPES = ['ZodObject', 'ZodArray', 'ZodRecord', 'ZodIntersection', 'ZodUnion', 'ZodAny']
 
-function getTableName(name: string) {
-  return `content_${name}`
+export function getTableName(name: string) {
+  return `_content_${name}`
 }
 
 export function defineCollection<T extends ZodRawShape>(collection: Collection<T>): DefinedCollection {
@@ -45,17 +45,24 @@ export function resolveCollection(name: string, collection: DefinedCollection):
     name,
     type: collection.type || 'page',
     tableName: getTableName(name),
-    private: name === '_info',
+    private: name === 'info',
   }
 }
 
 export function resolveCollections(collections: Record<string, DefinedCollection>): ResolvedCollection[] {
-  collections._info = defineCollection({
+  collections.info = {
     type: 'data',
+    source: undefined,
     schema: z.object({
-      version: z.string(),
+      id: z.string(),
+      value: z.string(),
     }),
-  })
+    extendedSchema: z.object({
+      id: z.string(),
+      value: z.string(),
+    }),
+    jsonFields: [],
+  }
 
   return Object.entries(collections)
     .map(([name, collection]) => resolveCollection(name, collection))
@@ -89,7 +96,7 @@ function resolveSource(source: string | CollectionSource | undefined): ResolvedC
 export function generateCollectionInsert(collection: ResolvedCollection, data: Record<string, unknown>) {
   const fields: string[] = []
   const values: Array<string | number | boolean> = []
-  const sortedKeys = Object.keys((collection.extendedSchema).shape).sort()
+  const sortedKeys = getOrderedColumns((collection.extendedSchema).shape)
 
   sortedKeys.forEach((key) => {
     const value = (collection.extendedSchema).shape[key]
@@ -128,12 +135,12 @@ export function generateCollectionInsert(collection: ResolvedCollection, data: R
 
 // Convert a collection with Zod schema to SQL table definition
 export function generateCollectionTableDefinition(collection: ResolvedCollection, opts: { drop?: boolean } = {}) {
-  const sortedKeys = Object.keys((collection.extendedSchema).shape).sort()
+  const sortedKeys = getOrderedColumns((collection.extendedSchema).shape)
   const sqlFields = sortedKeys.map((key) => {
     const type = (collection.extendedSchema).shape[key]!
     const underlyingType = getUnderlyingType(type)
 
-    if (key === '_id') return `${key} TEXT PRIMARY KEY`
+    if (key === 'id') return `${key} TEXT PRIMARY KEY`
 
     let sqlType: string = ZodToSqlFieldTypes[underlyingType.constructor.name as ZodFieldType]
 
@@ -180,3 +187,13 @@ export function generateCollectionTableDefinition(collection: ResolvedCollection
 
   return definition
 }
+
+function getOrderedColumns(shape: ZodRawShape) {
+  const keys = new Set([
+    shape.id ? 'id' : undefined,
+    shape.title ? 'title' : undefined,
+    ...Object.keys(shape).sort(),
+  ].filter(Boolean))
+
+  return Array.from(keys) as string[]
+}

src/utils/content/index.ts

@@ -88,8 +88,8 @@ export async function parseContent(key: string, content: string, collection: Res
     },
   })
 
-  const { id: _id, ...parsedContentFields } = parsedContent
-  const result = { _id } as typeof collection.extendedSchema._type
+  const { id: id, ...parsedContentFields } = parsedContent
+  const result = { id } as typeof collection.extendedSchema._type
   const meta = {} as Record<string, unknown>
 
   const collectionKeys = Object.keys(collection.extendedSchema.shape)