feat: advanced query schema (#2213)

nuxt · Aug 3, 2023 · 9c2f3be · 9c2f3be
1 parent c582469
commit 9c2f3be
Show file tree

Hide file tree

Showing 124 changed files with 2,439 additions and 311 deletions.
diff --git a/docs/components/content/ChangeLog.vue b/docs/components/content/ChangeLog.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <GithubReleases v-slot="{releases}">
+    <GithubReleases v-slot="{ releases }">
       <div v-for="release in releases" :key="release.name" class="release">
         <div class="release-name">
           <h2 class="">

diff --git a/package.json b/package.json
@@ -44,6 +44,7 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.6.5",
+    "@vueuse/head": "^1.1.26",
     "consola": "^3.2.3",
     "defu": "^6.1.2",
     "destr": "^2.0.0",

diff --git a/playground/shared/components/NavItem.vue b/playground/shared/components/NavItem.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import type { NavItem } from '../../../src/runtime/types'
+
 const props = defineProps<{
-  navItem: any
+  navItem: NavItem
 }>()
 const icon = computed(() => {
   if (props.navItem.icon) { return props.navItem.icon }

diff --git a/playground/shared/components/content/MarkdownBetween.vue b/playground/shared/components/content/MarkdownBetween.vue
@@ -1,7 +1,3 @@
 <template>
-  <ContentSlot :use="$slots.default" unwrap="ul li">
-    <template #between>
-      <br>
-    </template>
-  </ContentSlot>
+  <ContentSlot :use="$slots.default" unwrap="ul li" />
 </template>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/module.ts b/src/module.ts
@@ -229,6 +229,7 @@ export interface ModuleOptions {
   experimental: {
     clientDB: boolean
     stripQueryParameters: boolean
+    advanceQuery: boolean
   }
 }
 
@@ -293,7 +294,8 @@ export default defineNuxtModule<ModuleOptions>({
     respectPathCase: false,
     experimental: {
       clientDB: false,
-      stripQueryParameters: false
+      stripQueryParameters: false,
+      advanceQuery: false
     }
   },
   async setup (options, nuxt) {
@@ -328,6 +330,7 @@ export default defineNuxtModule<ModuleOptions>({
           if (code.includes('<ContentSlot')) {
             code = code.replace(/<ContentSlot (.*)(:use=['"](\$slots.)?([a-z]*)['"]|use=['"]([a-z]*)['"])/g, '<MDCSlot $1 name="$4"')
             code = code.replace(/<\/ContentSlot>/g, '</MDCSlot>')
+            code = code.replace(/<ContentSlot/g, '<MDCSlot')
             return code
           }
         }
@@ -421,7 +424,7 @@ export default defineNuxtModule<ModuleOptions>({
 
     // Register composables
     addImports([
-      { name: 'queryContent', as: 'queryContent', from: resolveRuntimeModule('./composables/query') },
+      { name: 'queryContent', as: 'queryContent', from: resolveRuntimeModule(`./${options.experimental.advanceQuery ? '' : 'legacy/'}composables/query`) },
       { name: 'useContentHelpers', as: 'useContentHelpers', from: resolveRuntimeModule('./composables/helpers') },
       { name: 'useContentHead', as: 'useContentHead', from: resolveRuntimeModule('./composables/head') },
       { name: 'useContentPreview', as: 'useContentPreview', from: resolveRuntimeModule('./composables/preview') },
@@ -475,7 +478,7 @@ export default defineNuxtModule<ModuleOptions>({
       filename: 'types/content.d.ts',
       getContents: () => [
         'declare module \'#content/server\' {',
-        `  const serverQueryContent: typeof import('${resolve('./runtime/server')}').serverQueryContent`,
+        `  const serverQueryContent: typeof import('${resolve(options.experimental.advanceQuery ? './runtime/server' : './runtime/legacy/types')}').serverQueryContent`,
         `  const parseContent: typeof import('${resolve('./runtime/server')}').parseContent`,
         '}'
       ].join('\n')
@@ -562,7 +565,11 @@ export default defineNuxtModule<ModuleOptions>({
         { name: 'useContent', as: 'useContent', from: resolveRuntimeModule('./composables/content') }
       ])
 
-      addPlugin(resolveRuntimeModule('./plugins/documentDriven'))
+      addPlugin(resolveRuntimeModule(
+        options.experimental.advanceQuery
+          ? './plugins/documentDriven'
+          : './legacy/plugins/documentDriven'
+      ))
 
       if (options.documentDriven.injectPage) {
         nuxt.options.pages = true
@@ -631,6 +638,7 @@ export default defineNuxtModule<ModuleOptions>({
       integrity: buildIntegrity,
       experimental: {
         stripQueryParameters: options.experimental.stripQueryParameters,
+        advanceQuery: options.experimental.advanceQuery === true,
         clientDB: options.experimental.clientDB && nuxt.options.ssr === false
       },
       respectPathCase: options.respectPathCase ?? false,
@@ -700,7 +708,7 @@ export default defineNuxtModule<ModuleOptions>({
           return true
         })
         await Promise.all(
-          keys.map(async key => await storage.setItem(
+          keys.map(async (key: string) => await storage.setItem(
             `cache:content:parsed:${key.substring(15)}`,
             await storage.getItem(key)
           ))
@@ -757,6 +765,7 @@ interface ModulePublicRuntimeConfig {
   experimental: {
     stripQueryParameters: boolean
     clientDB: boolean
+    advanceQuery: boolean
   }
   respectPathCase: boolean