fix: deprecate nitro export in favor of server

Author: farnabaz

package.json

@@ -33,6 +33,7 @@
       "import": "./dist/runtime/utils/index.js"
     },
     "./runtime": "./dist/runtime/index.js",
+    "./server": "./dist/runtime/server.js",
     "./nitro": "./dist/runtime/nitro.js"
   },
   "main": "./dist/module.cjs",

src/runtime/nitro.ts

@@ -1,67 +1,25 @@
-import type { H3Event } from 'h3'
-import { collectionQueryBuilder } from './internal/query'
-import { generateNavigationTree } from './internal/navigation'
-import { generateItemSurround } from './internal/surround'
-import { generateSearchSections } from './internal/search'
-import { fetchQuery } from './internal/api'
-import type { Collections, CollectionQueryBuilder, PageCollections, SurroundOptions, SQLOperator, QueryGroupFunction } from '@nuxt/content'
-
-interface ChainablePromise<T extends keyof PageCollections, R> extends Promise<R> {
-  where(field: keyof PageCollections[T] | string, operator: SQLOperator, value?: unknown): ChainablePromise<T, R>
-  andWhere(groupFactory: QueryGroupFunction<PageCollections[T]>): ChainablePromise<T, R>
-  orWhere(groupFactory: QueryGroupFunction<PageCollections[T]>): ChainablePromise<T, R>
-  order(field: keyof PageCollections[T], direction: 'ASC' | 'DESC'): ChainablePromise<T, R>
-}
-
-export const queryCollection = <T extends keyof Collections>(event: H3Event, collection: T): CollectionQueryBuilder<Collections[T]> => {
-  return collectionQueryBuilder<T>(collection, (collection, sql) => fetchQuery(event, collection, sql))
-}
-
-export function queryCollectionNavigation<T extends keyof PageCollections>(event: H3Event, collection: T, fields?: Array<keyof PageCollections[T]>) {
-  return chainablePromise(event, collection, qb => generateNavigationTree(qb, fields))
-}
-
-export function queryCollectionItemSurroundings<T extends keyof PageCollections>(event: H3Event, collection: T, path: string, opts?: SurroundOptions<keyof PageCollections[T]>) {
-  return chainablePromise(event, collection, qb => generateItemSurround(qb, path, opts))
-}
-
-export function queryCollectionSearchSections(event: H3Event, collection: keyof Collections, opts?: { ignoredTags: string[] }) {
-  return chainablePromise(event, collection, qb => generateSearchSections(qb, opts))
-}
-
-function chainablePromise<T extends keyof PageCollections, Result>(event: H3Event, collection: T, fn: (qb: CollectionQueryBuilder<PageCollections[T]>) => Promise<Result>) {
-  const queryBuilder = queryCollection(event, collection)
-
-  const chainable: ChainablePromise<T, Result> = {
-    where(field, operator, value) {
-      queryBuilder.where(String(field), operator, value)
-      return chainable
-    },
-    andWhere(groupFactory) {
-      queryBuilder.andWhere(groupFactory)
-      return chainable
-    },
-    orWhere(groupFactory) {
-      queryBuilder.orWhere(groupFactory)
-      return chainable
-    },
-    order(field, direction) {
-      queryBuilder.order(String(field), direction)
-      return chainable
-    },
-    then(onfulfilled, onrejected) {
-      return fn(queryBuilder).then(onfulfilled, onrejected)
-    },
-    catch(onrejected) {
-      return this.then(undefined, onrejected)
-    },
-    finally(onfinally) {
-      return this.then(undefined, undefined).finally(onfinally)
-    },
-    get [Symbol.toStringTag]() {
-      return 'Promise'
-    },
-  }
-
-  return chainable
-}
+import * as server from './server'
+/**
+ * `@nuxt/content/nitro` import is deprecated and will be removed in the next major version.
+ * Use `@nuxt/content/server` instead.
+ */
+
+/**
+ * @deprecated Import from `@nuxt/content/server` instead
+ */
+export const queryCollection = server.queryCollection
+
+/**
+ * @deprecated Import from `@nuxt/content/server` instead
+ */
+export const queryCollectionNavigation = server.queryCollectionNavigation
+
+/**
+ * @deprecated Import from `@nuxt/content/server` instead
+ */
+export const queryCollectionItemSurroundings = server.queryCollectionItemSurroundings
+
+/**
+ * @deprecated Import from `@nuxt/content/server` instead
+ */
+export const queryCollectionSearchSections = server.queryCollectionSearchSections

src/runtime/server.ts

@@ -0,0 +1,67 @@
+import type { H3Event } from 'h3'
+import { collectionQueryBuilder } from './internal/query'
+import { generateNavigationTree } from './internal/navigation'
+import { generateItemSurround } from './internal/surround'
+import { generateSearchSections } from './internal/search'
+import { fetchQuery } from './internal/api'
+import type { Collections, CollectionQueryBuilder, PageCollections, SurroundOptions, SQLOperator, QueryGroupFunction } from '@nuxt/content'
+
+interface ChainablePromise<T extends keyof PageCollections, R> extends Promise<R> {
+  where(field: keyof PageCollections[T] | string, operator: SQLOperator, value?: unknown): ChainablePromise<T, R>
+  andWhere(groupFactory: QueryGroupFunction<PageCollections[T]>): ChainablePromise<T, R>
+  orWhere(groupFactory: QueryGroupFunction<PageCollections[T]>): ChainablePromise<T, R>
+  order(field: keyof PageCollections[T], direction: 'ASC' | 'DESC'): ChainablePromise<T, R>
+}
+
+export const queryCollection = <T extends keyof Collections>(event: H3Event, collection: T): CollectionQueryBuilder<Collections[T]> => {
+  return collectionQueryBuilder<T>(collection, (collection, sql) => fetchQuery(event, collection, sql))
+}
+
+export function queryCollectionNavigation<T extends keyof PageCollections>(event: H3Event, collection: T, fields?: Array<keyof PageCollections[T]>) {
+  return chainablePromise(event, collection, qb => generateNavigationTree(qb, fields))
+}
+
+export function queryCollectionItemSurroundings<T extends keyof PageCollections>(event: H3Event, collection: T, path: string, opts?: SurroundOptions<keyof PageCollections[T]>) {
+  return chainablePromise(event, collection, qb => generateItemSurround(qb, path, opts))
+}
+
+export function queryCollectionSearchSections(event: H3Event, collection: keyof Collections, opts?: { ignoredTags: string[] }) {
+  return chainablePromise(event, collection, qb => generateSearchSections(qb, opts))
+}
+
+function chainablePromise<T extends keyof PageCollections, Result>(event: H3Event, collection: T, fn: (qb: CollectionQueryBuilder<PageCollections[T]>) => Promise<Result>) {
+  const queryBuilder = queryCollection(event, collection)
+
+  const chainable: ChainablePromise<T, Result> = {
+    where(field, operator, value) {
+      queryBuilder.where(String(field), operator, value)
+      return chainable
+    },
+    andWhere(groupFactory) {
+      queryBuilder.andWhere(groupFactory)
+      return chainable
+    },
+    orWhere(groupFactory) {
+      queryBuilder.orWhere(groupFactory)
+      return chainable
+    },
+    order(field, direction) {
+      queryBuilder.order(String(field), direction)
+      return chainable
+    },
+    then(onfulfilled, onrejected) {
+      return fn(queryBuilder).then(onfulfilled, onrejected)
+    },
+    catch(onrejected) {
+      return this.then(undefined, onrejected)
+    },
+    finally(onfinally) {
+      return this.then(undefined, undefined).finally(onfinally)
+    },
+    get [Symbol.toStringTag]() {
+      return 'Promise'
+    },
+  }
+
+  return chainable
+}