@wix/wix-data-items-common 1.0.289 → 1.0.291

package/dist/cjs/api/WixDataApi.js

@@ -244,49 +244,6 @@ class WixDataApi {
         }
       });
     });
-    (0, _defineProperty2.default)(this, "search", collectionName => {
-      const ensureValidQuery = invalidArgs => {
-        if (invalidArgs.length > 0) {
-          throw (0, _errors.wdeValidationError)(_errors.messages.queryValidations.queryInvalid(collectionName, invalidArgs));
-        }
-      };
-      return new _WixDataSearchImpl.WixDataSearchImpl({
-        collectionName,
-        onRun: async (params, options) => {
-          ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).options(options).validateAndReturn()]);
-          const expression = params.queryText;
-          const fetch = cursorOrOffset => this.trace('search', {
-            collectionName,
-            expression
-          })(async env => {
-            const request = {
-              ...env,
-              dataCollectionId: collectionName,
-              search: {
-                filter: params.filterTree,
-                sort: toSort(params.orderBy),
-                fields: params.projectedFields,
-                search: {
-                  expression: params.queryText,
-                  fuzzy: params.isFuzzy,
-                  mode: params.searchMode
-                },
-                ...toPaging(params.limitNumber, cursorOrOffset)
-              },
-              includeReferences: params.included,
-              ...toReadOptions(options)
-            };
-            const {
-              dataItems,
-              pagingMetadata
-            } = await this.client.searchDataItems(request);
-            return [dataItems.map(toDataItem), pagingMetadata];
-          });
-          const [items, paging] = await fetch(params.skipNumber);
-          return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
-        }
-      });
-    });
     // NOTE find method is not implemented
     (0, _defineProperty2.default)(this, "fetch", withArgs(async (args, collectionName, cursor, limit, options) => {
       await apiValidator().arity('fetch', args, 2, 4).collectionName(collectionName).isNonEmptyString(cursor, 'cursor').validateAndReject();
@@ -313,54 +270,6 @@ class WixDataApi {
         skipNumber: 0
       });
     }));
-    // --- aggregate ---
-    (0, _defineProperty2.default)(this, "aggregate", collectionName => {
-      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()];
-          if (validationErrors.length > 0) {
-            throw (0, _errors.wdeValidationError)(_errors.messages.aggregateValidations.aggregateInvalid(collectionName, validationErrors));
-          }
-          const fetch = (cursorOrOffset, returnTotalCount) => this.trace('aggregate', {
-            collectionName
-          })(async env => {
-            const toOperation = field => field ? {
-              itemFieldName: field
-            } : undefined;
-            const {
-              results,
-              pagingMetadata
-            } = await this.client.aggregateDataItems({
-              ...env,
-              dataCollectionId: collectionName,
-              ...toPaging(params.limitNumber, cursorOrOffset),
-              ...toReadOptions(options),
-              ...(isOffset(cursorOrOffset) ? {
-                initialFilter: params.filterTree,
-                aggregation: {
-                  groupingFields: params.groupBy,
-                  operations: params.aggregates.map(a => ({
-                    resultFieldName: a.name,
-                    average: toOperation(a.avg),
-                    min: toOperation(a.min),
-                    max: toOperation(a.max),
-                    sum: toOperation(a.sum),
-                    itemCount: a.count ? {} : undefined
-                  }))
-                },
-                finalFilter: params.havingTree,
-                sort: toSort(params.orderBy),
-                returnTotalCount
-              } : {})
-            });
-            return [unwrapAggregationId(results), pagingMetadata];
-          });
-          const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
-          return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
-        }
-      });
-    });
     (0, _defineProperty2.default)(this, "fetchAggregate", withArgs(async (args, collectionName, cursor, limit, options) => {
       await apiValidator().arity('fetchAggregate', args, 2, 4).collectionName(collectionName).isNonEmptyString(cursor, 'cursor').validateAndReject();
       const fetch = cursorOrOffset => this.trace('aggregate', {
@@ -821,6 +730,176 @@ class WixDataApi {
       skipNumber: offset
     });
   }
+
+  /**
+   * Returns a search builder for the specified collection.
+   * @param collectionName - Name of the collection to search.
+   * @returns A `WixDataSearch` builder object.
+   */
+
+  /**
+   * Executes a search directly without using the builder pattern.
+   * @internal
+   * @param collectionName - Name of the collection to search.
+   * @param searchRequest - Search parameters including expression, filter, sort, and paging.
+   * @param options - Additional options including referencedItemOptions.
+   * @returns Promise that resolves to the search results.
+   */
+
+  search(collectionName, searchRequest, options) {
+    if (searchRequest !== undefined) {
+      return this.executeDirectSearch(collectionName, searchRequest, options);
+    }
+    const ensureValidQuery = invalidArgs => {
+      if (invalidArgs.length > 0) {
+        throw (0, _errors.wdeValidationError)(_errors.messages.queryValidations.queryInvalid(collectionName, invalidArgs));
+      }
+    };
+    return new _WixDataSearchImpl.WixDataSearchImpl({
+      collectionName,
+      onRun: async (params, options) => {
+        ensureValidQuery([...params.invalidArguments, ...apiValidator().collectionName(collectionName).options(options).validateAndReturn()]);
+        const expression = params.queryText;
+        const fetch = cursorOrOffset => this.trace('search', {
+          collectionName,
+          expression
+        })(async env => {
+          const request = {
+            ...env,
+            dataCollectionId: collectionName,
+            search: {
+              filter: params.filterTree,
+              sort: toSort(params.orderBy),
+              fields: params.projectedFields,
+              search: {
+                expression: params.queryText,
+                fuzzy: params.isFuzzy,
+                mode: params.searchMode
+              },
+              ...toPaging(params.limitNumber, cursorOrOffset)
+            },
+            includeReferences: params.included,
+            ...toReadOptions(options)
+          };
+          const {
+            dataItems,
+            pagingMetadata
+          } = await this.client.searchDataItems(request);
+          return [dataItems.map(toDataItem), pagingMetadata];
+        });
+        const [items, paging] = await fetch(params.skipNumber);
+        return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
+      }
+    });
+  }
+  async executeDirectSearch(collectionName, request, options) {
+    var _request$paging3, _request$cursorPaging3, _request$paging4, _request$cursorPaging4, _options$includeRefer2;
+    const validationErrors = apiValidator().collectionName(collectionName).options(options).validateAndReturn();
+    if (validationErrors.length > 0) {
+      throw (0, _errors.wdeValidationError)(_errors.messages.queryValidations.queryInvalid(collectionName, validationErrors));
+    }
+    const limit = ((_request$paging3 = request.paging) == null ? void 0 : _request$paging3.limit) ?? ((_request$cursorPaging3 = request.cursorPaging) == null ? void 0 : _request$cursorPaging3.limit);
+    const offset = ((_request$paging4 = request.paging) == null ? void 0 : _request$paging4.offset) ?? 0;
+    const cursor = (_request$cursorPaging4 = request.cursorPaging) == null ? void 0 : _request$cursorPaging4.cursor;
+    const includeReferences = options == null || (_options$includeRefer2 = options.includeReferences) == null ? void 0 : _options$includeRefer2.map(inc => ({
+      field: inc.field,
+      limit: inc.limit
+    }));
+    const fetch = cursorOrOffset => this.trace('search', {
+      collectionName,
+      expression: request.expression
+    })(async env => {
+      var _request$sort;
+      const {
+        dataItems,
+        pagingMetadata
+      } = await this.client.searchDataItems({
+        ...env,
+        dataCollectionId: collectionName,
+        search: {
+          fields: request.fields,
+          filter: request.filter,
+          sort: (_request$sort = request.sort) == null ? void 0 : _request$sort.map(s => ({
+            fieldName: s.fieldName,
+            order: s.order
+          })),
+          search: {
+            expression: request.expression,
+            fuzzy: request.fuzzy,
+            mode: request.mode
+          },
+          ...toPaging(limit, cursorOrOffset)
+        },
+        includeReferences,
+        ...toReadOptions(options)
+      });
+      return [dataItems.map(toDataItem), pagingMetadata];
+    });
+    const [items, paging] = await fetch(cursor ?? offset);
+    return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, {
+      collectionName,
+      limitNumber: limit,
+      skipNumber: offset
+    });
+  } // --- aggregate ---
+  /**
+   * Executes an aggregation pipeline directly on a data collection.
+   * @internal
+   * @param collectionName - Name of the collection to run the aggregation on.
+   * @param pipeline - Aggregation pipeline with stages and paging.
+   * @param options - Options for running the aggregation.
+   * @returns Promise that resolves to the aggregation results.
+   */
+  aggregate(collectionName, pipeline, options) {
+    if (pipeline !== undefined) {
+      return this.aggregatePipeline(collectionName, pipeline, options);
+    }
+    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()];
+        if (validationErrors.length > 0) {
+          throw (0, _errors.wdeValidationError)(_errors.messages.aggregateValidations.aggregateInvalid(collectionName, validationErrors));
+        }
+        const fetch = (cursorOrOffset, returnTotalCount) => this.trace('aggregate', {
+          collectionName
+        })(async env => {
+          const toOperation = field => field ? {
+            itemFieldName: field
+          } : undefined;
+          const {
+            results,
+            pagingMetadata
+          } = await this.client.aggregateDataItems({
+            ...env,
+            dataCollectionId: collectionName,
+            ...toPaging(params.limitNumber, cursorOrOffset),
+            ...toReadOptions(options),
+            ...(isOffset(cursorOrOffset) ? {
+              initialFilter: params.filterTree,
+              aggregation: {
+                groupingFields: params.groupBy,
+                operations: params.aggregates.map(a => ({
+                  resultFieldName: a.name,
+                  average: toOperation(a.avg),
+                  min: toOperation(a.min),
+                  max: toOperation(a.max),
+                  sum: toOperation(a.sum),
+                  itemCount: a.count ? {} : undefined
+                }))
+              },
+              finalFilter: params.havingTree,
+              sort: toSort(params.orderBy),
+              returnTotalCount
+            } : {})
+          });
+          return [unwrapAggregationId(results), pagingMetadata];
+        });
+        const [items, paging] = await fetch(params.skipNumber, options == null ? void 0 : options.returnTotalCount);
+        return new _WixDataResultImpl.WixDataResultImpl(items, paging, fetch, params);
+      }
+    });
+  }
   async runBulkSave(env, collectionName, items, options, overrideExisting = true) {
     const request = {
       ...env,