@btst/stack 4.6.0 → 5.1.0

package/dist/packages/stack/src/plugins/cms/api/operations.mjs

@@ -2,9 +2,9 @@ import { defineOperation, OperationHttpError } from '@btst/stack/plugins/api';
 import { z } from 'zod';
 import { formSchemaToZod } from '../../../../../ui/src/lib/schema-converter.mjs';
 import { cmsPermissions } from '../../../../../../plugins/cms/permissions.mjs';
-import { createListContentQuerySchema, DEFAULT_MAX_PAGE_SIZE } from '../schemas.mjs';
+import { createListContentQuerySchema, DEFAULT_MAX_PAGE_SIZE, contentReadOptionsSchema } from '../schemas.mjs';
 import { slugify } from '../utils.mjs';
-import { serializeContentType, getAllContentItems, getContentItemBySlug, serializeContentItemWithType } from './getters.mjs';
+import { serializeContentType, getAllContentItems, getContentItemBySlug, applyContentReadOptions, serializeContentItemWithType, getContentItemsByRelationForType, validateContentReadOptions, CMSContentSelectionError } from './getters.mjs';
 import { syncRelations, extractRelationFields, isNewRelationValue, isExistingRelationValue } from './relations.mjs';
 
 function operationContentType(contentType) {
@@ -23,9 +23,11 @@ function operationContentItem(item) {
     ...contentType ? { contentType: operationContentType(contentType) } : {}
   };
 }
-function operationContentList(result) {
+function operationContentList(result, options) {
   return {
-    items: result.items.map(operationContentItem),
+    items: result.items.map(
+      (item) => applyContentReadOptions(operationContentItem(item), options)
+    ),
     total: result.total,
     ...result.limit !== void 0 ? { limit: result.limit } : {},
     ...result.offset !== void 0 ? { offset: result.offset } : {}
@@ -63,7 +65,9 @@ const CMSUpdateContentItemBodySchema = z.object({
 });
 const ListContentTypesInputSchema = EmptyInputSchema;
 const GetContentTypeInputSchema = CMSContentTypeParamsSchema;
-const GetContentItemInputSchema = CMSContentItemParamsSchema;
+const GetContentItemInputSchema = CMSContentItemParamsSchema.extend(
+  contentReadOptionsSchema.shape
+);
 const CreateContentItemInputSchema = z.object({
   typeSlug: z.string().min(1),
   body: CMSCreateContentItemBodySchema
@@ -80,6 +84,21 @@ class CMSOperationError extends OperationHttpError {
     this.name = "CMSOperationError";
   }
 }
+function validateOperationContentReadOptions(contentType, options) {
+  try {
+    validateContentReadOptions(contentType, options);
+  } catch (error) {
+    if (error instanceof CMSContentSelectionError) {
+      throw new CMSOperationError(
+        400,
+        error.message,
+        "INVALID_CONTENT_FIELDS",
+        [{ path: ["fields"], message: error.message }]
+      );
+    }
+    throw error;
+  }
+}
 function normalizeOperationError(error, fallback) {
   if (error instanceof Error) return error;
   return new Error(typeof error === "string" ? error : fallback, {
@@ -615,39 +634,6 @@ async function deriveInverseSourceAuthorization(adapter, ensureSynced, targetTyp
     sources
   };
 }
-async function listRecordsForRelation(adapter, contentType, fieldName, targetId, limit, offset) {
-  const relations = await adapter.findMany({
-    model: "contentRelation",
-    where: [
-      { field: "targetId", value: targetId, operator: "eq" },
-      { field: "fieldName", value: fieldName, operator: "eq" }
-    ]
-  });
-  const ids = [...new Set(relations.map((relation) => relation.sourceId))];
-  const items = [];
-  for (const id of ids) {
-    const item = await adapter.findOne({
-      model: "contentItem",
-      where: [
-        { field: "id", value: id, operator: "eq" },
-        {
-          field: "contentTypeId",
-          value: contentType.id,
-          operator: "eq"
-        }
-      ],
-      join: { contentType: true }
-    });
-    if (item) items.push(item);
-  }
-  items.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
-  return {
-    items: items.slice(offset, offset + limit).map(serializeContentItemWithType),
-    total: items.length,
-    limit,
-    offset
-  };
-}
 function createCMSOperations(adapter, options) {
   const { ensureSynced, getContentTypesWithCounts, hooks } = options;
   const populatedRelationSnapshots = /* @__PURE__ */ new WeakMap();
@@ -813,7 +799,7 @@ function createCMSOperations(adapter, options) {
   });
   const ListContentByRelationInputSchema = z.object({
     typeSlug: z.string().min(1),
-    query: z.object({ field: z.string().min(1), targetId: z.string().min(1) }).merge(paginationSchema)
+    query: z.object({ field: z.string().min(1), targetId: z.string().min(1) }).merge(paginationSchema).merge(contentReadOptionsSchema)
   });
   const GetInverseRelationsInputSchema = z.object({
     slug: z.string().min(1),
@@ -825,7 +811,7 @@ function createCMSOperations(adapter, options) {
     query: z.object({
       itemId: z.string().min(1),
       fieldName: z.string().min(1)
-    }).merge(paginationSchema)
+    }).merge(paginationSchema).merge(contentReadOptionsSchema)
   });
   const notifyError = async (error, operation, context) => {
     await hooks?.onErrorExecuteContentOperation?.(
@@ -922,11 +908,17 @@ function createCMSOperations(adapter, options) {
       cmsPermissions.contentType.read({ contentType: facts.contentType })
     ],
     execute: async ({ input, facts }) => {
-      const result = await getAllContentItems(
-        adapter,
-        facts.contentType,
-        input.query
-      );
+      if (input.query.fields !== void 0) {
+        validateOperationContentReadOptions(
+          await getContentTypeOrThrow(adapter, ensureSynced, facts.contentType),
+          input.query
+        );
+      }
+      const result = await getAllContentItems(adapter, facts.contentType, {
+        ...input.query,
+        view: void 0,
+        fields: void 0
+      });
       if (facts.scope === "record") {
         if (!facts.recordId) {
           if (result.items.length > 0) throw staleRecordError();
@@ -937,7 +929,7 @@ function createCMSOperations(adapter, options) {
           )) {
             throw staleRecordError();
           }
-          return operationContentList(result);
+          return operationContentList(result, input.query);
         }
         if (result.items.length > 1) throw staleRecordError();
         if (result.items.length === 0) {
@@ -952,7 +944,7 @@ function createCMSOperations(adapter, options) {
           assertRecordFacts(result.items[0], facts);
         }
       }
-      return operationContentList(result);
+      return operationContentList(result, input.query);
     },
     onError: ({ error, ...context }) => notifyError(
       error,
@@ -969,7 +961,7 @@ function createCMSOperations(adapter, options) {
     additionalPermissions: ({ facts }) => [
       cmsPermissions.contentType.read({ contentType: facts.contentType })
     ],
-    execute: async ({ facts }) => {
+    execute: async ({ input, facts }) => {
       const item = await getRecordOrThrow(
         adapter,
         ensureSynced,
@@ -977,7 +969,11 @@ function createCMSOperations(adapter, options) {
         facts.recordId ?? ""
       );
       assertRecordFacts(item, facts);
-      return operationContentItem(serializeContentItemWithType(item));
+      validateOperationContentReadOptions(item.contentType, input);
+      return applyContentReadOptions(
+        operationContentItem(serializeContentItemWithType(item)),
+        input
+      );
     },
     onError: ({ error, ...context }) => notifyError(
       error,
@@ -1422,7 +1418,7 @@ function createCMSOperations(adapter, options) {
     }
   });
   const getContentItemPopulated = defineOperation({
-    input: GetContentItemInputSchema,
+    input: CMSContentItemParamsSchema,
     permission: cmsPermissions.record.read,
     facts: async ({ input }) => recordFacts(
       await getRecordOrThrow(adapter, ensureSynced, input.typeSlug, input.id)
@@ -1524,17 +1520,17 @@ function createCMSOperations(adapter, options) {
         input.query.field,
         input.query.targetId
       );
-      const result = await listRecordsForRelation(
+      validateOperationContentReadOptions(sourceContentType, input.query);
+      const result = await getContentItemsByRelationForType(
         adapter,
         sourceContentType,
-        input.query.field,
-        input.query.targetId,
-        input.query.limit,
-        input.query.offset
+        input.query
       );
       return {
         ...result,
-        items: result.items.map(operationContentItem)
+        items: result.items.map(
+          (item) => applyContentReadOptions(operationContentItem(item), input.query)
+        )
       };
     },
     onError: ({ error, ...context }) => notifyError(
@@ -1716,17 +1712,27 @@ function createCMSOperations(adapter, options) {
           input.slug,
           input.query.itemId
         );
-        const result = await listRecordsForRelation(
+        const sourceContentType = await getContentTypeOrThrow(
           adapter,
-          await getContentTypeOrThrow(adapter, ensureSynced, facts.contentType),
-          source.fieldName,
-          input.query.itemId,
-          input.query.limit,
-          input.query.offset
+          ensureSynced,
+          facts.contentType
+        );
+        validateOperationContentReadOptions(sourceContentType, input.query);
+        const result = await getContentItemsByRelationForType(
+          adapter,
+          sourceContentType,
+          {
+            field: source.fieldName,
+            targetId: input.query.itemId,
+            limit: input.query.limit,
+            offset: input.query.offset
+          }
         );
         return {
           ...result,
-          items: result.items.map(operationContentItem)
+          items: result.items.map(
+            (item) => applyContentReadOptions(operationContentItem(item), input.query)
+          )
         };
       } finally {
         inverseTargetAuthorizationSnapshots.delete(input);

package/dist/packages/stack/src/plugins/cms/api/plugin.cjs

@@ -114,13 +114,21 @@ const cmsBackendPlugin = (config) => {
         break;
       case "contentList": {
         const typeSlug = params?.typeSlug ?? "";
+        const options = schemas.createListContentQuerySchema(
+          config.maxPageSize
+        ).parse({
+          limit: params?.limit,
+          search: params?.search,
+          view: params?.view,
+          fields: params?.fields
+        });
         const [contentTypes, contentItems] = await Promise.all([
           getContentTypesWithCounts(adapter),
-          getters.getAllContentItems(adapter, typeSlug, { limit: 20, offset: 0 })
+          getters.getAllContentItems(adapter, typeSlug, options)
         ]);
         queryClient.setQueryData(queryKeyDefs.CMS_QUERY_KEYS.typesList(), contentTypes);
         queryClient.setQueryData(
-          queryKeyDefs.CMS_QUERY_KEYS.contentList({ typeSlug, limit: 20, offset: 0 }),
+          queryKeyDefs.CMS_QUERY_KEYS.contentList({ typeSlug, ...options }),
           {
             pages: [
               {
@@ -138,14 +146,18 @@ const cmsBackendPlugin = (config) => {
       case "editContent": {
         const typeSlug = params?.typeSlug ?? "";
         const id = params?.id ?? "";
+        const options = schemas.contentReadOptionsSchema.parse({
+          view: params?.view,
+          fields: params?.fields
+        });
         const [contentTypes, item] = await Promise.all([
           getContentTypesWithCounts(adapter),
-          id ? getters.getContentItemById(adapter, id) : Promise.resolve(null)
+          id ? getters.getContentItemById(adapter, id, options) : Promise.resolve(null)
         ]);
         queryClient.setQueryData(queryKeyDefs.CMS_QUERY_KEYS.typesList(), contentTypes);
         if (id) {
           queryClient.setQueryData(
-            queryKeyDefs.CMS_QUERY_KEYS.contentDetail(typeSlug, id),
+            queryKeyDefs.CMS_QUERY_KEYS.contentDetail(typeSlug, id, options),
             item
           );
         }
@@ -167,7 +179,9 @@ const cmsBackendPlugin = (config) => {
       prefetchForRoute: createCMSPrefetchForRoute(adapter)
     }),
     routes: (_adapter, _context, operations$1) => {
-      const listQuerySchema = schemas.createListContentQuerySchema(config.maxPageSize);
+      const listQuerySchema = schemas.createListContentQuerySchema(
+        config.maxPageSize
+      ).extend(schemas.contentReadQuerySchema.shape);
       const paginationSchema = z.z.object({
         limit: z.z.coerce.number().min(1).max(config.maxPageSize ?? schemas.DEFAULT_MAX_PAGE_SIZE).optional().default(20),
         offset: z.z.coerce.number().min(0).optional().default(0)
@@ -204,9 +218,13 @@ const cmsBackendPlugin = (config) => {
         {
           method: "GET",
           params: operations.CMSContentItemParamsSchema,
+          query: schemas.contentReadQuerySchema,
           requireRequest: true
         },
-        operations$1.getContentItem.route((ctx) => ctx.params)
+        operations$1.getContentItem.route((ctx) => ({
+          ...ctx.params,
+          ...ctx.query
+        }))
       );
       const createContentItem = api.createEndpoint(
         "/content/:typeSlug",
@@ -257,7 +275,7 @@ const cmsBackendPlugin = (config) => {
         {
           method: "GET",
           params: z.z.object({ typeSlug: z.z.string().min(1) }),
-          query: z.z.object({ field: z.z.string(), targetId: z.z.string() }).merge(paginationSchema),
+          query: z.z.object({ field: z.z.string(), targetId: z.z.string() }).merge(paginationSchema).merge(schemas.contentReadQuerySchema),
           requireRequest: true
         },
         operations$1.listContentByRelation.route((ctx) => ({
@@ -286,7 +304,7 @@ const cmsBackendPlugin = (config) => {
             slug: z.z.string().min(1),
             sourceType: z.z.string().min(1)
           }),
-          query: z.z.object({ itemId: z.z.string(), fieldName: z.z.string() }).merge(paginationSchema),
+          query: z.z.object({ itemId: z.z.string(), fieldName: z.z.string() }).merge(paginationSchema).merge(schemas.contentReadQuerySchema),
           requireRequest: true
         },
         operations$1.listInverseRelationItems.route((ctx) => ({

package/dist/packages/stack/src/plugins/cms/api/plugin.mjs

@@ -2,9 +2,9 @@ import { defineBackendPlugin, createEndpoint } from '@btst/stack/plugins/api';
 import { z } from 'zod';
 import { zodToFormSchema } from '../../../../../ui/src/lib/schema-converter.mjs';
 import { cmsSchema } from '../db.mjs';
-import { createListContentQuerySchema, DEFAULT_MAX_PAGE_SIZE } from '../schemas.mjs';
+import { createListContentQuerySchema, contentReadQuerySchema, DEFAULT_MAX_PAGE_SIZE, contentReadOptionsSchema } from '../schemas.mjs';
 import { getContentItemById, getAllContentItems, getAllContentTypes } from './getters.mjs';
-import { createCMSOperations, CMSContentTypeParamsSchema, CMSContentItemParamsSchema, CMSCreateContentItemBodySchema, CMSUpdateContentItemBodySchema } from './operations.mjs';
+import { CMSContentTypeParamsSchema, CMSContentItemParamsSchema, CMSCreateContentItemBodySchema, CMSUpdateContentItemBodySchema, createCMSOperations } from './operations.mjs';
 import { CMS_QUERY_KEYS } from './query-key-defs.mjs';
 
 function schemasEqual(stored, configured) {
@@ -112,13 +112,21 @@ const cmsBackendPlugin = (config) => {
         break;
       case "contentList": {
         const typeSlug = params?.typeSlug ?? "";
+        const options = createListContentQuerySchema(
+          config.maxPageSize
+        ).parse({
+          limit: params?.limit,
+          search: params?.search,
+          view: params?.view,
+          fields: params?.fields
+        });
         const [contentTypes, contentItems] = await Promise.all([
           getContentTypesWithCounts(adapter),
-          getAllContentItems(adapter, typeSlug, { limit: 20, offset: 0 })
+          getAllContentItems(adapter, typeSlug, options)
         ]);
         queryClient.setQueryData(CMS_QUERY_KEYS.typesList(), contentTypes);
         queryClient.setQueryData(
-          CMS_QUERY_KEYS.contentList({ typeSlug, limit: 20, offset: 0 }),
+          CMS_QUERY_KEYS.contentList({ typeSlug, ...options }),
           {
             pages: [
               {
@@ -136,14 +144,18 @@ const cmsBackendPlugin = (config) => {
       case "editContent": {
         const typeSlug = params?.typeSlug ?? "";
         const id = params?.id ?? "";
+        const options = contentReadOptionsSchema.parse({
+          view: params?.view,
+          fields: params?.fields
+        });
         const [contentTypes, item] = await Promise.all([
           getContentTypesWithCounts(adapter),
-          id ? getContentItemById(adapter, id) : Promise.resolve(null)
+          id ? getContentItemById(adapter, id, options) : Promise.resolve(null)
         ]);
         queryClient.setQueryData(CMS_QUERY_KEYS.typesList(), contentTypes);
         if (id) {
           queryClient.setQueryData(
-            CMS_QUERY_KEYS.contentDetail(typeSlug, id),
+            CMS_QUERY_KEYS.contentDetail(typeSlug, id, options),
             item
           );
         }
@@ -165,7 +177,9 @@ const cmsBackendPlugin = (config) => {
       prefetchForRoute: createCMSPrefetchForRoute(adapter)
     }),
     routes: (_adapter, _context, operations) => {
-      const listQuerySchema = createListContentQuerySchema(config.maxPageSize);
+      const listQuerySchema = createListContentQuerySchema(
+        config.maxPageSize
+      ).extend(contentReadQuerySchema.shape);
       const paginationSchema = z.object({
         limit: z.coerce.number().min(1).max(config.maxPageSize ?? DEFAULT_MAX_PAGE_SIZE).optional().default(20),
         offset: z.coerce.number().min(0).optional().default(0)
@@ -202,9 +216,13 @@ const cmsBackendPlugin = (config) => {
         {
           method: "GET",
           params: CMSContentItemParamsSchema,
+          query: contentReadQuerySchema,
           requireRequest: true
         },
-        operations.getContentItem.route((ctx) => ctx.params)
+        operations.getContentItem.route((ctx) => ({
+          ...ctx.params,
+          ...ctx.query
+        }))
       );
       const createContentItem = createEndpoint(
         "/content/:typeSlug",
@@ -255,7 +273,7 @@ const cmsBackendPlugin = (config) => {
         {
           method: "GET",
           params: z.object({ typeSlug: z.string().min(1) }),
-          query: z.object({ field: z.string(), targetId: z.string() }).merge(paginationSchema),
+          query: z.object({ field: z.string(), targetId: z.string() }).merge(paginationSchema).merge(contentReadQuerySchema),
           requireRequest: true
         },
         operations.listContentByRelation.route((ctx) => ({
@@ -284,7 +302,7 @@ const cmsBackendPlugin = (config) => {
             slug: z.string().min(1),
             sourceType: z.string().min(1)
           }),
-          query: z.object({ itemId: z.string(), fieldName: z.string() }).merge(paginationSchema),
+          query: z.object({ itemId: z.string(), fieldName: z.string() }).merge(paginationSchema).merge(contentReadQuerySchema),
           requireRequest: true
         },
         operations.listInverseRelationItems.route((ctx) => ({

package/dist/packages/stack/src/plugins/cms/api/query-key-defs.cjs

@@ -1,7 +1,19 @@
 'use strict';
 
+const schemas = require('../schemas.cjs');
+
+function contentReadDiscriminator(options) {
+  return {
+    ...options?.view ? { view: options.view } : {},
+    ...options?.fields !== void 0 ? { fields: schemas.normalizeContentFields(options.fields) } : {}
+  };
+}
+function contentReadKey(options) {
+  return options?.view || options?.fields !== void 0 ? [contentReadDiscriminator(options)] : [];
+}
 function contentListDiscriminator(params) {
   return {
+    ...contentReadDiscriminator(params),
     typeSlug: params.typeSlug,
     limit: params.limit ?? 20,
     offset: params.offset ?? 0,
@@ -23,8 +35,10 @@ const CMS_QUERY_KEYS = {
    * Key for the cmsContent.detail(typeSlug, id) query.
    * Full key: ["cmsContent", "detail", typeSlug, id]
    */
-  contentDetail: (typeSlug, id) => ["cmsContent", "detail", typeSlug, id]
+  contentDetail: (typeSlug, id, options) => ["cmsContent", "detail", typeSlug, id, ...contentReadKey(options)]
 };
 
 exports.CMS_QUERY_KEYS = CMS_QUERY_KEYS;
 exports.contentListDiscriminator = contentListDiscriminator;
+exports.contentReadDiscriminator = contentReadDiscriminator;
+exports.contentReadKey = contentReadKey;

package/dist/packages/stack/src/plugins/cms/api/query-key-defs.mjs

@@ -1,5 +1,17 @@
+import { normalizeContentFields } from '../schemas.mjs';
+
+function contentReadDiscriminator(options) {
+  return {
+    ...options?.view ? { view: options.view } : {},
+    ...options?.fields !== void 0 ? { fields: normalizeContentFields(options.fields) } : {}
+  };
+}
+function contentReadKey(options) {
+  return options?.view || options?.fields !== void 0 ? [contentReadDiscriminator(options)] : [];
+}
 function contentListDiscriminator(params) {
   return {
+    ...contentReadDiscriminator(params),
     typeSlug: params.typeSlug,
     limit: params.limit ?? 20,
     offset: params.offset ?? 0,
@@ -21,7 +33,7 @@ const CMS_QUERY_KEYS = {
    * Key for the cmsContent.detail(typeSlug, id) query.
    * Full key: ["cmsContent", "detail", typeSlug, id]
    */
-  contentDetail: (typeSlug, id) => ["cmsContent", "detail", typeSlug, id]
+  contentDetail: (typeSlug, id, options) => ["cmsContent", "detail", typeSlug, id, ...contentReadKey(options)]
 };
 
-export { CMS_QUERY_KEYS, contentListDiscriminator };
+export { CMS_QUERY_KEYS, contentListDiscriminator, contentReadDiscriminator, contentReadKey };

package/dist/packages/stack/src/plugins/cms/client/components/forms/content-form.cjs

@@ -260,7 +260,7 @@ function ContentForm({
     ] }),
     bannerMessage && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rounded-md border border-destructive/50 bg-destructive/10 p-3", children: /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm text-destructive", children: bannerMessage }) }),
     /* @__PURE__ */ jsxRuntime.jsx(
-      steppedAutoForm.default,
+      steppedAutoForm.SteppedAutoForm,
       {
         formSchema: zodSchema,
         values: formData,

package/dist/packages/stack/src/plugins/cms/client/components/forms/content-form.mjs

@@ -2,7 +2,7 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState, useMemo, useRef, useEffect } from 'react';
 import { z } from 'zod';
-import SteppedAutoForm from '../../../../../../../ui/src/components/auto-form/stepped-auto-form.mjs';
+import { SteppedAutoForm } from '../../../../../../../ui/src/components/auto-form/stepped-auto-form.mjs';
 import { buildFieldConfigFromJsonSchema as buildFieldConfigFromJsonSchema$1 } from '../../../../../../../ui/src/components/auto-form/helpers.mjs';
 import { formSchemaToZod } from '../../../../../../../ui/src/lib/schema-converter.mjs';
 import { Input } from '../../../../../../../ui/src/components/input.mjs';

package/dist/packages/stack/src/plugins/cms/client/hooks/cms-hooks.cjs

@@ -38,7 +38,7 @@ function useContentType(slug) {
   };
 }
 function useContent(typeSlug, options = {}) {
-  const { limit = 10, enabled = true, search } = options;
+  const { limit = 10, enabled = true, search, view, fields } = options;
   const {
     data,
     isLoading,
@@ -47,10 +47,15 @@ function useContent(typeSlug, options = {}) {
     hasNextPage,
     isFetchingNextPage,
     refetch
-  } = cmsResource.cms.cmsContent.list.useInfinite([{ typeSlug, limit, search }], {
-    enabled: enabled && !!typeSlug
-  });
-  const { items, total } = flattenPages(data?.pages);
+  } = cmsResource.cms.cmsContent.list.useInfinite(
+    [{ typeSlug, limit, search, view, fields }],
+    {
+      enabled: enabled && !!typeSlug
+    }
+  );
+  const { items, total } = flattenPages(
+    data?.pages
+  );
   return {
     items,
     total,
@@ -63,9 +68,13 @@ function useContent(typeSlug, options = {}) {
   };
 }
 function useSuspenseContent(typeSlug, options = {}) {
-  const { limit = 10, search } = options;
-  const { data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } = cmsResource.cms.cmsContent.list.useSuspenseInfinite([{ typeSlug, limit, search }]);
-  const { items, total } = flattenPages(data.pages);
+  const { limit = 10, search, view, fields } = options;
+  const { data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } = cmsResource.cms.cmsContent.list.useSuspenseInfinite([
+    { typeSlug, limit, search, view, fields }
+  ]);
+  const { items, total } = flattenPages(
+    data.pages
+  );
   return {
     items,
     total,
@@ -75,9 +84,9 @@ function useSuspenseContent(typeSlug, options = {}) {
     refetch
   };
 }
-function useContentItem(typeSlug, id) {
+function useContentItem(typeSlug, id, options) {
   const { data, isLoading, error, refetch } = cmsResource.cms.cmsContent.detail.use(
-    [typeSlug, id],
+    [typeSlug, id, options],
     { enabled: !!typeSlug && !!id }
   );
   return {
@@ -87,16 +96,20 @@ function useContentItem(typeSlug, id) {
     refetch
   };
 }
-function useSuspenseContentItem(typeSlug, id) {
-  const { data, refetch } = cmsResource.cms.cmsContent.detail.useSuspense([typeSlug, id]);
+function useSuspenseContentItem(typeSlug, id, options) {
+  const { data, refetch } = cmsResource.cms.cmsContent.detail.useSuspense([
+    typeSlug,
+    id,
+    options
+  ]);
   return {
     item: data ?? null,
     refetch
   };
 }
-function useContentItemBySlug(typeSlug, slug) {
+function useContentItemBySlug(typeSlug, slug, options) {
   const { data, isLoading, error, refetch } = cmsResource.cms.cmsContent.bySlug.use(
-    [typeSlug, slug],
+    [typeSlug, slug, options],
     { enabled: !!typeSlug && !!slug }
   );
   return {
@@ -151,14 +164,14 @@ function useContentItemForm(config) {
   );
 }
 function useContentOptions(config) {
-  const { targetType, value, getOptionLabel } = config;
+  const { targetType, value, getOptionLabel, view, fields } = config;
   return cmsResource.cms.cmsContent.useSelect({
     query: "options",
-    searchArgs: (search) => [{ typeSlug: targetType, search }],
+    searchArgs: (search) => [{ typeSlug: targetType, search, view, fields }],
     getOptionValue: (item) => item.id,
     getOptionLabel,
     value,
-    preload: { args: (id) => [targetType, id] },
+    preload: { args: (id) => [targetType, id, { view, fields }] },
     enabled: !!targetType
   });
 }
@@ -185,7 +198,7 @@ function useSuspenseContentItemPopulated(typeSlug, id) {
   };
 }
 function useContentByRelation(typeSlug, fieldName, targetId, options = {}) {
-  const { limit = 20, enabled = true } = options;
+  const { limit = 20, enabled = true, view, fields } = options;
   const {
     data,
     isLoading,
@@ -195,10 +208,12 @@ function useContentByRelation(typeSlug, fieldName, targetId, options = {}) {
     isFetchingNextPage,
     refetch
   } = cmsResource.cms.cmsContent.byRelation.useInfinite(
-    [{ typeSlug, field: fieldName, targetId, limit }],
+    [{ typeSlug, field: fieldName, targetId, limit, view, fields }],
     { enabled: enabled && !!typeSlug && !!fieldName && !!targetId }
   );
-  const { items, total } = flattenPages(data?.pages);
+  const { items, total } = flattenPages(
+    data?.pages
+  );
   return {
     items,
     total,
@@ -211,11 +226,13 @@ function useContentByRelation(typeSlug, fieldName, targetId, options = {}) {
   };
 }
 function useSuspenseContentByRelation(typeSlug, fieldName, targetId, options = {}) {
-  const { limit = 20 } = options;
+  const { limit = 20, view, fields } = options;
   const { data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } = cmsResource.cms.cmsContent.byRelation.useSuspenseInfinite([
-    { typeSlug, field: fieldName, targetId, limit }
+    { typeSlug, field: fieldName, targetId, limit, view, fields }
   ]);
-  const { items, total } = flattenPages(data.pages);
+  const { items, total } = flattenPages(
+    data.pages
+  );
   return {
     items,
     total,
@@ -244,7 +261,11 @@ function useInverseRelationItems(params, options = {}) {
         slug: params.contentTypeSlug,
         sourceType: params.sourceType,
         itemId: params.itemId,
-        fieldName: params.fieldName
+        fieldName: params.fieldName,
+        view: options.view,
+        fields: options.fields,
+        limit: options.limit,
+        offset: options.offset
       }
     ],
     { enabled: options.enabled ?? true }