@marteye/studiojs 1.1.47-beta.0 → 1.1.47

package/dist/index.esm.js

@@ -761,31 +761,25 @@ function buildExcludeFilters(filters) {
             excludeFilters.push(`productCode = "${filters.excludedProductCodes[0]}"`);
         }
         else {
-            excludeFilters.push(`(${filters.excludedProductCodes
+            excludeFilters.push(filters.excludedProductCodes
                 .map((code) => `productCode = "${code}"`)
-                .join(" OR ")})`);
+                .join(" OR "));
         }
     }
     return excludeFilters;
 }
 function buildFilterExpression(filters) {
-    let clauses = [];
+    let fixedClauses = [];
+    let alternativeGroups = [];
     if (filters.dateStart)
-        clauses.push(`saleDate >= "${filters.dateStart}"`);
+        fixedClauses.push(`saleDate >= "${filters.dateStart}"`);
     if (filters.dateEnd)
-        clauses.push(`saleDate <= "${filters.dateEnd}"`);
+        fixedClauses.push(`saleDate <= "${filters.dateEnd}"`);
     if (filters.productCodes && filters.productCodes.length > 0) {
-        if (filters.productCodes.length === 1) {
-            clauses.push(`productCode = "${filters.productCodes[0]}"`);
-        }
-        else {
-            clauses.push(`(${filters.productCodes
-                .map((code) => `productCode = "${code}"`)
-                .join(" OR ")})`);
-        }
+        alternativeGroups.push(filters.productCodes.map((code) => `productCode = "${code}"`));
     }
     if (filters.boughtOnlineOnly) {
-        clauses.push(`@boughtOnline = true`);
+        fixedClauses.push(`@boughtOnline = true`);
     }
     let breedClauses = [];
     for (let breed of filters.cattleBreeds || []) {
@@ -794,13 +788,18 @@ function buildFilterExpression(filters) {
     for (let breed of filters.sheepBreeds || []) {
         breedClauses.push(`breedOfSheep = "${breed}"`);
     }
-    if (breedClauses.length === 1) {
-        clauses.push(breedClauses[0]);
+    if (breedClauses.length > 0) {
+        alternativeGroups.push(breedClauses);
     }
-    else if (breedClauses.length > 1) {
-        clauses.push(`(${breedClauses.join(" OR ")})`);
+    let expandedBranches = alternativeGroups.reduce((branches, alternatives) => branches.flatMap((branch) => alternatives.map((alternative) => [...branch, alternative])), [[]]);
+    let expressions = expandedBranches
+        .map((branch) => [...fixedClauses, ...branch].filter(Boolean))
+        .filter((branch) => branch.length > 0)
+        .map((branch) => branch.join(" AND "));
+    if (expressions.length === 0) {
+        return undefined;
     }
-    return clauses.length > 0 ? clauses.join(" AND ") : undefined;
+    return expressions.join(" OR ");
 }
 async function resolveList(customerLists, marketId, listIdOrSlug, options) {
     let identifierType = (options === null || options === void 0 ? void 0 : options.identifierType) || "auto";

package/dist/index.js

@@ -765,31 +765,25 @@ function buildExcludeFilters(filters) {
             excludeFilters.push(`productCode = "${filters.excludedProductCodes[0]}"`);
         }
         else {
-            excludeFilters.push(`(${filters.excludedProductCodes
+            excludeFilters.push(filters.excludedProductCodes
                 .map((code) => `productCode = "${code}"`)
-                .join(" OR ")})`);
+                .join(" OR "));
         }
     }
     return excludeFilters;
 }
 function buildFilterExpression(filters) {
-    let clauses = [];
+    let fixedClauses = [];
+    let alternativeGroups = [];
     if (filters.dateStart)
-        clauses.push(`saleDate >= "${filters.dateStart}"`);
+        fixedClauses.push(`saleDate >= "${filters.dateStart}"`);
     if (filters.dateEnd)
-        clauses.push(`saleDate <= "${filters.dateEnd}"`);
+        fixedClauses.push(`saleDate <= "${filters.dateEnd}"`);
     if (filters.productCodes && filters.productCodes.length > 0) {
-        if (filters.productCodes.length === 1) {
-            clauses.push(`productCode = "${filters.productCodes[0]}"`);
-        }
-        else {
-            clauses.push(`(${filters.productCodes
-                .map((code) => `productCode = "${code}"`)
-                .join(" OR ")})`);
-        }
+        alternativeGroups.push(filters.productCodes.map((code) => `productCode = "${code}"`));
     }
     if (filters.boughtOnlineOnly) {
-        clauses.push(`@boughtOnline = true`);
+        fixedClauses.push(`@boughtOnline = true`);
     }
     let breedClauses = [];
     for (let breed of filters.cattleBreeds || []) {
@@ -798,13 +792,18 @@ function buildFilterExpression(filters) {
     for (let breed of filters.sheepBreeds || []) {
         breedClauses.push(`breedOfSheep = "${breed}"`);
     }
-    if (breedClauses.length === 1) {
-        clauses.push(breedClauses[0]);
+    if (breedClauses.length > 0) {
+        alternativeGroups.push(breedClauses);
     }
-    else if (breedClauses.length > 1) {
-        clauses.push(`(${breedClauses.join(" OR ")})`);
+    let expandedBranches = alternativeGroups.reduce((branches, alternatives) => branches.flatMap((branch) => alternatives.map((alternative) => [...branch, alternative])), [[]]);
+    let expressions = expandedBranches
+        .map((branch) => [...fixedClauses, ...branch].filter(Boolean))
+        .filter((branch) => branch.length > 0)
+        .map((branch) => branch.join(" AND "));
+    if (expressions.length === 0) {
+        return undefined;
     }
-    return clauses.length > 0 ? clauses.join(" AND ") : undefined;
+    return expressions.join(" OR ");
 }
 async function resolveList(customerLists, marketId, listIdOrSlug, options) {
     let identifierType = (options === null || options === void 0 ? void 0 : options.identifierType) || "auto";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marteye/studiojs",
-  "version": "1.1.47-beta.0",
+  "version": "1.1.47",
   "description": "MartEye Studio JavaScript SDK",
   "license": "MIT",
   "source": "src/index.ts",