@dotcms/client 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dotcms/client",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Official JavaScript library for interacting with DotCMS REST APIs.",
   "repository": {
     "type": "git",
@@ -26,13 +26,13 @@
     "./package.json": "./package.json",
     ".": {
       "module": "./index.esm.js",
-      "types": "./index.esm.d.ts",
+      "types": "./index.d.ts",
       "import": "./index.cjs.mjs",
       "default": "./index.cjs.js"
     },
     "./internal": {
       "module": "./internal.esm.js",
-      "types": "./internal.esm.d.ts",
+      "types": "./internal.d.ts",
       "import": "./internal.cjs.mjs",
       "default": "./internal.cjs.js"
     }
@@ -55,5 +55,5 @@
   "homepage": "https://github.com/dotCMS/core/tree/main/core-web/libs/sdk/client/README.md",
   "module": "./index.esm.js",
   "main": "./index.cjs.js",
-  "types": "./index.esm.d.ts"
+  "types": "./index.d.ts"
 }

package/src/lib/client/ai/ai-api.d.ts

@@ -1,6 +1,6 @@
 import { DotCMSClientConfig, DotRequestOptions, DotHttpClient, DotCMSAISearchParams, DotCMSBasicContentlet } from '@dotcms/types';
 import { AISearch } from './search/search';
-import { BaseApiClient } from '../base/base-api';
+import { BaseApiClient } from '../base/api/base-api';
 /**
  * Client for interacting with the DotCMS AI API.
  * Provides methods to interact with AI features.

package/src/lib/client/ai/search/search.d.ts

@@ -1,5 +1,5 @@
 import { DotCMSAISearchParams, DotCMSBasicContentlet, DotCMSClientConfig, DotErrorAISearch, DotHttpClient, DotRequestOptions, DotCMSAISearchResponse } from '@dotcms/types';
-import { BaseApiClient } from '../../base/base-api';
+import { BaseApiClient } from '../../base/api/base-api';
 import { OnFullfilled, OnRejected } from '../shared/types';
 /**
  * Class for executing AI searches.

package/src/lib/client/ai/shared/types.d.ts

@@ -1,18 +1,19 @@
 import { DotCMSAISearchResponse, DotCMSBasicContentlet, DotErrorAISearch } from '@dotcms/types';
+import { ThenableCallback } from '@dotcms/types/internal';
 /**
  * Callback for a fulfilled promise.
  *
  * @template T - The type of the response.
  * @callback OnFullfilled
  * @param {DotCMSAISearchResponse} value - The response value.
- * @returns {DotCMSAISearchResponse | PromiseLike<DotCMSAISearchResponse>} The processed response or a promise.
+ * @returns {DotCMSAISearchResponse | PromiseLike<DotCMSAISearchResponse> | void} The processed response or a promise.
  */
-export type OnFullfilled<T extends DotCMSBasicContentlet> = ((value: DotCMSAISearchResponse<T>) => DotCMSAISearchResponse<T> | PromiseLike<DotCMSAISearchResponse<T>>) | undefined | null;
+export type OnFullfilled<T extends DotCMSBasicContentlet> = ThenableCallback<DotCMSAISearchResponse<T>>;
 /**
  * Callback for a rejected promise.
  *
  * @callback OnRejected
  * @param {DotErrorAISearch} error - The AI search error object.
- * @returns {DotErrorAISearch | PromiseLike<DotErrorAISearch>} The processed error or a promise.
+ * @returns {DotErrorAISearch | PromiseLike<DotErrorAISearch> | void} The processed error or a promise.
  */
-export type OnRejected = ((error: DotErrorAISearch) => DotErrorAISearch | PromiseLike<DotErrorAISearch>) | undefined | null;
+export type OnRejected = ThenableCallback<DotErrorAISearch>;

package/src/lib/client/base/builder/base-builder.d.ts

@@ -0,0 +1,200 @@
+import { DotHttpClient, DotRequestOptions, DotCMSClientConfig, DotErrorContent } from '@dotcms/types';
+import { GetCollectionResponse, SortBy, GetCollectionRawResponse, OnFullfilled, OnRejected } from '../../content/shared/types';
+import { BaseApiClient } from '../api/base-api';
+/**
+ * Abstract base class for content builders that provides common functionality
+ * for querying content from the DotCMS Content API.
+ *
+ * This class extracts shared behavior between different builder implementations,
+ * including pagination, sorting, rendering, and response formatting.
+ *
+ * @export
+ * @abstract
+ * @class BaseBuilder
+ * @template T - The type of the content items (defaults to unknown)
+ */
+export declare abstract class BaseBuilder<T = unknown> extends BaseApiClient {
+    #private;
+    /**
+     * Creates an instance of BaseBuilder.
+     *
+     * @param {object} params - Constructor parameters
+     * @param {DotRequestOptions} params.requestOptions - Options for the client request
+     * @param {DotCMSClientConfig} params.config - The client configuration
+     * @param {DotHttpClient} params.httpClient - HTTP client for making requests
+     * @memberof BaseBuilder
+     */
+    constructor(params: {
+        requestOptions: DotRequestOptions;
+        config: DotCMSClientConfig;
+        httpClient: DotHttpClient;
+    });
+    /**
+     * Returns the offset for pagination based on current page and limit.
+     *
+     * @readonly
+     * @protected
+     * @memberof BaseBuilder
+     */
+    protected get offset(): number;
+    /**
+     * Returns the sort query in the format: field order, field order, ...
+     *
+     * @readonly
+     * @protected
+     * @memberof BaseBuilder
+     */
+    protected get sort(): string | undefined;
+    /**
+     * Returns the full URL for the content API.
+     *
+     * @readonly
+     * @protected
+     * @memberof BaseBuilder
+     */
+    protected get url(): string;
+    /**
+     * Sets the maximum amount of content to fetch.
+     *
+     * @example
+     * ```typescript
+     * builder.limit(20);
+     * ```
+     *
+     * @param {number} limit - The maximum amount of content to fetch
+     * @return {this} The builder instance for method chaining
+     * @memberof BaseBuilder
+     */
+    limit(limit: number): this;
+    /**
+     * Sets the page number to fetch.
+     *
+     * @example
+     * ```typescript
+     * builder.page(2);
+     * ```
+     *
+     * @param {number} page - The page number to fetch
+     * @return {this} The builder instance for method chaining
+     * @memberof BaseBuilder
+     */
+    page(page: number): this;
+    /**
+     * Sorts the content by the specified fields and orders.
+     *
+     * @example
+     * ```typescript
+     * const sortBy = [
+     *     { field: 'title', order: 'asc' },
+     *     { field: 'modDate', order: 'desc' }
+     * ];
+     * builder.sortBy(sortBy);
+     * ```
+     *
+     * @param {SortBy[]} sortBy - Array of constraints to sort the content by
+     * @return {this} The builder instance for method chaining
+     * @memberof BaseBuilder
+     */
+    sortBy(sortBy: SortBy[]): this;
+    /**
+     * Setting this to true will server-side render (using velocity) any widgets
+     * that are returned by the content query.
+     *
+     * More information here: {@link https://www.dotcms.com/docs/latest/content-api-retrieval-and-querying#ParamsOptional}
+     *
+     * @example
+     * ```typescript
+     * builder.render();
+     * ```
+     *
+     * @return {this} The builder instance for method chaining
+     * @memberof BaseBuilder
+     */
+    render(): this;
+    /**
+     * Sets the depth of the relationships of the content.
+     * Specifies the depth of related content to return in the results.
+     *
+     * More information here: {@link https://www.dotcms.com/docs/latest/content-api-retrieval-and-querying#ParamsOptional}
+     *
+     * @example
+     * ```typescript
+     * builder.depth(2);
+     * ```
+     *
+     * @param {number} depth - The depth of the relationships of the content (0-3)
+     * @return {this} The builder instance for method chaining
+     * @throws {Error} When depth is not between 0 and 3
+     * @memberof BaseBuilder
+     */
+    depth(depth: number): this;
+    /**
+     * Executes the fetch and returns a promise that resolves to the content or rejects with an error.
+     *
+     * @example
+     * ```typescript
+     * builder
+     *     .limit(10)
+     *     .then((response) => console.log(response))
+     *     .catch((error) => console.error(error));
+     * ```
+     *
+     * @example Using async/await
+     * ```typescript
+     * const response = await builder.limit(10);
+     * ```
+     *
+     * @param {OnFullfilled} [onfulfilled] - A callback that is called when the fetch is successful
+     * @param {OnRejected} [onrejected] - A callback that is called when the fetch fails
+     * @return {Promise<GetCollectionResponse<T> | DotErrorContent>} A promise that resolves to the content or rejects with an error
+     * @memberof BaseBuilder
+     */
+    then(onfulfilled?: OnFullfilled<T>, onrejected?: OnRejected): Promise<GetCollectionResponse<T> | DotErrorContent>;
+    /**
+     * Formats the response to the desired format.
+     *
+     * @protected
+     * @param {GetCollectionRawResponse<T>} data - The raw response data
+     * @return {GetCollectionResponse<T>} The formatted response
+     * @memberof BaseBuilder
+     */
+    protected formatResponse<T>(data: GetCollectionRawResponse<T>): GetCollectionResponse<T>;
+    /**
+     * Calls the content API to fetch the content.
+     *
+     * @protected
+     * @return {Promise<GetCollectionRawResponse<T>>} The fetch response data
+     * @throws {DotHttpError} When the HTTP request fails
+     * @memberof BaseBuilder
+     */
+    protected fetch(): Promise<GetCollectionRawResponse<T>>;
+    /**
+     * Wraps an error in a DotErrorContent instance with helpful context.
+     *
+     * @protected
+     * @param {unknown} error - The error to wrap
+     * @return {DotErrorContent} The wrapped error
+     * @memberof BaseBuilder
+     */
+    protected abstract wrapError(error: unknown): DotErrorContent;
+    /**
+     * Builds the final Lucene query string.
+     * Subclasses must implement this method to define their query building strategy.
+     *
+     * @protected
+     * @abstract
+     * @return {string} The final Lucene query string
+     * @memberof BaseBuilder
+     */
+    protected abstract buildFinalQuery(): string;
+    /**
+     * Gets the language ID for the query.
+     * Subclasses must implement this method to provide the language ID.
+     *
+     * @protected
+     * @abstract
+     * @return {number | string} The language ID
+     * @memberof BaseBuilder
+     */
+    protected abstract getLanguageId(): number | string | undefined;
+}

package/src/lib/client/content/builders/collection/collection.d.ts

@@ -1,6 +1,6 @@
 import { DotHttpClient, DotRequestOptions, DotCMSClientConfig, DotErrorContent } from '@dotcms/types';
-import { BaseApiClient } from '../../../base/base-api';
-import { GetCollectionResponse, BuildQuery, SortBy, OnFullfilled, OnRejected } from '../../shared/types';
+import { BaseBuilder } from '../../../base/builder/base-builder';
+import { BuildQuery } from '../../shared/types';
 /**
  * Creates a Builder to filter and fetch content from the content API for a specific content type.
  *
@@ -8,41 +8,23 @@ import { GetCollectionResponse, BuildQuery, SortBy, OnFullfilled, OnRejected } f
  * @class CollectionBuilder
  * @template T Represents the type of the content type to fetch. Defaults to unknown.
  */
-export declare class CollectionBuilder<T = unknown> extends BaseApiClient {
+export declare class CollectionBuilder<T = unknown> extends BaseBuilder<T> {
     #private;
     /**
      * Creates an instance of CollectionBuilder.
-     * @param {ClientOptions} requestOptions Options for the client request.
-     * @param {DotCMSClientConfig} config The client configuration.
-     * @param {string} contentType The content type to fetch.
-     * @param {DotHttpClient} httpClient HTTP client for making requests.
+     * @param {object} params - Constructor parameters
+     * @param {DotRequestOptions} params.requestOptions - Options for the client request
+     * @param {DotCMSClientConfig} params.config - The client configuration
+     * @param {string} params.contentType - The content type to fetch
+     * @param {DotHttpClient} params.httpClient - HTTP client for making requests
      * @memberof CollectionBuilder
      */
-    constructor(requestOptions: DotRequestOptions, config: DotCMSClientConfig, contentType: string, httpClient: DotHttpClient);
-    /**
-     * Returns the sort query in the format: field order, field order, ...
-     *
-     * @readonly
-     * @private
-     * @memberof CollectionBuilder
-     */
-    private get sort();
-    /**
-     * Returns the offset for pagination.
-     *
-     * @readonly
-     * @private
-     * @memberof CollectionBuilder
-     */
-    private get offset();
-    /**
-     * Returns the full URL for the content API.
-     *
-     * @readonly
-     * @private
-     * @memberof CollectionBuilder
-     */
-    private get url();
+    constructor(params: {
+        requestOptions: DotRequestOptions;
+        config: DotCMSClientConfig;
+        contentType: string;
+        httpClient: DotHttpClient;
+    });
     /**
      * Returns the current query built.
      *
@@ -66,47 +48,6 @@ export declare class CollectionBuilder<T = unknown> extends BaseApiClient {
      * @memberof CollectionBuilder
      */
     language(languageId: number | string): this;
-    /**
-     * Setting this to true will server side render (using velocity) any widgets that are returned by the content query.
-     *
-     * More information here: {@link https://www.dotcms.com/docs/latest/content-api-retrieval-and-querying#ParamsOptional}
-     *
-     * @return {CollectionBuilder} A CollectionBuilder instance.
-     * @memberof CollectionBuilder
-     */
-    render(): this;
-    /**
-     * Sorts the content by the specified fields and orders.
-     *
-     * @example
-     * ```typescript
-     * const client = new DotCMSClient(config);
-     * const collectionBuilder = client.content.getCollection("Blog");
-     * const sortBy = [{ field: 'title', order: 'asc' }, { field: 'modDate', order: 'desc' }];
-     * collectionBuilder("Blog").sortBy(sortBy);
-     * ```
-     *
-     * @param {SortBy[]} sortBy Array of constraints to sort the content by.
-     * @return {CollectionBuilder} A CollectionBuilder instance.
-     * @memberof CollectionBuilder
-     */
-    sortBy(sortBy: SortBy[]): this;
-    /**
-     * Sets the maximum amount of content to fetch.
-     *
-     * @param {number} limit The maximum amount of content to fetch.
-     * @return {CollectionBuilder} A CollectionBuilder instance.
-     * @memberof CollectionBuilder
-     */
-    limit(limit: number): this;
-    /**
-     * Sets the page number to fetch.
-     *
-     * @param {number} page The page number to fetch.
-     * @return {CollectionBuilder} A CollectionBuilder instance.
-     * @memberof CollectionBuilder
-     */
-    page(page: number): this;
     /**
      * Filters the content by a Lucene query string.
      *
@@ -169,77 +110,37 @@ export declare class CollectionBuilder<T = unknown> extends BaseApiClient {
      */
     variant(variantId: string): this;
     /**
-     * Sets the depth of the relationships of the content.
-     * Specifies the depth of related content to return in the results.
-     *
-     * More information here: {@link https://www.dotcms.com/docs/latest/content-api-retrieval-and-querying#ParamsOptional}
-     *
-     * @example
-     * ```ts
-     * const client = new DotCMSClient(config);
-     * const collectionBuilder = client.content.getCollection("Blog");
-     * collectionBuilder
-     *      .depth(1)
-     *      .then((response) => // Your code here })
-     *      .catch((error) => // Your code here })
-     * ```
+     * Wraps an error in a DotErrorContent instance with helpful context.
      *
-     * @param {number} depth The depth of the relationships of the content.
-     * @return {CollectionBuilder} A CollectionBuilder instance.
+     * @protected
+     * @param {unknown} error - The error to wrap
+     * @return {DotErrorContent} The wrapped error
      * @memberof CollectionBuilder
      */
-    depth(depth: number): this;
+    protected wrapError(error: unknown): DotErrorContent;
     /**
-     * Executes the fetch and returns a promise that resolves to the content or rejects with an error.
+     * Gets the language ID for the query.
      *
-     * @example
-     * ```ts
-     * const client = new DotCMSClient(config);
-     * const collectionBuilder = client.content.getCollection("Blog");
-     * collectionBuilder
-     *      .limit(10)
-     *      .then((response) => // Your code here })
-     *      .catch((error) => // Your code here })
-     * ```
-     *
-     * @param {OnFullfilled} [onfulfilled] A callback that is called when the fetch is successful.
-     * @param {OnRejected} [onrejected] A callback that is called when the fetch fails.
-     * @return {Promise<GetCollectionResponse<T> | DotErrorContent>} A promise that resolves to the content or rejects with an error.
+     * @protected
+     * @return {number | string} The language ID
      * @memberof CollectionBuilder
      */
-    then(onfulfilled?: OnFullfilled<T>, onrejected?: OnRejected): Promise<GetCollectionResponse<T> | DotErrorContent>;
-    /**
-     * Formats the response to the desired format.
-     *
-     * @private
-     * @param {GetCollectionRawResponse<T>} data The raw response data.
-     * @return {GetCollectionResponse<T>} The formatted response.
-     * @memberof CollectionBuilder
-     */
-    private formatResponse;
-    /**
-     * Calls the content API to fetch the content.
-     *
-     * @private
-     * @return {Promise<GetCollectionRawResponse<T>>} The fetch response data.
-     * @throws {DotHttpError} When the HTTP request fails.
-     * @memberof CollectionBuilder
-     */
-    private fetch;
+    protected getLanguageId(): number | string;
     /**
      * Builds the final Lucene query string by combining the base query with required system constraints.
      *
      * This method constructs the complete query by:
      * 1. Adding language ID filter to ensure content matches the specified language
      * 2. Adding live/draft status filter based on the draft flag
-     * 3. Optionally adding site ID constraint if conditions are met
+     * 3. Applying content type specific query sanitization
+     * 4. Optionally adding site ID constraint if conditions are met
      *
      * Site ID constraint is added only when:
      * - Query doesn't already contain a positive site constraint (+conhost)
      * - Query doesn't explicitly exclude the current site ID (-conhost:currentSiteId)
      * - Site ID is configured in the system
      *
-     * @private
+     * @protected
      * @returns {string} The complete Lucene query string ready for the Content API
      * @memberof CollectionBuilder
      *
@@ -261,5 +162,5 @@ export declare class CollectionBuilder<T = unknown> extends BaseApiClient {
      * // Query: "+contentType:Blog -conhost:456"
      * // Returns: "+contentType:Blog -conhost:456 +languageId:1 +live:true +conhost:123" (site ID still added)
      */
-    private getFinalQuery;
+    protected buildFinalQuery(): string;
 }

package/src/lib/client/content/builders/raw-query/raw-query.builder.d.ts

@@ -0,0 +1,75 @@
+import { DotHttpClient, DotRequestOptions, DotCMSClientConfig, DotErrorContent } from '@dotcms/types';
+import { BaseBuilder } from '../../../base/builder/base-builder';
+/**
+ * Builder for executing raw Lucene queries against the DotCMS Content API.
+ *
+ * This builder provides direct access to Lucene query syntax while still
+ * offering common functionality like pagination, sorting, and language filtering.
+ *
+ * @export
+ * @class RawQueryBuilder
+ * @template T - The type of the content items (defaults to unknown)
+ */
+export declare class RawQueryBuilder<T = unknown> extends BaseBuilder<T> {
+    #private;
+    /**
+     * Creates an instance of RawQueryBuilder.
+     *
+     * @param {object} params - Constructor parameters
+     * @param {DotRequestOptions} params.requestOptions - Options for the client request
+     * @param {DotCMSClientConfig} params.config - The client configuration
+     * @param {string} params.rawQuery - The raw Lucene query string
+     * @param {DotHttpClient} params.httpClient - HTTP client for making requests
+     * @memberof RawQueryBuilder
+     */
+    constructor(params: {
+        requestOptions: DotRequestOptions;
+        config: DotCMSClientConfig;
+        rawQuery: string;
+        httpClient: DotHttpClient;
+    });
+    /**
+     * Filters the content by the specified language ID.
+     *
+     * This sets the `languageId` request body field (it does not alter the raw Lucene query string).
+     *
+     * @example
+     * ```typescript
+     * const response = await client.content
+     *     .query('+contentType:Blog +title:Hello')
+     *     .language(1)
+     *     .limit(10);
+     * ```
+     *
+     * @param {number | string} languageId The language ID to filter the content by.
+     * @return {RawQueryBuilder} A RawQueryBuilder instance.
+     * @memberof RawQueryBuilder
+     */
+    language(languageId: number | string): this;
+    /**
+     * Wraps an error in a DotErrorContent instance with helpful context.
+     *
+     * @protected
+     * @param {unknown} error - The error to wrap
+     * @return {DotErrorContent} The wrapped error
+     * @memberof RawQueryBuilder
+     */
+    protected wrapError(error: unknown): DotErrorContent;
+    /**
+     * @protected
+     * @return {number | string | undefined} Optional languageId to send in the request body.
+     * @memberof RawQueryBuilder
+     */
+    protected getLanguageId(): number | string | undefined;
+    /**
+     * Builds the final Lucene query string.
+     *
+     * Raw query is used as provided (only minimal sanitization is applied).
+     * No implicit constraints are added.
+     *
+     * @protected
+     * @return {string} The final Lucene query string
+     * @memberof RawQueryBuilder
+     */
+    protected buildFinalQuery(): string;
+}

package/src/lib/client/content/content-api.d.ts

@@ -1,6 +1,7 @@
 import { DotRequestOptions, DotHttpClient, DotCMSClientConfig } from '@dotcms/types';
 import { CollectionBuilder } from './builders/collection/collection';
-import { BaseApiClient } from '../base/base-api';
+import { RawQueryBuilder } from './builders/raw-query/raw-query.builder';
+import { BaseApiClient } from '../base/api/base-api';
 /**
  * Creates a builder to filter and fetch a collection of content items.
  * @param contentType - The content type to retrieve.
@@ -124,4 +125,87 @@ export declare class Content extends BaseApiClient {
      *
      */
     getCollection<T = unknown>(contentType: string): CollectionBuilder<T>;
+    /**
+     * Executes a raw Lucene query with optional pagination, sorting, and rendering options.
+     *
+     * This method provides direct access to Lucene query syntax, giving you full control
+     * over query construction while still benefiting from common features like pagination,
+     * sorting, and error handling.
+     *
+     * **Important Notes:**
+     * - The raw query is used as-is (minimal sanitization only)
+     * - NO automatic field prefixing (unlike `getCollection()`)
+     * - NO implicit/system constraints are added (language, live/draft, site, variant, etc.)
+     * - If you need constraints, include them in the raw query string (e.g. `+contentType:Blog +languageId:1 +live:true`)
+     *
+     * @template T - The type of the content items (defaults to unknown)
+     * @param {string} rawQuery - Raw Lucene query string
+     * @return {RawQueryBuilder<T>} A RawQueryBuilder instance for chaining options
+     * @memberof Content
+     *
+     * @example Simple query with pagination
+     * ```typescript
+     * const response = await client.content
+     *     .query('+contentType:Blog +title:"Hello World"')
+     *     .limit(10)
+     *     .page(1);
+     *
+     * console.log(response.contentlets);
+     * ```
+     *
+     * @example Complex query with all available options
+     * ```typescript
+     * const response = await client.content
+     *     .query('+(contentType:Blog OR contentType:News) +tags:"technology" +languageId:1 +(live:false AND working:true AND deleted:false) +variant:legends-forceSensitive')
+     *     .limit(20)
+     *     .page(2)
+     *     .sortBy([{ field: 'modDate', order: 'desc' }])
+     *     .render()
+     *     .depth(2);
+     *
+     * console.log(`Found ${response.total} items`);
+     * response.contentlets.forEach(item => console.log(item.title));
+     * ```
+     *
+     * @example Using TypeScript generics for type safety
+     * ```typescript
+     * interface BlogPost {
+     *     title: string;
+     *     author: string;
+     *     publishDate: string;
+     * }
+     *
+     * const response = await client.content
+     *     .query<BlogPost>('+contentType:Blog +author:"John Doe"')
+     *     .limit(10);
+     *
+     * // TypeScript knows the type of contentlets
+     * response.contentlets.forEach(post => {
+     *     console.log(post.title, post.author);
+     * });
+     * ```
+     *
+     * @example Error handling with helpful messages
+     * ```typescript
+     * try {
+     *     const response = await client.content
+     *         .query('+contentType:Blog +publishDate:[2024-01-01 TO 2024-12-31]');
+     * } catch (error) {
+     *     if (error instanceof DotErrorContent) {
+     *         console.error('Query failed:', error.message);
+     *         console.error('Failed query:', error.query);
+     *     }
+     * }
+     * ```
+     *
+     * @example Using Promise chain instead of async/await
+     * ```typescript
+     * client.content
+     *     .query('+contentType:Blog')
+     *     .limit(10)
+     *     .then(response => console.log(response.contentlets))
+     *     .catch(error => console.error(error));
+     * ```
+     */
+    query<T = unknown>(rawQuery: string): RawQueryBuilder<T>;
 }

package/src/lib/client/content/shared/types.d.ts

@@ -1,4 +1,5 @@
 import { Contentlet, DotErrorContent } from '@dotcms/types';
+import { ThenableCallback } from '@dotcms/types/internal';
 import { Equals } from '../builders/query/lucene-syntax';
 import { QueryBuilder } from '../builders/query/query';
 /**
@@ -28,17 +29,17 @@ export type BuildQuery = (qb: QueryBuilder) => Equals;
  * @template T - The type of the response.
  * @callback OnFullfilled
  * @param {GetCollectionResponse<T>} value - The response value.
- * @returns {GetCollectionResponse<T> | PromiseLike<GetCollectionResponse<T>>} The processed response or a promise.
+ * @returns {GetCollectionResponse<T> | PromiseLike<GetCollectionResponse<T>> | void} The processed response or a promise.
  */
-export type OnFullfilled<T> = ((value: GetCollectionResponse<T>) => GetCollectionResponse<T> | PromiseLike<GetCollectionResponse<T>>) | undefined | null;
+export type OnFullfilled<T> = ThenableCallback<GetCollectionResponse<T>>;
 /**
  * Callback for a rejected promise.
  *
  * @callback OnRejected
  * @param {DotErrorContent} error - The content error object.
- * @returns {DotErrorContent | PromiseLike<DotErrorContent>} The processed error or a promise.
+ * @returns {DotErrorContent | PromiseLike<DotErrorContent> | void} The processed error or a promise.
  */
-export type OnRejected = ((error: DotErrorContent) => DotErrorContent | PromiseLike<DotErrorContent>) | undefined | null;
+export type OnRejected = ThenableCallback<DotErrorContent>;
 /**
  * Response of the get collection method.
  *