types: fix strict null checks (#3265)

MellKam · farnabaz · web-flow · commit 8c2afa580784 · 2025-03-19T12:40:51.000+01:00
---------

Co-authored-by: Farnabaz &lt;farnabaz@gmail.com&gt;
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "test": "vitest run",
     "test:bun": "bun test ./test/bun.test.ts",
     "test:watch": "vitest watch",
-    "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit",
+    "test:types": "vue-tsc --noEmit",
     "verify": "npm run dev:prepare && npm run lint && npm run test && npm run typecheck"
   },
   "dependencies": {
diff --git a/src/features/llms/module.ts b/src/features/llms/module.ts
@@ -30,6 +30,8 @@ declare module 'nuxt-llms' {
       },
       write: true,
     }).dst
+    nuxt.options.nitro ||= {}
+    nuxt.options.nitro.typescript ||= {}
     nuxt.options.nitro.typescript.tsConfig = defu(nuxt.options.nitro.typescript.tsConfig, {
       include: [typeTemplate],
     })
diff --git a/src/module.ts b/src/module.ts
@@ -125,6 +125,7 @@ export default defineNuxtModule<ModuleOptions>({
 
     // Add content types to Nuxt and Nitro
     const typesTemplateDst = addTypeTemplate(contentTypesTemplate(manifest.collections)).dst
+    nuxt.options.nitro.typescript ||= {}
     nuxt.options.nitro.typescript.tsConfig = defu(nuxt.options.nitro.typescript.tsConfig, {
       include: [typesTemplateDst],
     })
@@ -275,7 +276,7 @@ async function processCollectionItems(nuxt: Nuxt, collections: ResolvedCollectio
 
       const { fixed } = parseSourceBase(source)
       const cwd = source.cwd
-      const _keys = await source.getKeys()
+      const _keys = await source.getKeys?.() || []
 
       filesCount += _keys.length
 
@@ -293,7 +294,7 @@ async function processCollectionItems(nuxt: Nuxt, collections: ResolvedCollectio
           const cache = databaseContents[keyInCollection]
 
           try {
-            const content = await source.getItem(key)
+            const content = await source.getItem?.(key) || ''
             const checksum = getContentChecksum(configHash + collectionHash + content)
 
             let parsedContent
diff --git a/src/presets/nuxthub.ts b/src/presets/nuxthub.ts
@@ -24,7 +24,7 @@ export default definePreset({
 
     if (nitroConfig.dev === false) {
       // Write SQL dump to database queries when not in dev mode
-      await mkdir(resolve(nitroConfig.rootDir, '.data/hub/database/queries'), { recursive: true })
+      await mkdir(resolve(nitroConfig.rootDir!, '.data/hub/database/queries'), { recursive: true })
       let i = 1
       // Drop info table and prepare for new dump
       let dump = 'DROP TABLE IF EXISTS _content_info;\n'
@@ -45,9 +45,11 @@ export default definePreset({
         dumpFiles.push({ file: `content-database-${String(i).padStart(3, '0')}.sql`, content: dump.trim() })
       }
       for (const dumpFile of dumpFiles) {
-        await writeFile(resolve(nitroConfig.rootDir, '.data/hub/database/queries', dumpFile.file), dumpFile.content)
+        await writeFile(resolve(nitroConfig.rootDir!, '.data/hub/database/queries', dumpFile.file), dumpFile.content)
       }
       // Disable integrity check in production for performance
+      nitroConfig.runtimeConfig ||= {}
+      nitroConfig.runtimeConfig.content ||= {}
       nitroConfig.runtimeConfig.content.integrityCheck = false
     }
   },
diff --git a/src/runtime/app.ts b/src/runtime/app.ts
@@ -31,7 +31,7 @@ export function queryCollectionSearchSections(collection: keyof Collections, opt
   return chainablePromise(collection, qb => generateSearchSections(qb, opts))
 }
 
-async function executeContentQuery<T extends keyof Collections, Result = Collections[T]>(event: H3Event, collection: T, sql: string) {
+async function executeContentQuery<T extends keyof Collections, Result = Collections[T]>(event: H3Event | undefined, collection: T, sql: string) {
   if (import.meta.client) {
     return queryContentSqlClientWasm<T, Result>(collection, sql) as Promise<Result[]>
   }
diff --git a/src/runtime/internal/connectors/bunsqlite.ts b/src/runtime/internal/connectors/bunsqlite.ts
@@ -8,7 +8,7 @@ const connector: typeof bunSqliteConnector = (opts) => {
   if (!globalThis.CompressionStream) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const make = (ctx: unknown, handle: any) =>
-      Object.assign(ctx, {
+      Object.assign(ctx as object, {
         writable: new WritableStream({
           write: (chunk: ArrayBufferView) => handle.write(chunk),
           close: () => handle.end(),
diff --git a/src/runtime/internal/database.client.ts b/src/runtime/internal/database.client.ts
@@ -13,13 +13,13 @@ export function loadDatabaseAdapter<T>(collection: T): DatabaseAdapter {
     if (!db) {
       dbPromises._ = dbPromises._ || initializeDatabase()
       db = await dbPromises._
-      dbPromises._ = undefined
+      Reflect.deleteProperty(dbPromises, '_')
     }
     if (!loadedCollections[String(collection)]) {
       dbPromises[String(collection)] = dbPromises[String(collection)] || loadCollectionDatabase(collection)
       await dbPromises[String(collection)]
       loadedCollections[String(collection)] = 'loaded'
-      dbPromises[String(collection)] = undefined
+      Reflect.deleteProperty(dbPromises, String(collection))
     }
 
     return db
diff --git a/src/runtime/internal/database.server.ts b/src/runtime/internal/database.server.ts
@@ -123,7 +123,7 @@ async function _checkAndImportDatabaseIntegrity(event: H3Event, collection: stri
     // in D1, there is a bug where semicolons and comments can't work together
     // so we need to split the SQL and remove the comment
     // @see https://github.com/cloudflare/workers-sdk/issues/3892
-    const hash = dumpLinesHash[index]
+    const hash = dumpLinesHash[index]!
     const statement = sql.substring(0, sql.length - hash.length - 4)
 
     // If the structure has not changed,
@@ -168,10 +168,10 @@ async function waitUntilDatabaseIsReady(db: DatabaseAdapter, collection: string)
   let interval: NodeJS.Timer
   await new Promise((resolve, reject) => {
     interval = setInterval(async () => {
-      const { ready } = await db.first<{ ready: boolean }>(`SELECT ready FROM ${tables.info} WHERE id = ?`, [`checksum_${collection}`])
+      const row = await db.first<{ ready: boolean }>(`SELECT ready FROM ${tables.info} WHERE id = ?`, [`checksum_${collection}`])
         .catch(() => ({ ready: true }))
 
-      if (ready) {
+      if (row?.ready) {
         clearInterval(interval)
         resolve(0)
       }
diff --git a/src/runtime/internal/navigation.ts b/src/runtime/internal/navigation.ts
@@ -100,8 +100,8 @@ export async function generateNavigationTree<T extends PageCollectionItemBase>(q
           Object.assign(existed, {
             page: undefined,
             children: [
-              ...navItem.children,
-              ...existed.children,
+              ...(navItem.children || []),
+              ...(existed.children || []),
             ],
           })
         }
@@ -152,8 +152,8 @@ export async function generateNavigationTree<T extends PageCollectionItemBase>(q
           ...navItem,
           page: undefined,
           children: [
-            ...navItem.children,
-            ...existed.children,
+            ...(navItem.children || []),
+            ...(existed.children || []),
           ],
         })
       }
diff --git a/src/runtime/internal/preview/collection.ts b/src/runtime/internal/preview/collection.ts
@@ -7,8 +7,8 @@ import { getOrderedSchemaKeys } from '../schema'
 import { parseSourceBase } from './utils'
 import { withoutRoot } from './files'
 
-export const getCollectionByFilePath = (path: string, collections: Record<string, CollectionInfo>): { collection: CollectionInfo, matchedSource: ResolvedCollectionSource } => {
-  let matchedSource: ResolvedCollectionSource
+export const getCollectionByFilePath = (path: string, collections: Record<string, CollectionInfo>): { collection: CollectionInfo | undefined, matchedSource: ResolvedCollectionSource | undefined } => {
+  let matchedSource: ResolvedCollectionSource | undefined
   const collection = Object.values(collections).find((collection) => {
     if (!collection.source || collection.source.length === 0) {
       return
@@ -28,21 +28,21 @@ export const getCollectionByFilePath = (path: string, collections: Record<string
   }
 }
 
-export const getCollectionByRoutePath = (routePath: string, collections: Record<string, CollectionInfo>): { collection: CollectionInfo, matchedSource: ResolvedCollectionSource } => {
-  let matchedSource: ResolvedCollectionSource
+export const getCollectionByRoutePath = (routePath: string, collections: Record<string, CollectionInfo>): { collection: CollectionInfo | undefined, matchedSource: ResolvedCollectionSource | undefined } => {
+  let matchedSource: ResolvedCollectionSource | undefined
   const collection = Object.values(collections).find((collection) => {
     if (!collection.source || collection.source.length === 0) {
       return
     }
 
     matchedSource = collection.source.find((source) => {
-      if (!routePath.startsWith(source.prefix)) {
+      if (!source.prefix || !routePath.startsWith(source.prefix)) {
         return
       }
 
       if (routePath === '/' || routePath === source.prefix) {
         const indexFiles = ['index.yml', 'index.yaml', 'index.md', 'index.json']
-        const files = routePath === '/' ? indexFiles : indexFiles.map(file => withoutLeadingSlash(joinURL(source.prefix, file)))
+        const files = routePath === '/' ? indexFiles : indexFiles.map(file => withoutLeadingSlash(joinURL(source.prefix!, file)))
         return files.some((p) => {
           return collection.source.find(source => minimatch(p, source.include) && !source.exclude?.some(exclude => minimatch(p, exclude)))
         })
@@ -98,7 +98,7 @@ export function generateRecordSelectByColumn(collection: CollectionInfo, column:
 function computeValuesBasedOnCollectionSchema(collection: CollectionInfo, data: Record<string, unknown>) {
   const fields: string[] = []
   const values: Array<string | number | boolean> = []
-  const properties = (collection.schema.definitions[collection.name] as JsonSchema7ObjectType).properties
+  const properties = (collection.schema.definitions![collection.name] as JsonSchema7ObjectType).properties
   const sortedKeys = getOrderedSchemaKeys(properties)
 
   sortedKeys.forEach((key) => {
diff --git a/src/runtime/internal/preview/compatibility.ts b/src/runtime/internal/preview/compatibility.ts
@@ -5,7 +5,10 @@ import { parseSourceBase } from './utils'
 
 export const v2ToV3ParsedFile = (file: DraftSyncFile, collection: CollectionInfo, source: ResolvedCollectionSource) => {
   const { fixed } = parseSourceBase(source)
-  const path = file.parsed._path.substring(fixed.length)
+  if (!file.parsed) {
+    return undefined
+  }
+  const path = file.parsed._path!.substring(fixed.length)
   const pathInCollection = join(source?.prefix || '', path)
 
   // TODO - Handle data collections (remove path...)
@@ -17,15 +20,15 @@ export const v2ToV3ParsedFile = (file: DraftSyncFile, collection: CollectionInfo
     path: pathInCollection,
   }
 
-  const properties = (collection.schema.definitions[collection.name] as JsonSchema7ObjectType).properties
+  const properties = (collection.schema.definitions![collection.name] as JsonSchema7ObjectType).properties
 
   // Map parsed content to collection schema
   Object.keys(file.parsed).forEach((key) => {
     if (key in properties) {
-      mappedFile[key] = file.parsed[key]
+      mappedFile[key] = file.parsed![key]
     }
     else {
-      (mappedFile.meta as Record<string, unknown>)[key] = file.parsed[key]
+      (mappedFile.meta as Record<string, unknown>)[key] = file.parsed![key]
     }
   })
 
diff --git a/src/runtime/internal/preview/index.ts b/src/runtime/internal/preview/index.ts
@@ -45,14 +45,14 @@ const initializePreview = async (data: DraftSyncData) => {
 const syncDraftFile = async (collections: Record<string, CollectionInfo>, file: DraftSyncFile) => {
   // Fetch corresponding collection
   const { collection, matchedSource } = getCollectionByFilePath(file.path, collections)
-  if (!collection) {
+  if (!collection || !matchedSource) {
     console.warn(`Content Preview: collection not found for file: ${file.path}, skipping insertion.`)
     return
   }
 
   const db = loadDatabaseAdapter(collection.name)
 
-  const v3File = v2ToV3ParsedFile(file, collection, matchedSource)
+  const v3File = v2ToV3ParsedFile(file, collection, matchedSource)!
 
   const query = generateCollectionInsert(collection, v3File)
 
@@ -93,7 +93,7 @@ export function mountPreviewUI() {
 
 export function initIframeCommunication() {
   const nuxtApp = useNuxtApp()
-  const previewConfig: PublicRuntimeConfig['preview'] = useRuntimeConfig().public.preview
+  const previewConfig = useRuntimeConfig().public.preview as PublicRuntimeConfig['preview']
 
   // Not in an iframe
   if (!window.parent || window.self === window.parent) {
@@ -211,14 +211,14 @@ export function initIframeCommunication() {
 
     async function handleFileUpdate(file: PreviewFile, navigate: boolean) {
       const { collection, matchedSource } = getCollectionByFilePath(file.path, collections)
-      if (!collection) {
+      if (!collection || !matchedSource) {
         console.warn(`Content Preview: collection not found for file: ${file.path}, skipping update.`)
         return
       }
 
       const stem = generateStemFromPath(file.path)
 
-      const v3File = v2ToV3ParsedFile({ path: file.path, parsed: file.parsed }, collection, matchedSource)
+      const v3File = v2ToV3ParsedFile({ path: file.path, parsed: file.parsed }, collection, matchedSource)!
 
       const query = generateRecordUpdate(collection, stem, v3File)
 
diff --git a/src/runtime/internal/query.ts b/src/runtime/internal/query.ts
@@ -124,7 +124,7 @@ export const collectionQueryBuilder = <T extends keyof Collections>(collection:
     async all(): Promise<Collections[T][]> {
       return fetch(collection, buildQuery()).then(res => (res || []) as Collections[T][])
     },
-    async first(): Promise<Collections[T]> {
+    async first(): Promise<Collections[T] | null> {
       return fetch(collection, buildQuery({ limit: 1 })).then(res => res[0] || null)
     },
     async count(field: keyof Collections[T] | '*' = '*', distinct: boolean = false) {
diff --git a/src/types/collection.ts b/src/types/collection.ts
@@ -1,5 +1,5 @@
 import type { ZodObject, ZodRawShape } from 'zod'
-import type { JsonSchema7Type } from 'zod-to-json-schema'
+import type { zodToJsonSchema } from 'zod-to-json-schema'
 import type { MarkdownRoot } from './content'
 
 export interface PageCollections {}
@@ -81,10 +81,7 @@ export interface CollectionInfo {
   tableName: string
   source: ResolvedCollectionSource[]
   type: CollectionType
-  schema: JsonSchema7Type & {
-    $schema?: string
-    definitions?: { [key: string]: JsonSchema7Type }
-  }
+  schema: ReturnType<typeof zodToJsonSchema>
   fields: Record<string, 'string' | 'number' | 'boolean' | 'date' | 'json'>
   tableDefinition: string
 }
diff --git a/src/types/module.ts b/src/types/module.ts
@@ -55,7 +55,7 @@ export interface ModuleOptions {
    * @private
    * @default { type: 'sqlite', filename: '.data/content/local.db' }
    */
-  _localDatabase?: SqliteDatabaseConfig | D1DatabaseConfig
+  _localDatabase: SqliteDatabaseConfig | D1DatabaseConfig
   /**
    * Production database configuration
    * @default { type: 'sqlite', filename: './contents.sqlite' }
diff --git a/src/types/query.ts b/src/types/query.ts
@@ -9,7 +9,7 @@ export interface CollectionQueryBuilder<T> {
   skip(skip: number): CollectionQueryBuilder<T>
   limit(limit: number): CollectionQueryBuilder<T>
   all(): Promise<T[]>
-  first(): Promise<T>
+  first(): Promise<T | null>
   count(field?: keyof T | '*', distinct?: boolean): Promise<number>
   where(field: string, operator: SQLOperator, value?: unknown): CollectionQueryBuilder<T>
   andWhere(groupFactory: QueryGroupFunction<T>): CollectionQueryBuilder<T>
diff --git a/src/utils/collection.ts b/src/utils/collection.ts
@@ -54,9 +54,15 @@ export function defineCollection<T extends ZodRawShape>(collection: Collection<T
 }
 
 export function defineCollectionSource(source: CustomCollectionSource): ResolvedCustomCollectionSource {
+  const resolvedSource = resolveSource({ ...source, cwd: '', include: '' })?.[0]
+
+  if (!resolvedSource) {
+    throw new Error('Invalid collection source')
+  }
+
   return {
     _custom: true,
-    ...resolveSource({ ...source, cwd: '', include: '' })?.[0],
+    ...resolvedSource,
   }
 }
 
diff --git a/src/utils/content/index.ts b/src/utils/content/index.ts
@@ -31,9 +31,8 @@ let highlightPlugin: {
     theme?: Record<string, unknown>
     highlighter: Highlighter
   }
-
-}
-let highlightPluginPromise: Promise<typeof highlightPlugin>
+} | undefined
+let highlightPluginPromise: Promise<typeof highlightPlugin> | undefined
 async function getHighlightPluginInstance(options: HighlighterOptions) {
   const key = hash(JSON.stringify(options || {}))
 
@@ -118,16 +117,18 @@ export async function createParser(collection: ResolvedCollection, nuxt?: Nuxt)
     : undefined
 
   // Load transformers
-  const jiti = createJiti(nuxt?.options?.rootDir)
-  const extraTransformers: ContentTransformer[] = await Promise.all(transformers.map(async (transformer) => {
-    const resolved = resolveAlias(transformer, nuxt?.options?.alias)
-
-    return jiti.import(resolved).then(m => (m as { default: ContentTransformer }).default || m).catch((e: unknown) => {
-      logger.error(`Failed to load transformer ${transformer}`, e)
-      return false
-    })
-  })).then(transformers => transformers.filter(Boolean)) as ContentTransformer[]
-
+  let extraTransformers: ContentTransformer[] = []
+  if (nuxt?.options?.rootDir) {
+    const jiti = createJiti(nuxt.options.rootDir)
+    extraTransformers = await Promise.all(transformers.map(async (transformer) => {
+      const resolved = resolveAlias(transformer, nuxt?.options?.alias)
+
+      return jiti.import(resolved).then(m => (m as { default: ContentTransformer }).default || m).catch((e: unknown) => {
+        logger.error(`Failed to load transformer ${transformer}`, e)
+        return false
+      })
+    })).then(transformers => transformers.filter(Boolean)) as ContentTransformer[]
+  }
   const parserOptions = {
     pathMeta: pathMeta,
     markdown: {
@@ -145,7 +146,7 @@ export async function createParser(collection: ResolvedCollection, nuxt?: Nuxt)
         ...mdcOptions?.remarkPlugins,
         ...markdown?.remarkPlugins,
       },
-      highlight: undefined as HighlighterOptions,
+      highlight: undefined,
     },
   }
 
diff --git a/src/utils/database.ts b/src/utils/database.ts
@@ -99,7 +99,7 @@ export async function getLocalDatabase(database: SqliteDatabaseConfig | D1Databa
       db.exec(sql)
     },
     close() {
-      _localDatabase[databaseLocation] = undefined
+      Reflect.deleteProperty(_localDatabase, databaseLocation)
     },
     fetchDevelopmentCache,
     fetchDevelopmentCacheForKey,
diff --git a/src/utils/dev.ts b/src/utils/dev.ts
diff --git a/src/utils/git.ts b/src/utils/git.ts
diff --git a/src/utils/preview/module.ts b/src/utils/preview/module.ts
diff --git a/src/utils/templates.ts b/src/utils/templates.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ export function queryCollectionSearchSections(collection: keyof Collections, opt`
`31`	`31`	`return chainablePromise(collection, qb => generateSearchSections(qb, opts))`
`32`	`32`	`}`
`33`	`33`
`34`		`-async function executeContentQuery<T extends keyof Collections, Result = Collections[T]>(event: H3Event, collection: T, sql: string) {`
	`34`	`+async function executeContentQuery<T extends keyof Collections, Result = Collections[T]>(event: H3Event \| undefined, collection: T, sql: string) {`
`35`	`35`	`if (import.meta.client) {`
`36`	`36`	`return queryContentSqlClientWasm<T, Result>(collection, sql) as Promise<Result[]>`
`37`	`37`	`}`