@dyrected/sdk 2.5.40 → 2.5.41

package/dist/index.cjs

@@ -73,7 +73,8 @@ var QueryBuilder = class {
   executor;
   args = {};
   where(where) {
-    this.args.where = { ...this.args.where, ...where };
+    const currentWhere = this.args.where;
+    this.args.where = currentWhere && typeof currentWhere === "object" ? { ...currentWhere, ...where } : { ...where };
     return this;
   }
   sort(sort) {
@@ -165,6 +166,15 @@ var DyrectedClient = class {
   async getSchemas() {
     return this.request("/api/schemas");
   }
+  async getAdminAuthConfig() {
+    return this.request("/api/admin/auth/providers");
+  }
+  async exchangeAdminAuth(providerId, body) {
+    return this.request(`/api/admin/auth/${providerId}/exchange`, {
+      method: "POST",
+      body: JSON.stringify(body)
+    });
+  }
   async getPreference(key, options) {
     const scopeParam = options?.scope ? `?scope=${options.scope}` : "";
     return this.request(`/api/preferences/${encodeURIComponent(key)}${scopeParam}`);
@@ -192,8 +202,8 @@ var DyrectedClient = class {
   async find(collection, args = {}) {
     const { initialData, ...queryArgs } = args;
     const normalizedArgs = { ...queryArgs };
-    if (normalizedArgs.where && typeof normalizedArgs.where === "object") {
-      normalizedArgs.where = JSON.stringify(normalizedArgs.where);
+    if (queryArgs.where && typeof queryArgs.where === "object") {
+      normalizedArgs.where = JSON.stringify(queryArgs.where);
     }
     const query = stringifyQuery(normalizedArgs, { addQueryPrefix: true });
     const res = await this.request(`/api/collections/${collection}${query}`);
@@ -220,9 +230,12 @@ var DyrectedClient = class {
   collection(slug) {
     return {
       find: (args) => {
-        const qb = new QueryBuilder(slug, (c, a) => this.find(c, a));
+        const qb = new QueryBuilder(
+          slug,
+          (collectionName, queryArgs) => this.find(collectionName, queryArgs)
+        );
         if (args) {
-          if (args.where) qb.where(args.where);
+          if (args.where && typeof args.where === "object") qb.where(args.where);
           if (args.sort) qb.sort(args.sort);
           if (args.limit) qb.limit(args.limit);
           if (args.page) qb.page(args.page);
@@ -446,7 +459,8 @@ var DyrectedClient = class {
     });
   }
   async listMedia(args = {}, collection = "media") {
-    return this.find(collection, args);
+    const query = stringifyQuery(normalizeQueryArgs(args), { addQueryPrefix: true });
+    return this.request(`/api/collections/${collection}${query}`);
   }
   /** @deprecated Use client.collection('media').upload(file, data) instead */
   async uploadMedia(file, collection = "media") {
@@ -466,10 +480,7 @@ var DyrectedClient = class {
     const { "Content-Type": _, ...headers } = this.headers;
     return this.request(`/api/collections/${collection}`, {
       method: "POST",
-      headers: {
-        ...headers,
-        "Content-Type": void 0
-      },
+      headers,
       body: formData
     });
   }
@@ -478,15 +489,7 @@ var DyrectedClient = class {
   }
   async request(path, init) {
     const url = `${this.baseUrl}${path}`;
-    const allHeaders = {
-      ...this.headers,
-      ...init?.headers
-    };
-    Object.keys(allHeaders).forEach((key) => {
-      if (allHeaders[key] === void 0) {
-        delete allHeaders[key];
-      }
-    });
+    const allHeaders = mergeHeaders(this.headers, init?.headers);
     const res = await this.fetch(url, {
       ...init,
       headers: allHeaders
@@ -525,6 +528,32 @@ function isFunctionallyEmpty(obj) {
   }
   return false;
 }
+function mergeHeaders(baseHeaders, overrideHeaders) {
+  const merged = new Headers(baseHeaders);
+  if (overrideHeaders instanceof Headers) {
+    overrideHeaders.forEach((value, key) => merged.set(key, value));
+  } else if (Array.isArray(overrideHeaders)) {
+    for (const [key, value] of overrideHeaders) {
+      merged.set(key, value);
+    }
+  } else if (overrideHeaders) {
+    for (const [key, value] of Object.entries(overrideHeaders)) {
+      if (value === void 0) {
+        merged.delete(key);
+      } else {
+        merged.set(key, String(value));
+      }
+    }
+  }
+  return Object.fromEntries(merged.entries());
+}
+function normalizeQueryArgs(args) {
+  const normalizedArgs = { ...args };
+  if (args.where && typeof args.where === "object") {
+    normalizedArgs.where = JSON.stringify(args.where);
+  }
+  return normalizedArgs;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DyrectedClient,

package/dist/index.d.cts

@@ -1,29 +1,38 @@
-import { PaginatedResult, WorkflowMetadata, FileData, CollectionConfig, GlobalConfig } from '@dyrected/core';
-export { AdminIconName, Block, CollectionConfig, Field, FieldType, GlobalConfig, LifecycleEvent, FileData as Media, PaginatedResult, WorkflowMetadata } from '@dyrected/core';
+import { PaginatedResult, CollectionConfig, GlobalConfig, AdminConfig, PublicAdminAuthConfig, FileData, WorkflowMetadata } from '@dyrected/core';
+export { AdminIconName, Block, CollectionConfig, EmailField, Field, FieldType, GlobalConfig, IconField, LifecycleEvent, FileData as Media, NumberField, PaginatedResult, TextField, TextareaField, UrlField, WorkflowMetadata } from '@dyrected/core';
 
-interface QueryArgs {
+type UnknownRecord$1 = Record<string, unknown>;
+interface QueryArgs<TDoc = UnknownRecord$1> {
     limit?: number;
     page?: number;
     depth?: number;
-    where?: any;
+    where?: UnknownRecord$1 | string;
     sort?: string;
-    initialData?: any[];
+    initialData?: TDoc[];
 }
-declare class QueryBuilder<T = any> {
+declare class QueryBuilder<T = UnknownRecord$1> {
     private collection;
     private executor;
     private args;
-    constructor(collection: string, executor: (collection: string, args: QueryArgs) => Promise<PaginatedResult<T>>);
-    where(where: any): this;
+    constructor(collection: string, executor: (collection: string, args: QueryArgs<T>) => Promise<PaginatedResult<T>>);
+    where(where: UnknownRecord$1): this;
     sort(sort: string): this;
     limit(limit: number): this;
     page(page: number): this;
     depth(depth: number): this;
     seed(data: T[]): this;
     exec(): Promise<PaginatedResult<T>>;
-    then<TResult1 = PaginatedResult<T>, TResult2 = never>(onfulfilled?: ((value: PaginatedResult<T>) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
+    then<TResult1 = PaginatedResult<T>, TResult2 = never>(onfulfilled?: ((value: PaginatedResult<T>) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
 }
 
+type UnknownRecord = Record<string, unknown>;
+type SchemaResponse = {
+    collections: CollectionConfig[];
+    globals: GlobalConfig[];
+    admin?: AdminConfig;
+    adminAuth?: PublicAdminAuthConfig;
+};
+
 /** Shape of a document returned from a workflow-enabled collection. */
 interface WorkflowDocument {
     id: string;
@@ -82,7 +91,7 @@ type ExtractDoc<T> = T extends CollectionConfig<infer TDoc> ? TDoc : T extends G
  * // client.global('settings').get()  → { siteName?: string; ... }
  * ```
  */
-type InferSchema<TCollections extends Record<string, CollectionConfig<any>>, TGlobals extends Record<string, GlobalConfig<any>> = Record<never, never>> = {
+type InferSchema<TCollections extends Record<string, CollectionConfig<UnknownRecord>>, TGlobals extends Record<string, GlobalConfig<UnknownRecord>> = Record<never, never>> = {
     collections: {
         [K in keyof TCollections]: ExtractDoc<TCollections[K]>;
     };
@@ -114,10 +123,10 @@ interface DyrectedClientConfig {
     defaultDepth?: number;
 }
 interface BaseSchema {
-    collections: Record<string, any>;
-    globals: Record<string, any>;
+    collections: Record<string, UnknownRecord>;
+    globals: Record<string, UnknownRecord>;
 }
-declare class DyrectedClient<TSchema extends BaseSchema = any> {
+declare class DyrectedClient<TSchema extends BaseSchema = BaseSchema> {
     private baseUrl;
     private headers;
     private fetch;
@@ -140,9 +149,12 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
      */
     getAuthHeaders(): Record<string, string>;
     getBaseUrl(): string;
-    getSchemas(): Promise<{
-        collections: any[];
-        globals: any[];
+    getSchemas(): Promise<SchemaResponse>;
+    getAdminAuthConfig(): Promise<PublicAdminAuthConfig>;
+    exchangeAdminAuth(providerId: string, body: Record<string, unknown>): Promise<{
+        token: string;
+        collectionSlug: string;
+        providerId: string;
     }>;
     getPreference<T = unknown>(key: string, options?: {
         scope?: "personal" | "global";
@@ -165,19 +177,19 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
      * Fetch draft data for a specific preview token.
      * Used in "token" preview mode.
      */
-    getPreviewData(token: string): Promise<any>;
-    find<K extends keyof TSchema["collections"]>(collection: K & string, args?: QueryArgs): Promise<PaginatedResult<TSchema["collections"][K]>>;
+    getPreviewData<T = unknown>(token: string): Promise<T>;
+    find<K extends keyof TSchema["collections"]>(collection: K & string, args?: QueryArgs<TSchema["collections"][K]>): Promise<PaginatedResult<TSchema["collections"][K]>>;
     /**
      * Returns a fluent query builder for a collection.
      */
     collection<K extends keyof TSchema["collections"]>(slug: K & string): {
-        find: (args?: QueryArgs) => QueryBuilder<TSchema["collections"][K]>;
+        find: (args?: QueryArgs<TSchema["collections"][K]>) => QueryBuilder<TSchema["collections"][K]>;
         findOne: (id: string, args?: {
             depth?: number;
             initialData?: TSchema["collections"][K];
         }) => Promise<TSchema["collections"][K]>;
-        create: (data: any) => Promise<TSchema["collections"][K]>;
-        update: (id: string, data: any) => Promise<TSchema["collections"][K]>;
+        create: (data: Partial<TSchema["collections"][K]>) => Promise<TSchema["collections"][K]>;
+        update: (id: string, data: Partial<TSchema["collections"][K]>) => Promise<TSchema["collections"][K]>;
         delete: (id: string) => Promise<{
             message: string;
         }>;
@@ -189,7 +201,7 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
          * @param file - A File or Blob (browser) or Buffer with filename/mimeType (Node.js)
          * @param data - Additional metadata fields to save alongside the file (e.g. alt, caption)
          */
-        upload: (file: File | Blob, data?: Record<string, string>) => Promise<any>;
+        upload: (file: File | Blob, data?: Record<string, string>) => Promise<FileData>;
         /**
          * Log in with email + password. Returns a JWT token and the user document.
          * Call `client.setToken(token)` afterwards to authenticate subsequent requests.
@@ -213,7 +225,7 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
             initialized: boolean;
         }>;
         /** Register the very first user in an empty auth collection. */
-        registerFirstUser: (data: any) => Promise<{
+        registerFirstUser: (data: UnknownRecord) => Promise<{
             token: string;
             user: TSchema["collections"][K];
         }>;
@@ -223,7 +235,7 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
             message: string;
         }>;
         /** Accept an invitation and create an account. Returns token + user. */
-        acceptInvite: (token: string, password: string, extraFields?: Record<string, any>) => Promise<{
+        acceptInvite: (token: string, password: string, extraFields?: UnknownRecord) => Promise<{
             token: string;
             user: TSchema["collections"][K];
         }>;
@@ -295,14 +307,14 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
             depth?: number;
             initialData?: TSchema["globals"][K];
         }) => Promise<TSchema["globals"][K]>;
-        update: (data: any) => Promise<TSchema["globals"][K]>;
+        update: (data: Partial<TSchema["globals"][K]>) => Promise<TSchema["globals"][K]>;
     };
-    findOne<T = any>(collection: string, id: string, args?: {
+    findOne<T = UnknownRecord>(collection: string, id: string, args?: {
         depth?: number;
         initialData?: T;
     }): Promise<T>;
-    create<T = any>(collection: string, data: any): Promise<T>;
-    update<T = any>(collection: string, id: string, data: any): Promise<T>;
+    create<T = UnknownRecord>(collection: string, data: Partial<T>): Promise<T>;
+    update<T = UnknownRecord>(collection: string, id: string, data: Partial<T>): Promise<T>;
     delete(collection: string, id: string): Promise<{
         message: string;
     }>;
@@ -336,12 +348,12 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
     deleteMany(collection: string, ids: string[]): Promise<{
         message: string;
     }>;
-    getGlobal<T = any>(slug: string, args?: {
+    getGlobal<T = UnknownRecord>(slug: string, args?: {
         depth?: number;
         initialData?: T;
     }): Promise<T>;
-    updateGlobal<T = any>(slug: string, data: any): Promise<T>;
-    listMedia(args?: QueryArgs, collection?: string): Promise<PaginatedResult<FileData>>;
+    updateGlobal<T = UnknownRecord>(slug: string, data: Partial<T>): Promise<T>;
+    listMedia(args?: QueryArgs<FileData>, collection?: string): Promise<PaginatedResult<FileData>>;
     /** @deprecated Use client.collection('media').upload(file, data) instead */
     uploadMedia(file: File, collection?: string): Promise<FileData>;
     /**
@@ -353,9 +365,6 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
     }>;
     private request;
 }
-declare function createClient<TSchema extends {
-    collections: any;
-    globals: any;
-} = any>(config: DyrectedClientConfig): DyrectedClient<TSchema>;
+declare function createClient<TSchema extends BaseSchema = BaseSchema>(config: DyrectedClientConfig): DyrectedClient<TSchema>;
 
 export { type BaseSchema, DyrectedClient, type DyrectedClientConfig, DyrectedError, type InferSchema, type TransitionOptions, type WorkflowDocument, type WorkflowHistoryEntry, createClient };

package/dist/index.d.ts

@@ -1,29 +1,38 @@
-import { PaginatedResult, WorkflowMetadata, FileData, CollectionConfig, GlobalConfig } from '@dyrected/core';
-export { AdminIconName, Block, CollectionConfig, Field, FieldType, GlobalConfig, LifecycleEvent, FileData as Media, PaginatedResult, WorkflowMetadata } from '@dyrected/core';
+import { PaginatedResult, CollectionConfig, GlobalConfig, AdminConfig, PublicAdminAuthConfig, FileData, WorkflowMetadata } from '@dyrected/core';
+export { AdminIconName, Block, CollectionConfig, EmailField, Field, FieldType, GlobalConfig, IconField, LifecycleEvent, FileData as Media, NumberField, PaginatedResult, TextField, TextareaField, UrlField, WorkflowMetadata } from '@dyrected/core';
 
-interface QueryArgs {
+type UnknownRecord$1 = Record<string, unknown>;
+interface QueryArgs<TDoc = UnknownRecord$1> {
     limit?: number;
     page?: number;
     depth?: number;
-    where?: any;
+    where?: UnknownRecord$1 | string;
     sort?: string;
-    initialData?: any[];
+    initialData?: TDoc[];
 }
-declare class QueryBuilder<T = any> {
+declare class QueryBuilder<T = UnknownRecord$1> {
     private collection;
     private executor;
     private args;
-    constructor(collection: string, executor: (collection: string, args: QueryArgs) => Promise<PaginatedResult<T>>);
-    where(where: any): this;
+    constructor(collection: string, executor: (collection: string, args: QueryArgs<T>) => Promise<PaginatedResult<T>>);
+    where(where: UnknownRecord$1): this;
     sort(sort: string): this;
     limit(limit: number): this;
     page(page: number): this;
     depth(depth: number): this;
     seed(data: T[]): this;
     exec(): Promise<PaginatedResult<T>>;
-    then<TResult1 = PaginatedResult<T>, TResult2 = never>(onfulfilled?: ((value: PaginatedResult<T>) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
+    then<TResult1 = PaginatedResult<T>, TResult2 = never>(onfulfilled?: ((value: PaginatedResult<T>) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: unknown) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
 }
 
+type UnknownRecord = Record<string, unknown>;
+type SchemaResponse = {
+    collections: CollectionConfig[];
+    globals: GlobalConfig[];
+    admin?: AdminConfig;
+    adminAuth?: PublicAdminAuthConfig;
+};
+
 /** Shape of a document returned from a workflow-enabled collection. */
 interface WorkflowDocument {
     id: string;
@@ -82,7 +91,7 @@ type ExtractDoc<T> = T extends CollectionConfig<infer TDoc> ? TDoc : T extends G
  * // client.global('settings').get()  → { siteName?: string; ... }
  * ```
  */
-type InferSchema<TCollections extends Record<string, CollectionConfig<any>>, TGlobals extends Record<string, GlobalConfig<any>> = Record<never, never>> = {
+type InferSchema<TCollections extends Record<string, CollectionConfig<UnknownRecord>>, TGlobals extends Record<string, GlobalConfig<UnknownRecord>> = Record<never, never>> = {
     collections: {
         [K in keyof TCollections]: ExtractDoc<TCollections[K]>;
     };
@@ -114,10 +123,10 @@ interface DyrectedClientConfig {
     defaultDepth?: number;
 }
 interface BaseSchema {
-    collections: Record<string, any>;
-    globals: Record<string, any>;
+    collections: Record<string, UnknownRecord>;
+    globals: Record<string, UnknownRecord>;
 }
-declare class DyrectedClient<TSchema extends BaseSchema = any> {
+declare class DyrectedClient<TSchema extends BaseSchema = BaseSchema> {
     private baseUrl;
     private headers;
     private fetch;
@@ -140,9 +149,12 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
      */
     getAuthHeaders(): Record<string, string>;
     getBaseUrl(): string;
-    getSchemas(): Promise<{
-        collections: any[];
-        globals: any[];
+    getSchemas(): Promise<SchemaResponse>;
+    getAdminAuthConfig(): Promise<PublicAdminAuthConfig>;
+    exchangeAdminAuth(providerId: string, body: Record<string, unknown>): Promise<{
+        token: string;
+        collectionSlug: string;
+        providerId: string;
     }>;
     getPreference<T = unknown>(key: string, options?: {
         scope?: "personal" | "global";
@@ -165,19 +177,19 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
      * Fetch draft data for a specific preview token.
      * Used in "token" preview mode.
      */
-    getPreviewData(token: string): Promise<any>;
-    find<K extends keyof TSchema["collections"]>(collection: K & string, args?: QueryArgs): Promise<PaginatedResult<TSchema["collections"][K]>>;
+    getPreviewData<T = unknown>(token: string): Promise<T>;
+    find<K extends keyof TSchema["collections"]>(collection: K & string, args?: QueryArgs<TSchema["collections"][K]>): Promise<PaginatedResult<TSchema["collections"][K]>>;
     /**
      * Returns a fluent query builder for a collection.
      */
     collection<K extends keyof TSchema["collections"]>(slug: K & string): {
-        find: (args?: QueryArgs) => QueryBuilder<TSchema["collections"][K]>;
+        find: (args?: QueryArgs<TSchema["collections"][K]>) => QueryBuilder<TSchema["collections"][K]>;
         findOne: (id: string, args?: {
             depth?: number;
             initialData?: TSchema["collections"][K];
         }) => Promise<TSchema["collections"][K]>;
-        create: (data: any) => Promise<TSchema["collections"][K]>;
-        update: (id: string, data: any) => Promise<TSchema["collections"][K]>;
+        create: (data: Partial<TSchema["collections"][K]>) => Promise<TSchema["collections"][K]>;
+        update: (id: string, data: Partial<TSchema["collections"][K]>) => Promise<TSchema["collections"][K]>;
         delete: (id: string) => Promise<{
             message: string;
         }>;
@@ -189,7 +201,7 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
          * @param file - A File or Blob (browser) or Buffer with filename/mimeType (Node.js)
          * @param data - Additional metadata fields to save alongside the file (e.g. alt, caption)
          */
-        upload: (file: File | Blob, data?: Record<string, string>) => Promise<any>;
+        upload: (file: File | Blob, data?: Record<string, string>) => Promise<FileData>;
         /**
          * Log in with email + password. Returns a JWT token and the user document.
          * Call `client.setToken(token)` afterwards to authenticate subsequent requests.
@@ -213,7 +225,7 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
             initialized: boolean;
         }>;
         /** Register the very first user in an empty auth collection. */
-        registerFirstUser: (data: any) => Promise<{
+        registerFirstUser: (data: UnknownRecord) => Promise<{
             token: string;
             user: TSchema["collections"][K];
         }>;
@@ -223,7 +235,7 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
             message: string;
         }>;
         /** Accept an invitation and create an account. Returns token + user. */
-        acceptInvite: (token: string, password: string, extraFields?: Record<string, any>) => Promise<{
+        acceptInvite: (token: string, password: string, extraFields?: UnknownRecord) => Promise<{
             token: string;
             user: TSchema["collections"][K];
         }>;
@@ -295,14 +307,14 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
             depth?: number;
             initialData?: TSchema["globals"][K];
         }) => Promise<TSchema["globals"][K]>;
-        update: (data: any) => Promise<TSchema["globals"][K]>;
+        update: (data: Partial<TSchema["globals"][K]>) => Promise<TSchema["globals"][K]>;
     };
-    findOne<T = any>(collection: string, id: string, args?: {
+    findOne<T = UnknownRecord>(collection: string, id: string, args?: {
         depth?: number;
         initialData?: T;
     }): Promise<T>;
-    create<T = any>(collection: string, data: any): Promise<T>;
-    update<T = any>(collection: string, id: string, data: any): Promise<T>;
+    create<T = UnknownRecord>(collection: string, data: Partial<T>): Promise<T>;
+    update<T = UnknownRecord>(collection: string, id: string, data: Partial<T>): Promise<T>;
     delete(collection: string, id: string): Promise<{
         message: string;
     }>;
@@ -336,12 +348,12 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
     deleteMany(collection: string, ids: string[]): Promise<{
         message: string;
     }>;
-    getGlobal<T = any>(slug: string, args?: {
+    getGlobal<T = UnknownRecord>(slug: string, args?: {
         depth?: number;
         initialData?: T;
     }): Promise<T>;
-    updateGlobal<T = any>(slug: string, data: any): Promise<T>;
-    listMedia(args?: QueryArgs, collection?: string): Promise<PaginatedResult<FileData>>;
+    updateGlobal<T = UnknownRecord>(slug: string, data: Partial<T>): Promise<T>;
+    listMedia(args?: QueryArgs<FileData>, collection?: string): Promise<PaginatedResult<FileData>>;
     /** @deprecated Use client.collection('media').upload(file, data) instead */
     uploadMedia(file: File, collection?: string): Promise<FileData>;
     /**
@@ -353,9 +365,6 @@ declare class DyrectedClient<TSchema extends BaseSchema = any> {
     }>;
     private request;
 }
-declare function createClient<TSchema extends {
-    collections: any;
-    globals: any;
-} = any>(config: DyrectedClientConfig): DyrectedClient<TSchema>;
+declare function createClient<TSchema extends BaseSchema = BaseSchema>(config: DyrectedClientConfig): DyrectedClient<TSchema>;
 
 export { type BaseSchema, DyrectedClient, type DyrectedClientConfig, DyrectedError, type InferSchema, type TransitionOptions, type WorkflowDocument, type WorkflowHistoryEntry, createClient };

package/dist/index.js

@@ -45,7 +45,8 @@ var QueryBuilder = class {
   executor;
   args = {};
   where(where) {
-    this.args.where = { ...this.args.where, ...where };
+    const currentWhere = this.args.where;
+    this.args.where = currentWhere && typeof currentWhere === "object" ? { ...currentWhere, ...where } : { ...where };
     return this;
   }
   sort(sort) {
@@ -137,6 +138,15 @@ var DyrectedClient = class {
   async getSchemas() {
     return this.request("/api/schemas");
   }
+  async getAdminAuthConfig() {
+    return this.request("/api/admin/auth/providers");
+  }
+  async exchangeAdminAuth(providerId, body) {
+    return this.request(`/api/admin/auth/${providerId}/exchange`, {
+      method: "POST",
+      body: JSON.stringify(body)
+    });
+  }
   async getPreference(key, options) {
     const scopeParam = options?.scope ? `?scope=${options.scope}` : "";
     return this.request(`/api/preferences/${encodeURIComponent(key)}${scopeParam}`);
@@ -164,8 +174,8 @@ var DyrectedClient = class {
   async find(collection, args = {}) {
     const { initialData, ...queryArgs } = args;
     const normalizedArgs = { ...queryArgs };
-    if (normalizedArgs.where && typeof normalizedArgs.where === "object") {
-      normalizedArgs.where = JSON.stringify(normalizedArgs.where);
+    if (queryArgs.where && typeof queryArgs.where === "object") {
+      normalizedArgs.where = JSON.stringify(queryArgs.where);
     }
     const query = stringifyQuery(normalizedArgs, { addQueryPrefix: true });
     const res = await this.request(`/api/collections/${collection}${query}`);
@@ -192,9 +202,12 @@ var DyrectedClient = class {
   collection(slug) {
     return {
       find: (args) => {
-        const qb = new QueryBuilder(slug, (c, a) => this.find(c, a));
+        const qb = new QueryBuilder(
+          slug,
+          (collectionName, queryArgs) => this.find(collectionName, queryArgs)
+        );
         if (args) {
-          if (args.where) qb.where(args.where);
+          if (args.where && typeof args.where === "object") qb.where(args.where);
           if (args.sort) qb.sort(args.sort);
           if (args.limit) qb.limit(args.limit);
           if (args.page) qb.page(args.page);
@@ -418,7 +431,8 @@ var DyrectedClient = class {
     });
   }
   async listMedia(args = {}, collection = "media") {
-    return this.find(collection, args);
+    const query = stringifyQuery(normalizeQueryArgs(args), { addQueryPrefix: true });
+    return this.request(`/api/collections/${collection}${query}`);
   }
   /** @deprecated Use client.collection('media').upload(file, data) instead */
   async uploadMedia(file, collection = "media") {
@@ -438,10 +452,7 @@ var DyrectedClient = class {
     const { "Content-Type": _, ...headers } = this.headers;
     return this.request(`/api/collections/${collection}`, {
       method: "POST",
-      headers: {
-        ...headers,
-        "Content-Type": void 0
-      },
+      headers,
       body: formData
     });
   }
@@ -450,15 +461,7 @@ var DyrectedClient = class {
   }
   async request(path, init) {
     const url = `${this.baseUrl}${path}`;
-    const allHeaders = {
-      ...this.headers,
-      ...init?.headers
-    };
-    Object.keys(allHeaders).forEach((key) => {
-      if (allHeaders[key] === void 0) {
-        delete allHeaders[key];
-      }
-    });
+    const allHeaders = mergeHeaders(this.headers, init?.headers);
     const res = await this.fetch(url, {
       ...init,
       headers: allHeaders
@@ -497,6 +500,32 @@ function isFunctionallyEmpty(obj) {
   }
   return false;
 }
+function mergeHeaders(baseHeaders, overrideHeaders) {
+  const merged = new Headers(baseHeaders);
+  if (overrideHeaders instanceof Headers) {
+    overrideHeaders.forEach((value, key) => merged.set(key, value));
+  } else if (Array.isArray(overrideHeaders)) {
+    for (const [key, value] of overrideHeaders) {
+      merged.set(key, value);
+    }
+  } else if (overrideHeaders) {
+    for (const [key, value] of Object.entries(overrideHeaders)) {
+      if (value === void 0) {
+        merged.delete(key);
+      } else {
+        merged.set(key, String(value));
+      }
+    }
+  }
+  return Object.fromEntries(merged.entries());
+}
+function normalizeQueryArgs(args) {
+  const normalizedArgs = { ...args };
+  if (args.where && typeof args.where === "object") {
+    normalizedArgs.where = JSON.stringify(args.where);
+  }
+  return normalizedArgs;
+}
 export {
   DyrectedClient,
   DyrectedError,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyrected/sdk",
-  "version": "2.5.40",
+  "version": "2.5.41",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -30,7 +30,7 @@
     "tsup": "^8.5.1",
     "typescript": "^5.4.5",
     "vitest": "^1.0.0",
-    "@dyrected/core": "2.5.40"
+    "@dyrected/core": "2.5.41"
   },
   "license": "BSL-1.1",
   "author": "Busola Okeowo <busolaokemoney@gmail.com>",