@wix/wix-data-items-common 1.0.312 → 1.0.313

package/dist/cjs/api/PipelineBuilder.js

@@ -36,18 +36,6 @@ class PipelineBuilderImpl {
     };
   }
 }
-
-/**
- * Builds an aggregation pipeline for use with [`aggregatePipeline()`](https://dev.wix.com/docs/sdk/backend-modules/data/items/aggregate-pipeline).
- *
- * Configure the pipeline by calling `pipelineBuilder()` and chaining [`PipelineBuilder`](https://dev.wix.com/docs/sdk/backend-modules/data/items/pipeline-builder/introduction) methods. Then, specify the pipeline as the `pipeline` parameter when calling the [`aggregatePipeline()`](https://dev.wix.com/docs/sdk/backend-modules/data/items/aggregate-pipeline) method.
- *
- * > **Note**: You can only build an aggregation pipeline for collections [created in the CMS](https://support.wix.com/en/article/cms-formerly-content-manager-creating-a-collection) or with the [Data Collections API](https://dev.wix.com/docs/sdk/backend-modules/data/collections/introduction). They cannot be used on [Wix app collections](https://support.wix.com/en/article/cms-formerly-content-manager-working-with-wix-app-collections) or [external collections](https://dev.wix.com/docs/develop-websites/articles/databases/external-databases/overview/integrating-external-databases-with-your-wix-site).
- *
- * @public
- * @documentationMaturity preview
- * @returns PipelineBuilder object
- */
 function pipelineBuilder() {
   return new PipelineBuilderImpl();
 }

package/dist/cjs/api/PipelineBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["PipelineBuilderImpl","constructor","_defineProperty2","default","withStages","stages","withPaging","paging","isCursor","cursorPaging","undefined","offsetPaging","build","map","stage","pipelineBuilder"],"sources":["../../../src/api/PipelineBuilder.ts"],"sourcesContent":["import { PipelineStage } from './stages/stages'\nimport { Paging, CursorPaging, AggregationPipeline } from '../types'\n\n/**\n * @builder\n */\nexport interface PipelineBuilder {\n  /**\n   * Adds [pipeline stages](https://dev.wix.com/docs/sdk/backend-modules/data/items/wix-data-aggregate-pipeline-stages/introduction) to the aggregation pipeline.\n   *\n   * Stages are processed sequentially in the order they are provided, with each stage's output becoming the input for the next stage.\n   *\n   * @public\n   * @documentationMaturity preview\n   * @param stages - Array of [pipeline stages](https://dev.wix.com/docs/sdk/backend-modules/data/items/wix-data-aggregate-pipeline-stages/introduction).\n   * @returns PipelineBuilder object\n   */\n  withStages(stages: PipelineStage[]): PipelineBuilder\n\n  /**\n   * Configures pagination for the aggregation pipeline results.\n   *\n   * You can specify either [offset](https://dev.wix.com/docs/sdk/articles/work-with-the-sdk/api-query-language#offset-paging) or [cursor pagination](https://dev.wix.com/docs/sdk/articles/work-with-the-sdk/api-query-language#cursor-paging).\n   *\n   * @public\n   * @documentationMaturity preview\n   * @param paging - Pagination configuration.\n   * @returns PipelineBuilder object\n   */\n  withPaging(paging: Paging | CursorPaging): PipelineBuilder\n\n  /**\n   * Builds the aggregation pipeline.\n   *\n   * Run this method after configuring stages and pagination to build the aggregation pipeline. Specify the pipeline as the `pipeline` parameter when calling the [`aggregatePipeline()`](https://dev.wix.com/docs/sdk/backend-modules/data/items/aggregate-pipeline) method.\n   *\n   * @public\n   * @documentationMaturity preview\n   * @returns AggregationPipeline object ready for running the aggregation pipeline.\n   */\n  build(): AggregationPipeline\n}\n\nclass PipelineBuilderImpl implements PipelineBuilder {\n  private stages: PipelineStage[] = []\n  private offsetPaging?: Paging\n  private cursorPaging?: CursorPaging\n\n  withStages(stages: PipelineStage[]) {\n    this.stages = stages\n    return this\n  }\n\n  withPaging(paging: Paging | CursorPaging) {\n    const isCursor = 'cursor' in paging\n    this.cursorPaging = isCursor ? paging : undefined\n    this.offsetPaging = isCursor ? undefined : paging\n    return this\n  }\n\n  build() {\n    return {\n      stages: this.stages.map((stage) => stage.build()),\n      ...(this.offsetPaging && { paging: this.offsetPaging }),\n      ...(this.cursorPaging && { cursorPaging: this.cursorPaging }),\n    }\n  }\n}\n\n/**\n * Builds an aggregation pipeline for use with [`aggregatePipeline()`](https://dev.wix.com/docs/sdk/backend-modules/data/items/aggregate-pipeline).\n *\n * Configure the pipeline by calling `pipelineBuilder()` and chaining [`PipelineBuilder`](https://dev.wix.com/docs/sdk/backend-modules/data/items/pipeline-builder/introduction) methods. Then, specify the pipeline as the `pipeline` parameter when calling the [`aggregatePipeline()`](https://dev.wix.com/docs/sdk/backend-modules/data/items/aggregate-pipeline) method.\n *\n * > **Note**: You can only build an aggregation pipeline for collections [created in the CMS](https://support.wix.com/en/article/cms-formerly-content-manager-creating-a-collection) or with the [Data Collections API](https://dev.wix.com/docs/sdk/backend-modules/data/collections/introduction). They cannot be used on [Wix app collections](https://support.wix.com/en/article/cms-formerly-content-manager-working-with-wix-app-collections) or [external collections](https://dev.wix.com/docs/develop-websites/articles/databases/external-databases/overview/integrating-external-databases-with-your-wix-site).\n *\n * @public\n * @documentationMaturity preview\n * @returns PipelineBuilder object\n */\nexport function pipelineBuilder(): PipelineBuilder {\n  return new PipelineBuilderImpl()\n}\n"],"mappings":";;;;;;AAGA;AACA;AACA;;AAsCA,MAAMA,mBAAmB,CAA4B;EAAAC,YAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,kBACjB,EAAE;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;EAAA;EAIpCC,UAAUA,CAACC,MAAuB,EAAE;IAClC,IAAI,CAACA,MAAM,GAAGA,MAAM;IACpB,OAAO,IAAI;EACb;EAEAC,UAAUA,CAACC,MAA6B,EAAE;IACxC,MAAMC,QAAQ,GAAG,QAAQ,IAAID,MAAM;IACnC,IAAI,CAACE,YAAY,GAAGD,QAAQ,GAAGD,MAAM,GAAGG,SAAS;IACjD,IAAI,CAACC,YAAY,GAAGH,QAAQ,GAAGE,SAAS,GAAGH,MAAM;IACjD,OAAO,IAAI;EACb;EAEAK,KAAKA,CAAA,EAAG;IACN,OAAO;MACLP,MAAM,EAAE,IAAI,CAACA,MAAM,CAACQ,GAAG,CAAEC,KAAK,IAAKA,KAAK,CAACF,KAAK,CAAC,CAAC,CAAC;MACjD,IAAI,IAAI,CAACD,YAAY,IAAI;QAAEJ,MAAM,EAAE,IAAI,CAACI;MAAa,CAAC,CAAC;MACvD,IAAI,IAAI,CAACF,YAAY,IAAI;QAAEA,YAAY,EAAE,IAAI,CAACA;MAAa,CAAC;IAC9D,CAAC;EACH;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASM,eAAeA,CAAA,EAAoB;EACjD,OAAO,IAAIf,mBAAmB,CAAC,CAAC;AAClC","ignoreList":[]}
+{"version":3,"names":["PipelineBuilderImpl","constructor","_defineProperty2","default","withStages","stages","withPaging","paging","isCursor","cursorPaging","undefined","offsetPaging","build","map","stage","pipelineBuilder"],"sources":["../../../src/api/PipelineBuilder.ts"],"sourcesContent":["import { PipelineStage } from './stages/stages'\nimport { Paging, CursorPaging, AggregationPipeline } from '../types'\n\n/**\n * @builder\n */\nexport interface PipelineBuilder {\n  /**\n   * Adds [pipeline stages](https://dev.wix.com/docs/sdk/backend-modules/data/items/wix-data-aggregate-pipeline-stages/introduction) to the aggregation pipeline.\n   *\n   * Stages are processed sequentially in the order they are provided, with each stage's output becoming the input for the next stage.\n   *\n   * @public\n   * @documentationMaturity preview\n   * @param stages - Array of [pipeline stages](https://dev.wix.com/docs/sdk/backend-modules/data/items/wix-data-aggregate-pipeline-stages/introduction).\n   * @returns PipelineBuilder object\n   */\n  withStages(stages: PipelineStage[]): PipelineBuilder\n\n  /**\n   * Configures pagination for the aggregation pipeline results.\n   *\n   * You can specify either [offset](https://dev.wix.com/docs/sdk/articles/work-with-the-sdk/api-query-language#offset-paging) or [cursor pagination](https://dev.wix.com/docs/sdk/articles/work-with-the-sdk/api-query-language#cursor-paging).\n   *\n   * @public\n   * @documentationMaturity preview\n   * @param paging - Pagination configuration.\n   * @returns PipelineBuilder object\n   */\n  withPaging(paging: Paging | CursorPaging): PipelineBuilder\n\n  /**\n   * Builds the aggregation pipeline.\n   *\n   * Run this method after configuring stages and pagination to build the aggregation pipeline. Specify the pipeline as the `pipeline` parameter when calling the [`aggregatePipeline()`](https://dev.wix.com/docs/sdk/backend-modules/data/items/aggregate-pipeline) method.\n   *\n   * @public\n   * @documentationMaturity preview\n   * @returns AggregationPipeline object ready for running the aggregation pipeline.\n   */\n  build(): AggregationPipeline\n}\n\nclass PipelineBuilderImpl implements PipelineBuilder {\n  private stages: PipelineStage[] = []\n  private offsetPaging?: Paging\n  private cursorPaging?: CursorPaging\n\n  withStages(stages: PipelineStage[]) {\n    this.stages = stages\n    return this\n  }\n\n  withPaging(paging: Paging | CursorPaging) {\n    const isCursor = 'cursor' in paging\n    this.cursorPaging = isCursor ? paging : undefined\n    this.offsetPaging = isCursor ? undefined : paging\n    return this\n  }\n\n  build() {\n    return {\n      stages: this.stages.map((stage) => stage.build()),\n      ...(this.offsetPaging && { paging: this.offsetPaging }),\n      ...(this.cursorPaging && { cursorPaging: this.cursorPaging }),\n    }\n  }\n}\n\nexport function pipelineBuilder(): PipelineBuilder {\n  return new PipelineBuilderImpl()\n}\n"],"mappings":";;;;;;AAGA;AACA;AACA;;AAsCA,MAAMA,mBAAmB,CAA4B;EAAAC,YAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,kBACjB,EAAE;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;EAAA;EAIpCC,UAAUA,CAACC,MAAuB,EAAE;IAClC,IAAI,CAACA,MAAM,GAAGA,MAAM;IACpB,OAAO,IAAI;EACb;EAEAC,UAAUA,CAACC,MAA6B,EAAE;IACxC,MAAMC,QAAQ,GAAG,QAAQ,IAAID,MAAM;IACnC,IAAI,CAACE,YAAY,GAAGD,QAAQ,GAAGD,MAAM,GAAGG,SAAS;IACjD,IAAI,CAACC,YAAY,GAAGH,QAAQ,GAAGE,SAAS,GAAGH,MAAM;IACjD,OAAO,IAAI;EACb;EAEAK,KAAKA,CAAA,EAAG;IACN,OAAO;MACLP,MAAM,EAAE,IAAI,CAACA,MAAM,CAACQ,GAAG,CAAEC,KAAK,IAAKA,KAAK,CAACF,KAAK,CAAC,CAAC,CAAC;MACjD,IAAI,IAAI,CAACD,YAAY,IAAI;QAAEJ,MAAM,EAAE,IAAI,CAACI;MAAa,CAAC,CAAC;MACvD,IAAI,IAAI,CAACF,YAAY,IAAI;QAAEA,YAAY,EAAE,IAAI,CAACA;MAAa,CAAC;IAC9D,CAAC;EACH;AACF;AAEO,SAASM,eAAeA,CAAA,EAAoB;EACjD,OAAO,IAAIf,mBAAmB,CAAC,CAAC;AAClC","ignoreList":[]}

package/dist/cjs/api/WixDataAggregateOptionsBuilder.js

@@ -3,8 +3,13 @@
 exports.__esModule = true;
 exports.AggregateOptionsBuilder = void 0;
 /**
- * WixData aggregate options builder.
- * @internal
+ * Builder for aggregate options used by Wix Data aggregate operations.
+ *
+ * Use this builder to configure aggregation behavior such as language, consistent reads,
+ * and total counts.
+ * @public
+ * @builder
+ * @documentationMaturity preview
  */
 
 class WixDataAggregateOptionsBuilderImpl {
@@ -46,7 +51,26 @@ class WixDataAggregateOptionsBuilderImpl {
 
 /**
  * Creates a new WixData aggregate options builder.
- * @internal
+ * @public
+ * @documentationMaturity preview
+ *
+ * @example
+ * ```ts
+ * import { items, AggregateOptionsBuilder } from '@wix/data'
+ *
+ *
+ * const options = AggregateOptionsBuilder()
+ *   .withLanguage('en')
+ *   .withConsistentRead(true)
+ *   .withReturnTotalCount(true)
+ *   .build()
+ *
+ * const result = await items.aggregate<MyItem>(
+ *   'myCollection',
+ *   {},
+ *   options
+ * )
+ * ```
  */
 const AggregateOptionsBuilder = () => new WixDataAggregateOptionsBuilderImpl();
 exports.AggregateOptionsBuilder = AggregateOptionsBuilder;

package/dist/cjs/api/WixDataAggregateOptionsBuilder.js.map

@@ -1 +1 @@
-{"version":3,"names":["WixDataAggregateOptionsBuilderImpl","constructor","options","withShowDrafts","value","copy","showDrafts","withLanguage","language","withConsistentRead","consistentRead","withReturnTotalCount","returnTotalCount","build","AggregateOptionsBuilder","exports"],"sources":["../../../src/api/WixDataAggregateOptionsBuilder.ts"],"sourcesContent":["import type { WixDataAggregateOptions } from './types'\n\n/**\n * WixData aggregate options builder.\n * @internal\n */\nexport interface WixDataAggregateOptionsBuilder {\n  withShowDrafts(value: boolean): WixDataAggregateOptionsBuilder\n  withLanguage(value: string): WixDataAggregateOptionsBuilder\n  withConsistentRead(value: boolean): WixDataAggregateOptionsBuilder\n  withReturnTotalCount(value: boolean): WixDataAggregateOptionsBuilder\n  build(): WixDataAggregateOptions\n}\n\nclass WixDataAggregateOptionsBuilderImpl\n  implements WixDataAggregateOptionsBuilder\n{\n  constructor(private readonly options: WixDataAggregateOptions = {}) {}\n\n  withShowDrafts(value: boolean): WixDataAggregateOptionsBuilder {\n    return this.copy({ showDrafts: value })\n  }\n\n  withLanguage(value: string): WixDataAggregateOptionsBuilder {\n    return this.copy({ language: value })\n  }\n\n  withConsistentRead(value: boolean): WixDataAggregateOptionsBuilder {\n    return this.copy({ consistentRead: value })\n  }\n\n  withReturnTotalCount(value: boolean): WixDataAggregateOptionsBuilder {\n    return this.copy({ returnTotalCount: value })\n  }\n\n  build(): WixDataAggregateOptions {\n    return { ...this.options }\n  }\n\n  private copy(\n    options: WixDataAggregateOptions\n  ): WixDataAggregateOptionsBuilder {\n    return new WixDataAggregateOptionsBuilderImpl({\n      ...this.options,\n      ...options,\n    })\n  }\n}\n\n/**\n * Creates a new WixData aggregate options builder.\n * @internal\n */\nexport const AggregateOptionsBuilder: () => WixDataAggregateOptionsBuilder =\n  () => new WixDataAggregateOptionsBuilderImpl()\n"],"mappings":";;;;AAEA;AACA;AACA;AACA;;AASA,MAAMA,kCAAkC,CAExC;EACEC,WAAWA,CAAkBC,OAAgC,GAAG,CAAC,CAAC,EAAE;IAAA,KAAvCA,OAAgC,GAAhCA,OAAgC;EAAQ;EAErEC,cAAcA,CAACC,KAAc,EAAkC;IAC7D,OAAO,IAAI,CAACC,IAAI,CAAC;MAAEC,UAAU,EAAEF;IAAM,CAAC,CAAC;EACzC;EAEAG,YAAYA,CAACH,KAAa,EAAkC;IAC1D,OAAO,IAAI,CAACC,IAAI,CAAC;MAAEG,QAAQ,EAAEJ;IAAM,CAAC,CAAC;EACvC;EAEAK,kBAAkBA,CAACL,KAAc,EAAkC;IACjE,OAAO,IAAI,CAACC,IAAI,CAAC;MAAEK,cAAc,EAAEN;IAAM,CAAC,CAAC;EAC7C;EAEAO,oBAAoBA,CAACP,KAAc,EAAkC;IACnE,OAAO,IAAI,CAACC,IAAI,CAAC;MAAEO,gBAAgB,EAAER;IAAM,CAAC,CAAC;EAC/C;EAEAS,KAAKA,CAAA,EAA4B;IAC/B,OAAO;MAAE,GAAG,IAAI,CAACX;IAAQ,CAAC;EAC5B;EAEQG,IAAIA,CACVH,OAAgC,EACA;IAChC,OAAO,IAAIF,kCAAkC,CAAC;MAC5C,GAAG,IAAI,CAACE,OAAO;MACf,GAAGA;IACL,CAAC,CAAC;EACJ;AACF;;AAEA;AACA;AACA;AACA;AACO,MAAMY,uBAA6D,GACxEA,CAAA,KAAM,IAAId,kCAAkC,CAAC,CAAC;AAAAe,OAAA,CAAAD,uBAAA,GAAAA,uBAAA","ignoreList":[]}
+{"version":3,"names":["WixDataAggregateOptionsBuilderImpl","constructor","options","withShowDrafts","value","copy","showDrafts","withLanguage","language","withConsistentRead","consistentRead","withReturnTotalCount","returnTotalCount","build","AggregateOptionsBuilder","exports"],"sources":["../../../src/api/WixDataAggregateOptionsBuilder.ts"],"sourcesContent":["import type { WixDataAggregateOptions } from './types'\n\n/**\n * Builder for aggregate options used by Wix Data aggregate operations.\n *\n * Use this builder to configure aggregation behavior such as language, consistent reads,\n * and total counts.\n * @public\n * @builder\n * @documentationMaturity preview\n */\nexport interface WixDataAggregateOptionsBuilder {\n  /**\n   * Sets whether draft items are included in aggregation results.\n   * @internal\n   */\n  withShowDrafts(value: boolean): WixDataAggregateOptionsBuilder\n  /**\n   * Sets the language used for the aggregation.\n   */\n  withLanguage(value: string): WixDataAggregateOptionsBuilder\n  /**\n   * Sets whether the aggregation uses consistent read mode.\n   */\n  withConsistentRead(value: boolean): WixDataAggregateOptionsBuilder\n  /**\n   * Sets whether the total result count is returned with the aggregation response.\n   */\n  withReturnTotalCount(value: boolean): WixDataAggregateOptionsBuilder\n  /**\n   * Builds the aggregate options object.\n   */\n  build(): WixDataAggregateOptions\n}\n\nclass WixDataAggregateOptionsBuilderImpl\n  implements WixDataAggregateOptionsBuilder\n{\n  constructor(private readonly options: WixDataAggregateOptions = {}) {}\n\n  withShowDrafts(value: boolean): WixDataAggregateOptionsBuilder {\n    return this.copy({ showDrafts: value })\n  }\n\n  withLanguage(value: string): WixDataAggregateOptionsBuilder {\n    return this.copy({ language: value })\n  }\n\n  withConsistentRead(value: boolean): WixDataAggregateOptionsBuilder {\n    return this.copy({ consistentRead: value })\n  }\n\n  withReturnTotalCount(value: boolean): WixDataAggregateOptionsBuilder {\n    return this.copy({ returnTotalCount: value })\n  }\n\n  build(): WixDataAggregateOptions {\n    return { ...this.options }\n  }\n\n  private copy(\n    options: WixDataAggregateOptions\n  ): WixDataAggregateOptionsBuilder {\n    return new WixDataAggregateOptionsBuilderImpl({\n      ...this.options,\n      ...options,\n    })\n  }\n}\n\n/**\n * Creates a new WixData aggregate options builder.\n * @public\n * @documentationMaturity preview\n *\n * @example\n * ```ts\n * import { items, AggregateOptionsBuilder } from '@wix/data'\n *\n *\n * const options = AggregateOptionsBuilder()\n *   .withLanguage('en')\n *   .withConsistentRead(true)\n *   .withReturnTotalCount(true)\n *   .build()\n *\n * const result = await items.aggregate<MyItem>(\n *   'myCollection',\n *   {},\n *   options\n * )\n * ```\n */\nexport const AggregateOptionsBuilder: () => WixDataAggregateOptionsBuilder =\n  () => new WixDataAggregateOptionsBuilderImpl()\n"],"mappings":";;;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAyBA,MAAMA,kCAAkC,CAExC;EACEC,WAAWA,CAAkBC,OAAgC,GAAG,CAAC,CAAC,EAAE;IAAA,KAAvCA,OAAgC,GAAhCA,OAAgC;EAAQ;EAErEC,cAAcA,CAACC,KAAc,EAAkC;IAC7D,OAAO,IAAI,CAACC,IAAI,CAAC;MAAEC,UAAU,EAAEF;IAAM,CAAC,CAAC;EACzC;EAEAG,YAAYA,CAACH,KAAa,EAAkC;IAC1D,OAAO,IAAI,CAACC,IAAI,CAAC;MAAEG,QAAQ,EAAEJ;IAAM,CAAC,CAAC;EACvC;EAEAK,kBAAkBA,CAACL,KAAc,EAAkC;IACjE,OAAO,IAAI,CAACC,IAAI,CAAC;MAAEK,cAAc,EAAEN;IAAM,CAAC,CAAC;EAC7C;EAEAO,oBAAoBA,CAACP,KAAc,EAAkC;IACnE,OAAO,IAAI,CAACC,IAAI,CAAC;MAAEO,gBAAgB,EAAER;IAAM,CAAC,CAAC;EAC/C;EAEAS,KAAKA,CAAA,EAA4B;IAC/B,OAAO;MAAE,GAAG,IAAI,CAACX;IAAQ,CAAC;EAC5B;EAEQG,IAAIA,CACVH,OAAgC,EACA;IAChC,OAAO,IAAIF,kCAAkC,CAAC;MAC5C,GAAG,IAAI,CAACE,OAAO;MACf,GAAGA;IACL,CAAC,CAAC;EACJ;AACF;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMY,uBAA6D,GACxEA,CAAA,KAAM,IAAId,kCAAkC,CAAC,CAAC;AAAAe,OAAA,CAAAD,uBAAA,GAAAA,uBAAA","ignoreList":[]}

package/dist/cjs/api/WixDataApi.js

@@ -298,7 +298,7 @@ class WixDataApi {
     }));
     (0, _defineProperty2.default)(this, "queryReferenced", withArgs(async (args, collectionName, holdingItem, relationshipAttribute, options) => {
       await apiValidator().arity('queryReferenced', args, 3, 4).collectionName(collectionName).referenceParameter(holdingItem).isNonEmptyString(relationshipAttribute, 'relationshipAttribute').options(options).validateAndReject();
-      const id = itemId(holdingItem);
+      const id = toItemId(holdingItem);
       const fetch = (cursorOrOffset, returnTotalCount) => this.trace('queryReferenced', {
         collectionName,
         itemId: id,
@@ -465,8 +465,8 @@ class WixDataApi {
     return new _WixDataPatchImpl.WixDataPatchImpl({
       collectionName,
       itemId,
-      onRun: async (_args, patchParams, options) => {
-        const fieldModifications = patchParams.fieldModifications.map(this.toFieldModificationApi);
+      onRun: async (_args, patchParams, runOptions) => {
+        const apiFieldModifications = patchParams.fieldModifications.map(this.toFieldModificationApi);
         return this.trace('patch', {
           collectionName
         })(async env => {
@@ -475,9 +475,9 @@ class WixDataApi {
             dataCollectionId: patchParams.collectionName,
             patch: {
               dataItemId: patchParams.itemId,
-              fieldModifications
+              fieldModifications: apiFieldModifications
             },
-            ...toPatchOptions(options)
+            ...toPatchOptions(runOptions)
           });
           return result.dataItem ? toDataItem(result.dataItem) : null;
         });
@@ -519,8 +519,8 @@ class WixDataApi {
     return new _WixDataPatchImpl.WixDataBulkPatchImpl({
       collectionName,
       itemIds,
-      onRun: async (_args, patchParams, options) => {
-        const fieldModifications = patchParams.fieldModifications.map(this.toFieldModificationApi);
+      onRun: async (_args, patchParams, runOptions) => {
+        const apiFieldModifications = patchParams.fieldModifications.map(this.toFieldModificationApi);
         return this.trace('bulkPatch', {
           collectionName
         })(async env => {
@@ -531,9 +531,9 @@ class WixDataApi {
             dataCollectionId: patchParams.collectionName,
             patches: patchParams.itemIds.map(itemId => ({
               dataItemId: itemId,
-              fieldModifications
+              fieldModifications: apiFieldModifications
             })),
-            ...toBulkPatchOptions(options)
+            ...toBulkPatchOptions(runOptions)
           });
           return toBulkResult(itemIds, results, ['WDE0073']);
         });
@@ -591,8 +591,8 @@ class WixDataApi {
     };
     return new _WixDataQueryImpl.WixDataQueryImpl({
       collectionName,
-      onCount: async (args, params, options) => {
-        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('count', args, 0, 1).options(options).validateAndReturn()]);
+      onCount: async (args, params, countOptions) => {
+        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('count', args, 0, 1).options(countOptions).validateAndReturn()]);
         return this.trace('count', {
           collectionName
         })(async env => {
@@ -602,14 +602,14 @@ class WixDataApi {
             ...env,
             dataCollectionId: collectionName,
             filter: params.filterTree,
-            ...toReadOptions(options)
+            ...toReadOptions(countOptions)
           });
           return totalCount;
         });
       },
-      onDistinct: async (args, params, field, options) => {
+      onDistinct: async (args, params, field, distinctOptions) => {
         var _toSort$find;
-        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('distinct', args, 1, 2).fieldName(field).options(options).validateAndReturn()]);
+        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('distinct', args, 1, 2).fieldName(field).options(distinctOptions).validateAndReturn()]);
         const order = (_toSort$find = toSort(params.orderBy).find(o => o.fieldName === field)) == null ? void 0 : _toSort$find.order;
         const fetch = (cursorOrOffset, returnTotalCount) => this.trace('distinct', {
           collectionName,
@@ -621,7 +621,7 @@ class WixDataApi {
           } = await this.client.queryDistinctValues({
             ...env,
             dataCollectionId: collectionName,
-            ...toReadOptions(options),
+            ...toReadOptions(distinctOptions),
             ...toPaging(params.limitNumber, cursorOrOffset),
             ...(isOffset(cursorOrOffset) ? {
               fieldName: field,
@@ -632,11 +632,11 @@ class WixDataApi {
           });
           return [distinctValues, pagingMetadata];
         });
-        const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
+        const [items, paging] = await fetch(params.skipNumber, distinctOptions == null ? void 0 : distinctOptions.returnTotalCount);
         return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
       },
-      onFind: async (args, params, options) => {
-        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('find', args, 0, 1).options(options).validateAndReturn()]);
+      onFind: async (args, params, findOptions) => {
+        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).arity('find', args, 0, 1).options(findOptions).validateAndReturn()]);
         const fetch = (cursorOrOffset, returnTotalCount) => this.trace('query', {
           collectionName
         })(async env => {
@@ -655,7 +655,7 @@ class WixDataApi {
               } : {})
             },
             includeReferences: params.included,
-            ...toReadOptions(options),
+            ...toReadOptions(findOptions),
             ...(isOffset(cursorOrOffset) ? {
               returnTotalCount
             } : {}),
@@ -671,7 +671,7 @@ class WixDataApi {
           });
           return [dataItems.map(toDataItem), pagingMetadata];
         });
-        const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
+        const [items, paging] = await fetch(params.skipNumber, findOptions == null ? void 0 : findOptions.returnTotalCount);
         return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
       }
     });
@@ -752,8 +752,8 @@ class WixDataApi {
     };
     return new _WixDataSearchImpl.WixDataSearchImpl({
       collectionName,
-      onRun: async (params, options) => {
-        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).options(options).validateAndReturn()]);
+      onRun: async (params, searchOptions) => {
+        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).options(searchOptions).validateAndReturn()]);
         const expression = params.queryText;
         const fetch = cursorOrOffset => this.trace('search', {
           collectionName,
@@ -774,7 +774,7 @@ class WixDataApi {
               ...toPaging(params.limitNumber, cursorOrOffset)
             },
             includeReferences: params.included,
-            ...toReadOptions(options)
+            ...toReadOptions(searchOptions)
           };
           const {
             dataItems,
@@ -844,8 +844,8 @@ class WixDataApi {
     }
     return new _WixDataAggregateImpl.WixDataAggregateImpl({
       collectionName,
-      onRun: async (args, params, options) => {
-        const validationErrors = [...params.invalidArguments, ...apiValidator().arity('run', args, 0, 1).collectionName(collectionName).options(options).validateAndReturn()];
+      onRun: async (args, params, runOptions) => {
+        const validationErrors = [...params.invalidArguments, ...apiValidator().arity('run', args, 0, 1).collectionName(collectionName).options(runOptions).validateAndReturn()];
         if (validationErrors.length > 0) {
           throw (0, _errors.wdeValidationError)(_errors.messages.aggregateValidations.aggregateInvalid(collectionName, validationErrors));
         }
@@ -862,7 +862,7 @@ class WixDataApi {
             ...env,
             dataCollectionId: collectionName,
             ...toPaging(params.limitNumber, cursorOrOffset),
-            ...toReadOptions(options),
+            ...toReadOptions(runOptions),
             ...(isOffset(cursorOrOffset) ? {
               initialFilter: params.filterTree,
               aggregation: {
@@ -883,7 +883,7 @@ class WixDataApi {
           });
           return [unwrapAggregationId(results), pagingMetadata];
         });
-        const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
+        const [items, paging] = await fetch(params.skipNumber, runOptions == null ? void 0 : runOptions.returnTotalCount);
         return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
       }
     });
@@ -983,7 +983,7 @@ class WixDataApi {
   }
   async queryReferencedItems(collectionName, referringItem, referringItemFieldName, options) {
     await apiValidator().arity('queryReferencedItems', arguments, 3, 4).collectionName(collectionName).referenceParameters(asArray(referringItem)).isNonEmptyString(referringItemFieldName, 'referringItemFieldName').options(options).validateAndReject();
-    const referringItemIds = asArray(referringItem).map(itemId);
+    const referringItemIds = asArray(referringItem).map(toItemId);
     return this.trace('queryReferencedItems', {
       collectionName,
       referringItemIds,
@@ -1037,8 +1037,8 @@ class WixDataApi {
       dataCollectionId: collectionName,
       dataItemReferences: refs.map(r => ({
         referringItemFieldName: r.relationshipName,
-        referringItemId: itemId(r.left),
-        referencedItemId: itemId(r.right)
+        referringItemId: toItemId(r.left),
+        referencedItemId: toItemId(r.right)
       })),
       ...toOptions(opts)
     }));
@@ -1053,8 +1053,8 @@ class WixDataApi {
       ...env,
       dataCollectionId: collectionName,
       referringItemFieldName: relationshipAttribute,
-      referringItemId: itemId(left),
-      newReferencedItemIds: rights.map(itemId),
+      referringItemId: toItemId(left),
+      newReferencedItemIds: rights.map(toItemId),
       ...toOptions(options)
     }));
   }
@@ -1069,8 +1069,8 @@ class WixDataApi {
       dataCollectionId: collectionName,
       dataItemReferences: rights.map(r => ({
         referringItemFieldName: relationshipAttribute,
-        referringItemId: itemId(left),
-        referencedItemId: itemId(r)
+        referringItemId: toItemId(left),
+        referencedItemId: toItemId(r)
       })),
       ...toOptions(options)
     }));
@@ -1087,8 +1087,8 @@ class WixDataApi {
         ...env,
         dataCollectionId: collectionName,
         referringItemFieldName: relationshipAttribute,
-        referringItemId: itemId(left),
-        referencedItemId: itemId(right),
+        referringItemId: toItemId(left),
+        referencedItemId: toItemId(right),
         ...toReadOptions(options),
         consistentRead: options == null ? void 0 : options.consistentRead
       });
@@ -1197,7 +1197,7 @@ function toReadOptions(options) {
   };
 }
 function conditionOptions(condition) {
-  return condition != undefined ? {
+  return condition !== undefined && condition !== null ? {
     condition: {
       filter: createFilter(condition)
     }
@@ -1348,7 +1348,7 @@ function toReferencedResults(results) {
 function notEmpty(value) {
   return value != null;
 }
-function itemId(item) {
+function toItemId(item) {
   return typeof item === 'string' ? item : item._id;
 }
 function asArray(xOrXs) {