fix: use unstorage types (#2136)

src/module.ts

@@ -17,8 +17,7 @@ import { hash } from 'ohash'
 import { join, relative } from 'pathe'
 import type { Lang as ShikiLang, Theme as ShikiTheme } from 'shiki-es'
 import { listen } from 'listhen'
-import type { WatchEvent } from 'unstorage'
-import { createStorage } from 'unstorage'
+import { type WatchEvent, createStorage } from 'unstorage'
 import { joinURL, withLeadingSlash, withTrailingSlash } from 'ufo'
 import type { Component } from '@nuxt/schema'
 import { name, version } from '../package.json'

src/runtime/composables/client-db.ts

@@ -1,7 +1,6 @@
-import type { Storage } from 'unstorage'
 // @ts-ignore
 import memoryDriver from 'unstorage/drivers/memory'
-import { createStorage, prefixStorage } from 'unstorage'
+import { type Storage, createStorage, prefixStorage } from 'unstorage'
 import { withBase } from 'ufo'
 import { useRuntimeConfig, useNuxtApp } from '#app'
 import { createPipelineFetcher } from '../query/match/pipeline'

src/runtime/markdown-parser/index.ts

@@ -54,7 +54,7 @@ export const useDefaultOptions = (): MarkdownOptions => ({
 export async function parse (file: string, userOptions: Partial<MarkdownOptions> = {}) {
  const options = defu(userOptions, useDefaultOptions()) as MarkdownOptions
 
- const { content, data } = await parseFrontMatter(file)
+ const { content, data } = parseFrontMatter(file)
 
  // Compile markdown from file content to JSON
  const body = await generateBody(content, { ...options, data })

src/runtime/server/storage.ts

@@ -1,4 +1,4 @@
-import { prefixStorage } from 'unstorage'
+import { type StorageValue, prefixStorage } from 'unstorage'
 import { joinURL, withLeadingSlash, withoutTrailingSlash } from 'ufo'
 import { hash as ohash } from 'ohash'
 import type { H3Event } from 'h3'
@@ -151,7 +151,7 @@ export const getContent = async (event: H3Event, id: string): Promise<ParsedCont
  return { _id: contentId, body: null }
  }
 
- const parsed = await parseContent(contentId, body as string) as ParsedContent
+ const parsed = await parseContent(contentId, body) as ParsedContent
 
  await cacheParsedStorage.setItem(id, { parsed, hash }).catch(() => {})
 
@@ -161,7 +161,7 @@ export const getContent = async (event: H3Event, id: string): Promise<ParsedCont
 /**
  * Parse content file using registered plugins
  */
-export async function parseContent (id: string, content: string, opts: ParseContentOptions = {}) {
+export const parseContent = async (id: string, content: StorageValue, opts: ParseContentOptions = {}) => {
  const nitroApp = useNitroApp()
  const options = defu(
  opts,

src/runtime/transformers/index.ts

@@ -1,5 +1,6 @@
 import { extname } from 'pathe'
 import { camelCase } from 'scule'
+import type { StorageValue } from 'unstorage'
 import type { ContentTransformer, TransformContentOptions } from '../types'
 import csv from './csv'
 import markdown from './markdown'
@@ -36,7 +37,7 @@ function getTransformers (ext: string, additionalTransformers: ContentTransforme
 /**
  * Parse content file using registered plugins
  */
-export async function transformContent (id: string, content: string, options: TransformContentOptions = {}) {
+export async function transformContent (id: string, content: StorageValue, options: TransformContentOptions = {}) {
  const { transformers = [] } = options
  // Call hook before parsing the file
  const file = { _id: id, body: content }

src/runtime/transformers/markdown.ts

@@ -11,7 +11,7 @@ export default defineTransformer({
  config.rehypePlugins = await importPlugins(config.rehypePlugins)
  config.remarkPlugins = await importPlugins(config.remarkPlugins)
 
- const parsed = await parse(content, config)
+ const parsed = await parse(content as string, config)
 
  return <MarkdownParsedContent> {
  ...parsed.meta,

src/runtime/transformers/yaml.ts

@@ -5,8 +5,8 @@ import { defineTransformer } from './utils'
 export default defineTransformer({
  name: 'Yaml',
  extensions: ['.yml', '.yaml'],
- parse: async (_id, content) => {
- const { data } = await parseFrontMatter(`---\n${content}\n---`)
+ parse: (_id, content) => {
+ const { data } = parseFrontMatter(`---\n${content}\n---`)
 
  // Keep array contents under `body` key
  let parsed = data

src/runtime/types.d.ts

@@ -1,4 +1,5 @@
 import type { Theme } from 'shiki-es'
+import type { StorageValue } from 'unstorage'
 
 export interface ParsedContentInternalMeta {
  /**
@@ -140,7 +141,7 @@ export interface MarkdownParsedContent extends ParsedContent {
 export interface ContentTransformer {
  name: string
  extensions: string[]
- parse?(id: string, content: string, options: any): Promise<ParsedContent> | ParsedContent
+ parse?(id: string, content: StorageValue, options: any): Promise<ParsedContent> | ParsedContent
  transform?(content: ParsedContent, options: any): Promise<ParsedContent> | ParsedContent
 }