opacacms 0.3.12 → 0.3.14

package/dist/{chunk-2fm4kv2q.js → chunk-nv91gc63.js}

@@ -16,9 +16,14 @@ class OpacaError extends Error {
   }
 }
 function createClient(configOrOptions) {
-  const options = configOrOptions.serverURL ? { baseURL: configOrOptions.serverURL } : configOrOptions;
+  const isConfig = configOrOptions.serverURL || configOrOptions.collections;
+  const options = isConfig ? {
+    baseURL: configOrOptions.serverURL || "http://localhost:3000",
+    token: configOrOptions.token,
+    api: configOrOptions.api
+  } : configOrOptions;
   const baseURL = options.baseURL.replace(/\/$/, "");
-  let engineConfig = null;
+  let engineConfig = options.api || null;
   let metadataCache = null;
   const getHeaders = () => {
     const headers = {
@@ -45,18 +50,20 @@ function createClient(configOrOptions) {
     return res.json();
   };
   const initConfig = async () => {
-    if (engineConfig && metadataCache)
+    if (engineConfig && engineConfig.graphql && metadataCache)
       return;
     try {
       const [setupRes, metadataRes] = await Promise.all([
         fetcher("/api/__admin/setup"),
         fetcher("/api/__admin/collections")
       ]);
-      engineConfig = setupRes.api || { rest: true, graphql: { enabled: false, path: "/graphql" } };
+      engineConfig = setupRes.api || engineConfig || { rest: true, graphql: { enabled: false, path: "/graphql" } };
       metadataCache = metadataRes;
     } catch (e) {
-      engineConfig = { rest: true, graphql: { enabled: false, path: "/graphql" } };
-      metadataCache = { collections: [], globals: [] };
+      const localCols = configOrOptions.collections || [];
+      const localGlobals = configOrOptions.globals || [];
+      engineConfig = engineConfig || { rest: true, graphql: { enabled: false, path: "/graphql" } };
+      metadataCache = { collections: localCols, globals: localGlobals };
     }
   };
   const buildSelectionSet = (fields) => {
@@ -86,7 +93,11 @@ function createClient(configOrOptions) {
       if (!engineConfig?.graphql?.enabled) {
         throw new OpacaError("GraphQL is not enabled on this server.", 400);
       }
-      return fetcher(engineConfig.graphql.path, {
+      let gqlPath = engineConfig.graphql.path || "/graphql";
+      if (!gqlPath.startsWith("/api") && !gqlPath.startsWith("http")) {
+        gqlPath = `/api${gqlPath.startsWith("/") ? "" : "/"}${gqlPath}`;
+      }
+      return fetcher(gqlPath, {
         method: "POST",
         body: JSON.stringify({ query, variables })
       });
@@ -96,7 +107,8 @@ function createClient(configOrOptions) {
         return {
           find: async (query) => {
             await initConfig();
-            if (engineConfig?.graphql?.enabled && !engineConfig?.rest) {
+            const isRestDisabled = engineConfig?.rest === false || engineConfig?.rest?.enabled === false;
+            if (engineConfig?.graphql?.enabled && isRestDisabled) {
               const selection = getSelectionSetForCollection(String(collectionSlug));
               const limit = query?.limit ? `limit: ${query.limit}` : "";
               const page = query?.page ? `page: ${query.page}` : "";
@@ -118,7 +130,8 @@ function createClient(configOrOptions) {
           },
           findOne: async (id) => {
             await initConfig();
-            if (engineConfig?.graphql?.enabled && !engineConfig?.rest) {
+            const isRestDisabled = engineConfig?.rest === false || engineConfig?.rest?.enabled === false;
+            if (engineConfig?.graphql?.enabled && isRestDisabled) {
               const selection = getSelectionSetForCollection(String(collectionSlug));
               const capitalizedSlug = capitalize(sanitizeGraphQLName(String(collectionSlug)));
               const res = await client.graphql(`query getDoc($id: String!) { get${capitalizedSlug}(id: $id) { ${selection} } }`, { id });
@@ -131,7 +144,8 @@ function createClient(configOrOptions) {
           },
           create: async (data) => {
             await initConfig();
-            if (engineConfig?.graphql?.enabled && !engineConfig?.rest) {
+            const isRestDisabled = engineConfig?.rest === false || engineConfig?.rest?.enabled === false;
+            if (engineConfig?.graphql?.enabled && isRestDisabled) {
               const selection = getSelectionSetForCollection(String(collectionSlug));
               const capitalizedSlug = capitalize(sanitizeGraphQLName(String(collectionSlug)));
               const res = await client.graphql(`mutation createDoc($data: JSON!) { create${capitalizedSlug}(data: $data) { ${selection} } }`, { data });
@@ -144,7 +158,8 @@ function createClient(configOrOptions) {
           },
           update: async (id, data) => {
             await initConfig();
-            if (engineConfig?.graphql?.enabled && !engineConfig?.rest) {
+            const isRestDisabled = engineConfig?.rest === false || engineConfig?.rest?.enabled === false;
+            if (engineConfig?.graphql?.enabled && isRestDisabled) {
               const selection = getSelectionSetForCollection(String(collectionSlug));
               const capitalizedSlug = capitalize(sanitizeGraphQLName(String(collectionSlug)));
               const res = await client.graphql(`mutation updateDoc($id: String!, $data: JSON!) { update${capitalizedSlug}(id: $id, data: $data) { ${selection} } }`, { id, data });
@@ -157,7 +172,8 @@ function createClient(configOrOptions) {
           },
           delete: async (id) => {
             await initConfig();
-            if (engineConfig?.graphql?.enabled && !engineConfig?.rest) {
+            const isRestDisabled = engineConfig?.rest === false || engineConfig?.rest?.enabled === false;
+            if (engineConfig?.graphql?.enabled && isRestDisabled) {
               const capitalizedSlug = capitalize(sanitizeGraphQLName(String(collectionSlug)));
               const res = await client.graphql(`mutation deleteDoc($id: String!) { delete${capitalizedSlug}(id: $id) }`, { id });
               return res.data[`delete${capitalizedSlug}`];
@@ -174,7 +190,8 @@ function createClient(configOrOptions) {
         return {
           get: async () => {
             await initConfig();
-            if (engineConfig?.graphql?.enabled && !engineConfig?.rest) {
+            const isRestDisabled = engineConfig?.rest === false || engineConfig?.rest?.enabled === false;
+            if (engineConfig?.graphql?.enabled && isRestDisabled) {
               const selection = getSelectionSetForGlobal(String(globalSlug));
               const capitalizedSlug = capitalize(sanitizeGraphQLName(String(globalSlug)));
               const res = await client.graphql(`query getGlobal { get${capitalizedSlug} { ${selection} } }`);
@@ -184,7 +201,8 @@ function createClient(configOrOptions) {
           },
           update: async (data) => {
             await initConfig();
-            if (engineConfig?.graphql?.enabled && !engineConfig?.rest) {
+            const isRestDisabled = engineConfig?.rest === false || engineConfig?.rest?.enabled === false;
+            if (engineConfig?.graphql?.enabled && isRestDisabled) {
               const selection = getSelectionSetForGlobal(String(globalSlug));
               const capitalizedSlug = capitalize(sanitizeGraphQLName(String(globalSlug)));
               const res = await client.graphql(`mutation updateGlobal($data: JSON!) { update${capitalizedSlug}(data: $data) { ${selection} } }`, { data });

package/dist/{chunk-xdmw9vzq.js → chunk-nz6xhtja.js}

@@ -125,6 +125,10 @@ class SQLiteAdapter extends BaseDatabaseAdapter {
           filteredData[col] = flatData[col];
         }
       }
+      if (!filteredData.id) {
+        filteredData.id = crypto.randomUUID();
+        flatData.id = filteredData.id;
+      }
       await tx.insertInto(tableName).values(filteredData).execute();
       for (const [key, values] of Object.entries(hasManyData)) {
         const joinTableName = `${tableName}_${toSnakeCase(key)}_relations`.toLowerCase();
@@ -340,6 +344,7 @@ class SQLiteAdapter extends BaseDatabaseAdapter {
       }
     }
     const totalPages = Math.ceil(total / limit);
+    const hasNextPage = page * limit < total;
     return {
       docs: docs.filter(Boolean),
       totalDocs: total,
@@ -347,11 +352,11 @@ class SQLiteAdapter extends BaseDatabaseAdapter {
       totalPages,
       page,
       pagingCounter: offset + 1,
-      hasNextPage: page * limit < total,
+      hasNextPage,
       hasPrevPage: page > 1 || !!options?.after || !!options?.before,
       prevPage: page > 1 ? page - 1 : null,
       nextPage: page < totalPages ? page + 1 : null,
-      nextCursor: docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
+      nextCursor: hasNextPage && docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
       prevCursor: docs.length > 0 && (page > 1 || !!options?.after || !!options?.before) ? docs[0][cursorColumn] : null
     };
   }

package/dist/{chunk-0njhbe4a.js → chunk-qsefknd3.js}

@@ -117,6 +117,10 @@ class BunSQLiteAdapter extends BaseDatabaseAdapter {
         filteredData[col] = flatData[col];
       }
     }
+    if (!filteredData.id) {
+      filteredData.id = crypto.randomUUID();
+      flatData.id = filteredData.id;
+    }
     await this.db.insertInto(tableName).values(filteredData).execute();
     for (const [key, values] of Object.entries(hasManyData)) {
       const joinTableName = `${tableName}_${toSnakeCase(key)}_relations`.toLowerCase();
@@ -331,6 +335,7 @@ class BunSQLiteAdapter extends BaseDatabaseAdapter {
       }
     }
     const totalPages = Math.ceil(total / limit);
+    const hasNextPage = page * limit < total;
     return {
       docs: docs.filter(Boolean),
       totalDocs: total,
@@ -338,11 +343,11 @@ class BunSQLiteAdapter extends BaseDatabaseAdapter {
       totalPages,
       page,
       pagingCounter: offset + 1,
-      hasNextPage: page * limit < total,
+      hasNextPage,
       hasPrevPage: page > 1 || !!options?.after || !!options?.before,
       prevPage: page > 1 ? page - 1 : null,
       nextPage: page < totalPages ? page + 1 : null,
-      nextCursor: docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
+      nextCursor: hasNextPage && docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
       prevCursor: docs.length > 0 && (page > 1 || !!options?.after || !!options?.before) ? docs[0][cursorColumn] : null
     };
   }

package/dist/{chunk-2ec9fsgr.js → chunk-tsmhn78f.js}

@@ -150,6 +150,9 @@ class PostgresAdapter extends BaseDatabaseAdapter {
           delete flatData[key];
         }
       }
+      if (!flatData.id) {
+        flatData.id = crypto.randomUUID();
+      }
       await tx.insertInto(tableName).values(flatData).execute();
       for (const [key, values] of Object.entries(hasManyData)) {
         const joinTableName = `${tableName}_${toSnakeCase(key)}_relations`.toLowerCase();
@@ -360,6 +363,7 @@ class PostgresAdapter extends BaseDatabaseAdapter {
       }
     }
     const totalPages = Math.ceil(total / limit);
+    const hasNextPage = page * limit < total;
     return {
       docs: docs.filter(Boolean),
       totalDocs: total,
@@ -367,11 +371,11 @@ class PostgresAdapter extends BaseDatabaseAdapter {
       totalPages,
       page,
       pagingCounter: offset + 1,
-      hasNextPage: page * limit < total,
+      hasNextPage,
       hasPrevPage: page > 1 || !!options?.after || !!options?.before,
       prevPage: page > 1 ? page - 1 : null,
       nextPage: page < totalPages ? page + 1 : null,
-      nextCursor: docs.length > 0 ? docs[docs.length - 1][cursorColumn] : null,
+      nextCursor: docs.length > 0 && hasNextPage ? docs[docs.length - 1][cursorColumn] : null,
       prevCursor: docs.length > 0 && (page > 1 || !!options?.after || !!options?.before) ? docs[0][cursorColumn] : null
     };
   }

package/dist/client.d.ts

@@ -1,8 +1,85 @@
-import type { OpacaConfig } from "./types";
 export interface OpacaClientOptions {
     baseURL: string;
     token?: string;
+    api?: any;
 }
+export interface OpacaAsset {
+    id: string;
+    url: string;
+    filename: string;
+    mime_type: string;
+    filesize: number;
+    alt_text?: string;
+    caption?: string;
+    [key: string]: any;
+}
+/**
+ * Utility types for automatic type inference from OpacaConfig
+ */
+type MapFieldToType<F> = F extends {
+    type: "text" | "textarea" | "richtext" | "slug" | "date" | "select" | "radio";
+} ? string : F extends {
+    type: "number";
+} ? number : F extends {
+    type: "boolean";
+} ? boolean : F extends {
+    type: "json";
+} ? any : F extends {
+    type: "file";
+} ? OpacaAsset : F extends {
+    type: "relationship";
+} ? F extends {
+    hasMany: true;
+} ? any[] : any : F extends {
+    type: "array";
+    fields: infer Fs;
+} ? Fs extends readonly any[] ? MapFieldsToType<Fs>[] : any[] : F extends {
+    type: "group";
+    fields: infer Fs;
+} ? Fs extends readonly any[] ? MapFieldsToType<Fs> : any : F extends {
+    type: "blocks";
+    blocks: infer Bs;
+} ? Bs extends readonly any[] ? MapBlocksToType<Bs>[] : any[] : any;
+type MapBlocksToType<Bs extends readonly any[]> = Bs[number] extends infer B ? B extends {
+    slug: infer S;
+    fields: infer Fs;
+} ? S extends string ? Fs extends readonly any[] ? MapFieldsToType<Fs> & {
+    blockType: S;
+} : never : never : never : never;
+type MapFieldsToType<Fs extends readonly any[]> = {
+    [K in Extract<Fs[number], {
+        required: true;
+    }> as K["name"]]: MapFieldToType<K>;
+} & {
+    [K in Fs[number] as K["required"] extends true ? never : K["name"]]?: MapFieldToType<K>;
+};
+type InferCollectionType<C> = C extends {
+    __type: infer T;
+} ? T : C extends {
+    fields: infer Fs;
+    timestamps?: infer T;
+} ? (Fs extends readonly any[] ? MapFieldsToType<Fs> : any) & (T extends true | {
+    createdAt?: any;
+    updatedAt?: any;
+} ? {
+    createdAt: string;
+    updatedAt: string;
+} : {}) : any;
+type InferGlobalType<G> = G extends {
+    __type: infer T;
+} ? T : G extends {
+    fields: infer Fs;
+} ? Fs extends readonly any[] ? MapFieldsToType<Fs> : any : any;
+type InferCollections<T> = T extends {
+    collections: infer C;
+} ? C extends readonly any[] ? {
+    [K in C[number] as K["slug"]]: InferCollectionType<K>;
+} : Record<string, any> : Record<string, any>;
+type InferGlobals<T> = T extends {
+    globals: infer G;
+} ? G extends readonly any[] ? {
+    [K in G[number] as K["slug"]]: InferGlobalType<K>;
+} : Record<string, any> : Record<string, any>;
 /**
  * A proxy-based client that provides a typed experience for interacting with the OpacaCMS API.
  */
@@ -24,28 +101,29 @@ export declare function createClient<T = any>(configOrOptions: T | OpacaClientOp
     getSetupStatus: () => Promise<{
         initialized: boolean;
     }>;
-    collections: { [K in T extends OpacaConfig<string> ? T["collections"] extends any[] ? T["collections"][number]["slug"] : string : T extends GeneratedTypes ? keyof T["collections"] : string]: {
+    collections: { [K in (keyof InferCollections<T> extends never ? string : keyof InferCollections<T>) & string]: {
         find: (query?: any) => Promise<{
-            docs: (T extends GeneratedTypes ? K extends keyof T["collections"] ? T["collections"][K] : any : any)[];
+            docs: K extends keyof InferCollections<T> ? InferCollections<T>[K][] : any[];
             totalDocs: number;
             page: number;
             totalPages: number;
         }>;
-        findOne: (id: string) => Promise<T extends GeneratedTypes ? K extends keyof T["collections"] ? T["collections"][K] : any : any>;
+        findOne: (id: string) => Promise<K extends keyof InferCollections<T> ? InferCollections<T>[K] : any>;
         list: () => Promise<{
-            docs: (T extends GeneratedTypes ? K extends keyof T["collections"] ? T["collections"][K] : any : any)[];
+            docs: K extends keyof InferCollections<T> ? InferCollections<T>[K][] : any[];
             totalDocs: number;
             page: number;
             totalPages: number;
         }>;
-        create: (data: Partial<T extends GeneratedTypes ? K extends keyof T["collections"] ? T["collections"][K] : any : any>) => Promise<T extends GeneratedTypes ? K extends keyof T["collections"] ? T["collections"][K] : any : any>;
-        update: (id: string, data: Partial<T extends GeneratedTypes ? K extends keyof T["collections"] ? T["collections"][K] : any : any>) => Promise<T extends GeneratedTypes ? K extends keyof T["collections"] ? T["collections"][K] : any : any>;
+        create: (data: Partial<K extends keyof InferCollections<T> ? InferCollections<T>[K] : any>) => Promise<K extends keyof InferCollections<T> ? InferCollections<T>[K] : any>;
+        update: (id: string, data: Partial<K extends keyof InferCollections<T> ? InferCollections<T>[K] : any>) => Promise<K extends keyof InferCollections<T> ? InferCollections<T>[K] : any>;
         delete: (id: string) => Promise<{
             success: boolean;
         }>;
     }; };
-    globals: { [K in T extends OpacaConfig<string> ? T["globals"] extends any[] ? T["globals"][number]["slug"] : string : T extends GeneratedTypes ? keyof T["globals"] : string]: {
-        get: () => Promise<T extends GeneratedTypes ? K extends keyof T["globals"] ? T["globals"][K] : any : any>;
-        update: (data: Partial<T extends GeneratedTypes ? K extends keyof T["globals"] ? T["globals"][K] : any : any>) => Promise<T extends GeneratedTypes ? K extends keyof T["globals"] ? T["globals"][K] : any : any>;
+    globals: { [K in (keyof InferGlobals<T> extends never ? string : keyof InferGlobals<T>) & string]: {
+        get: () => Promise<K extends keyof InferGlobals<T> ? InferGlobals<T>[K] : any>;
+        update: (data: Partial<K extends keyof InferGlobals<T> ? InferGlobals<T>[K] : any>) => Promise<any>;
     }; };
 };
+export {};

package/dist/client.js

@@ -1,7 +1,7 @@
 import {
   OpacaError,
   createClient
-} from "./chunk-2fm4kv2q.js";
+} from "./chunk-nv91gc63.js";
 import"./chunk-2vbfc4q8.js";
 import"./chunk-8sqjbsgt.js";
 export {

package/dist/config.d.ts

@@ -23,5 +23,12 @@ export declare function defineConfig<const TCollections extends readonly Buildab
 }>[] = [], TResource extends string = ResourceOf<TCollections, TGlobals>>(config: Omit<OpacaConfig<TResource>, "collections" | "globals"> & {
     collections: TCollections;
     globals?: TGlobals;
-}): OpacaConfig<TResource>;
+}): Omit<OpacaConfig<TResource>, "collections" | "globals"> & {
+    collections: {
+        [K in keyof TCollections]: BuiltResource<TCollections[K]>;
+    };
+    globals: {
+        [K in keyof TGlobals]: BuiltResource<TGlobals[K]>;
+    };
+};
 export {};

package/dist/db/better-sqlite.js

@@ -1,7 +1,7 @@
 import {
   BetterSQLiteAdapter,
   createBetterSQLiteAdapter
-} from "../chunk-1vtdkx5e.js";
+} from "../chunk-dz5bh1bd.js";
 import"../chunk-re459gm9.js";
 import"../chunk-s8mqwnm1.js";
 import"../chunk-q5sb5dcr.js";

package/dist/db/bun-sqlite.js

@@ -1,7 +1,7 @@
 import {
   BunSQLiteAdapter,
   createBunSQLiteAdapter
-} from "../chunk-0njhbe4a.js";
+} from "../chunk-qsefknd3.js";
 import"../chunk-re459gm9.js";
 import"../chunk-s8mqwnm1.js";
 import"../chunk-q5sb5dcr.js";

package/dist/db/d1.js

@@ -1,7 +1,7 @@
 import {
   D1Adapter,
   createD1Adapter
-} from "../chunk-8hhzvesq.js";
+} from "../chunk-5b9eqr34.js";
 import"../chunk-re459gm9.js";
 import"../chunk-s8mqwnm1.js";
 import"../chunk-q5sb5dcr.js";

package/dist/db/index.js

@@ -1,23 +1,23 @@
 import {
   D1Adapter,
   createD1Adapter
-} from "../chunk-8hhzvesq.js";
+} from "../chunk-5b9eqr34.js";
 import {
   PostgresAdapter,
   createPostgresAdapter
-} from "../chunk-2ec9fsgr.js";
+} from "../chunk-tsmhn78f.js";
 import {
   SQLiteAdapter,
   createSQLiteAdapter
-} from "../chunk-xdmw9vzq.js";
+} from "../chunk-nz6xhtja.js";
 import {
   BunSQLiteAdapter,
   createBunSQLiteAdapter
-} from "../chunk-0njhbe4a.js";
+} from "../chunk-qsefknd3.js";
 import {
   BetterSQLiteAdapter,
   createBetterSQLiteAdapter
-} from "../chunk-1vtdkx5e.js";
+} from "../chunk-dz5bh1bd.js";
 import"../chunk-re459gm9.js";
 import {
   BaseDatabaseAdapter

package/dist/db/postgres.js

@@ -1,7 +1,7 @@
 import {
   PostgresAdapter,
   createPostgresAdapter
-} from "../chunk-2ec9fsgr.js";
+} from "../chunk-tsmhn78f.js";
 import"../chunk-re459gm9.js";
 import"../chunk-s8mqwnm1.js";
 import"../chunk-q5sb5dcr.js";

package/dist/db/sqlite.js

@@ -1,7 +1,7 @@
 import {
   SQLiteAdapter,
   createSQLiteAdapter
-} from "../chunk-xdmw9vzq.js";
+} from "../chunk-nz6xhtja.js";
 import"../chunk-re459gm9.js";
 import"../chunk-s8mqwnm1.js";
 import"../chunk-q5sb5dcr.js";

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   OpacaError,
   createClient
-} from "./chunk-2fm4kv2q.js";
+} from "./chunk-nv91gc63.js";
 import {
   defineCollection,
   defineGlobal

package/dist/schema/collection.d.ts

@@ -1,8 +1,8 @@
 import type { Faker } from "@faker-js/faker";
 import type { AccessConfig, CollectionHooks, LucideIcons } from "@/types";
 import { type ZodObject, type ZodRawShape, type infer as zInfer } from "./zod";
-export interface CollectionConfig<T = any> {
-    slug: string;
+export interface CollectionConfig<T = any, S extends string = string> {
+    slug: S;
     label?: string;
     admin?: {
         useAsTitle?: string;
@@ -58,19 +58,19 @@ export interface CollectionConfig<T = any> {
      */
     seed?: (faker: Faker) => Partial<T> | Promise<Partial<T>>;
 }
-export interface DefineCollectionArgs<T extends ZodRawShape> extends CollectionConfig<zInfer<ZodObject<T>>> {
+export interface DefineCollectionArgs<T extends ZodRawShape, S extends string> extends CollectionConfig<zInfer<ZodObject<T>>, S> {
     schema: ZodObject<T>;
 }
 /**
  * Replaces the legacy Collection.create() Builder API.
  * Wraps a Zod Schema and attaches collection-level metadata to it.
  */
-export declare function defineCollection<T extends ZodRawShape>(config: DefineCollectionArgs<T>): {
+export declare function defineCollection<T extends ZodRawShape, S extends string>(config: DefineCollectionArgs<T, S>): {
     schema: ZodObject<T, import("better-auth").$strip>;
     fields: any[];
     seed: ((faker: Faker) => Partial<import("better-auth").$InferObjectOutput<T, {}>> | Promise<Partial<import("better-auth").$InferObjectOutput<T, {}>>>) | undefined;
     __type: zInfer<ZodObject<T, import("better-auth").$strip>>;
-    slug: string;
+    slug: S;
     label?: string;
     admin?: {
         useAsTitle?: string;

package/dist/schema/global.d.ts

@@ -1,7 +1,7 @@
 import type { Faker } from "@faker-js/faker";
 import { type ZodObject, type ZodRawShape, type infer as zInfer } from "./zod";
-export interface GlobalConfig {
-    slug: string;
+export interface GlobalConfig<S extends string = string> {
+    slug: S;
     label?: string;
     admin?: {
         hidden?: boolean;
@@ -19,18 +19,18 @@ export interface GlobalConfig {
      */
     seed?: (faker: Faker) => any | Promise<any>;
 }
-export interface DefineGlobalArgs<T extends ZodRawShape> extends GlobalConfig {
+export interface DefineGlobalArgs<T extends ZodRawShape, S extends string> extends GlobalConfig<S> {
     schema: ZodObject<T>;
 }
 /**
  * Zod-based replacement for the legacy GlobalBuilder.
  */
-export declare function defineGlobal<T extends ZodRawShape>(config: DefineGlobalArgs<T>): {
+export declare function defineGlobal<T extends ZodRawShape, S extends string>(config: DefineGlobalArgs<T, S>): {
     schema: ZodObject<T, import("better-auth").$strip>;
     fields: any[];
     seed: ((faker: Faker) => any | Promise<any>) | undefined;
     __type: zInfer<ZodObject<T, import("better-auth").$strip>>;
-    slug: string;
+    slug: S;
     label?: string;
     admin?: {
         hidden?: boolean;

package/dist/types/access.d.ts

@@ -0,0 +1,30 @@
+import type { Context } from "hono";
+export interface AccessArgs {
+    req: Context;
+    user: any;
+    session: any;
+    apiKey: any;
+    /** The document being created/updated or the search query */
+    data?: any;
+    /** The ID of the document being read/updated/deleted */
+    id?: string;
+    operation: "read" | "create" | "update" | "delete";
+}
+export interface AccessConfig {
+    read?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
+    create?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
+    update?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
+    delete?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
+    requireApiKey?: boolean;
+}
+export interface FieldAccessArgs extends AccessArgs {
+    field: string;
+}
+export interface FieldAccessConfig {
+    /** If true, the field is removed from API and UI. */
+    hidden?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
+    /** If true, the data is shown but cannot be edited. */
+    readOnly?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
+    /** If true, the input is visually disabled. */
+    disabled?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
+}

package/dist/types.d.ts

@@ -4,6 +4,8 @@ import type { Context } from "hono";
 import type { icons } from "lucide-react";
 import type { z } from "zod";
 import type { AdminConfig, FieldType } from "./validation";
+import type { AccessArgs, AccessConfig, FieldAccessArgs, FieldAccessConfig } from "./types/access";
+export type { AccessArgs, AccessConfig, FieldAccessArgs, FieldAccessConfig };
 export type { FieldType };
 export type Session = BetterAuthSession;
 export type User = Prettify<BetterAuthUser & {
@@ -273,15 +275,6 @@ export interface ApiKey {
     permissions?: Record<string, string[]> | null;
     referenceId: string;
 }
-export interface AccessArgs {
-    req: Context;
-    user: User | null;
-    session: Session | null;
-    apiKey?: ApiKey | null;
-    data?: any;
-    id?: string;
-    operation: "read" | "create" | "update" | "delete";
-}
 export interface CollectionHookArgs<T = any> {
     req: Context;
     user: User | null;
@@ -293,21 +286,6 @@ export interface CollectionHookArgs<T = any> {
     id?: string;
     operation: "create" | "update" | "delete";
 }
-export interface FieldAccessConfig {
-    /** If true, the field is removed from API and UI. */
-    hidden?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
-    /** If true, the data is shown but cannot be edited. */
-    readOnly?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
-    /** If true, the input is visually disabled. */
-    disabled?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
-}
-export interface AccessConfig {
-    read?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
-    create?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
-    update?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
-    delete?: boolean | ((args: AccessArgs) => boolean | Promise<boolean>);
-    requireApiKey?: boolean;
-}
 export interface CollectionHooks<T = any> {
     beforeCreate?: (args: CollectionHookArgs<T>) => T | Promise<T> | void;
     afterCreate?: (args: CollectionHookArgs<T>) => void | Promise<void>;

package/dist/validation.d.ts

@@ -3,22 +3,22 @@ export declare const FieldTypeSchema: z.ZodEnum<{
     number: "number";
     boolean: "boolean";
     text: "text";
-    json: "json";
-    join: "join";
-    slug: "slug";
     textarea: "textarea";
     richtext: "richtext";
-    relationship: "relationship";
+    slug: "slug";
+    date: "date";
     select: "select";
     radio: "radio";
-    date: "date";
+    json: "json";
     file: "file";
-    blocks: "blocks";
+    relationship: "relationship";
+    array: "array";
     group: "group";
+    blocks: "blocks";
+    join: "join";
     row: "row";
     collapsible: "collapsible";
     tabs: "tabs";
-    array: "array";
     virtual: "virtual";
     ui: "ui";
 }>;