Merge pull request #352 from convertcom/fix/process-and-rules

fix/process-and-rules

Author: JosephSamirL

.release-please-manifest.json

@@ -1,7 +1,7 @@
 {
   "packages/js-sdk": "4.3.3",
   "packages/enums": "2.3.0",
-  "packages/types": "3.9.0",
+  "packages/types": "3.10.0",
   "packages/utils": "2.2.3",
   "packages/event": "2.1.3",
   "packages/bucketing": "3.1.2",

package.json

@@ -53,7 +53,8 @@
   "devDependencies": {
     "@types/eslint-plugin-mocha": "^10",
     "eslint-plugin-mocha": "^11.2.0",
-    "eslint-plugin-prettier": "^5.5.4"
+    "eslint-plugin-prettier": "^5.5.4",
+    "prettier": "^3.6.2"
   },
   "resolutions": {
     "form-data": ">=4.0.4",

packages/enums/src/dictionary.ts

@@ -54,7 +54,7 @@ export const MESSAGES = {
   SEGMENTATION_NOT_RESTRICTED: 'Segmentation not restricted',
   RULE_NOT_MATCH: 'Rule does not match',
   RULE_MATCH: 'Found matched rule at OR block #',
-  RULE_MATCH_AND: 'AND block rule macthed',
+  RULE_MATCH_AND: 'AND block rule matched',
   RULE_MATCH_START: 'About to evaluate rule #',
   LOCATION_ACTIVATED: 'Location # activated',
   LOCATION_DEACTIVATED: 'Location # deactivated',

packages/rules/src/rule-manager.ts

@@ -195,17 +195,16 @@ export class RuleManager implements RuleManagerInterface {
     ) {
       for (let i = 0, l = rulesSubset.AND.length; i < l; i++) {
         match = this._processORWHEN(data, rulesSubset.AND[i]);
-        if (match === false) {
-          return false;
+        // AND requires ALL to explicitly return true
+        if (match !== true) {
+          return match;
         }
       }
-      if (match !== false) {
-        this._loggerManager?.info?.(
-          'RuleManager._processAND()',
-          MESSAGES.RULE_MATCH_AND
-        );
-      }
-      return match;
+      this._loggerManager?.info?.(
+        'RuleManager._processAND()',
+        MESSAGES.RULE_MATCH_AND
+      );
+      return true;
     } else {
       this._loggerManager?.warn?.(
         'RuleManager._processAND()',

packages/types/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.10.0](https://github.com/convertcom/javascript-sdk/compare/js-sdk-types-v3.9.0...js-sdk-types-v3.10.0) (2025-11-12)
+
+
+### Features
+
+* automated TS Serving API update ([c363a57](https://github.com/convertcom/javascript-sdk/commit/c363a577a01bd3787b7ee1936e853608b6805e7d))
+* automated TS Serving API update ([f844627](https://github.com/convertcom/javascript-sdk/commit/f8446274208db0f241745117e3f6088fd04826bf))
+
 ## [3.9.0](https://github.com/convertcom/javascript-sdk/compare/js-sdk-types-v3.8.1...js-sdk-types-v3.9.0) (2025-09-05)
 
 

packages/types/package.json

@@ -49,7 +49,7 @@
     "typescript-eslint": "^8.46.4",
     "webpack": "^5.102.1"
   },
-  "version": "3.9.0",
+  "version": "3.10.0",
   "peerDependencies": {
     "@convertcom/js-sdk-enums": ">=2.3.0"
   }

yarn.lock

@@ -26013,6 +26013,7 @@ __metadata:
     "@types/eslint-plugin-mocha": "npm:^10"
     eslint-plugin-mocha: "npm:^11.2.0"
     eslint-plugin-prettier: "npm:^5.5.4"
+    prettier: "npm:^3.6.2"
   languageName: unknown
   linkType: soft