opacacms 0.3.12 → 0.3.13

package/dist/admin/ui/components/ui/button.d.ts

@@ -2,7 +2,7 @@ import { type VariantProps } from "class-variance-authority";
 import type * as React from "react";
 import "../../styles/button.scss";
 declare const buttonVariants: (props?: ({
-    variant?: "default" | "link" | "destructive" | "outline" | "secondary" | "ghost" | null | undefined;
+    variant?: "link" | "default" | "destructive" | "outline" | "secondary" | "ghost" | null | undefined;
     size?: "default" | "icon" | "sm" | "lg" | "icon-sm" | "icon-xs" | "icon-lg" | "xs" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 declare function Button({ className, variant, size, asChild, ...props }: React.ComponentProps<"button"> & VariantProps<typeof buttonVariants> & {

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

@@ -96,7 +96,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 +119,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 +133,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 +147,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 +161,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 +179,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 +190,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/client.d.ts

@@ -1,8 +1,80 @@
-import type { OpacaConfig } from "./types";
 export interface OpacaClientOptions {
     baseURL: string;
     token?: string;
 }
+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 {
+    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 {
+    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 +96,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-gj8w1r1e.js";
 import"./chunk-2vbfc4q8.js";
 import"./chunk-8sqjbsgt.js";
 export {

package/dist/index.js

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

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";
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opacacms",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "license": "MIT",
   "description": "OpacaCMS: A lightweight, type-safe, and developer-first Headless CMS for the edge and beyond.",
   "keywords": [