@naturalcycles/abba 1.15.0 → 1.15.2

package/dist/abba.js

@@ -62,7 +62,7 @@ class Abba {
         if (experiment.status === types_1.AssignmentStatus.Active) {
             (0, util_1.validateTotalBucketRatio)(buckets);
         }
-        const updatedExperiment = await this.experimentDao.save(experiment);
+        const updatedExperiment = await this.experimentDao.save(experiment, { saveMethod: 'update' });
         const updatedBuckets = await this.bucketDao.saveBatch(buckets.map(b => ({ ...b, experimentId: experiment.id })));
         await this.updateExclusions(updatedExperiment.id, updatedExperiment.exclusions);
         return {
@@ -90,7 +90,7 @@ class Abba {
                 requiresUpdating.push(experiment);
             }
         });
-        await this.experimentDao.saveBatch(requiresUpdating);
+        await this.experimentDao.saveBatch(requiresUpdating, { saveMethod: 'update' });
     }
     /**
      * Delete an experiment. Removes all user assignments and buckets.

package/dist/dao/experiment.dao.js

@@ -11,7 +11,6 @@ const experimentDao = (db) => new ExperimentDao({
     table: 'Experiment',
     createId: false,
     idType: 'number',
-    assignGeneratedIds: true,
     hooks: {
         beforeBMToDBM: bm => ({
             ...bm,

package/dist/types.d.ts

@@ -49,9 +49,17 @@ export declare enum AssignmentStatus {
 }
 export interface SegmentationRule {
     key: string;
-    operator: '==' | '!=' | 'semver' | 'regex' | 'boolean';
+    operator: SegmentationRuleOperator;
     value: string | boolean | number;
 }
+export declare enum SegmentationRuleOperator {
+    Equals = "==",
+    NotEquals = "!=",
+    Semver = "semver",
+    Regex = "regex",
+    Boolean = "boolean"
+}
+export type SegmentationRuleFn = (segmentationProp: string | boolean | number, ruleValue: SegmentationRule['value']) => boolean;
 export interface AssignmentStatistics {
     sampled: number;
     buckets: {

package/dist/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AssignmentStatus = void 0;
+exports.SegmentationRuleOperator = exports.AssignmentStatus = void 0;
 var AssignmentStatus;
 (function (AssignmentStatus) {
     /**
@@ -16,3 +16,12 @@ var AssignmentStatus;
      */
     AssignmentStatus[AssignmentStatus["Inactive"] = 3] = "Inactive";
 })(AssignmentStatus = exports.AssignmentStatus || (exports.AssignmentStatus = {}));
+var SegmentationRuleOperator;
+(function (SegmentationRuleOperator) {
+    SegmentationRuleOperator["Equals"] = "==";
+    SegmentationRuleOperator["NotEquals"] = "!=";
+    SegmentationRuleOperator["Semver"] = "semver";
+    SegmentationRuleOperator["Regex"] = "regex";
+    /* eslint-disable id-blacklist */
+    SegmentationRuleOperator["Boolean"] = "boolean";
+})(SegmentationRuleOperator = exports.SegmentationRuleOperator || (exports.SegmentationRuleOperator = {}));

package/dist/util.d.ts

@@ -1,5 +1,5 @@
 import { Saved } from '@naturalcycles/js-lib';
-import { Bucket, ExclusionSet, Experiment, ExperimentWithBuckets, SegmentationData, SegmentationRule, UserAssignment } from './types';
+import { Bucket, ExclusionSet, Experiment, ExperimentWithBuckets, SegmentationData, SegmentationRule, SegmentationRuleFn, SegmentationRuleOperator, UserAssignment } from './types';
 /**
  * Generate a new assignment for a given user.
  * Doesn't save it.
@@ -30,9 +30,9 @@ export declare const validateTotalBucketRatio: (buckets: Bucket[]) => void;
  */
 export declare const validateSegmentationRules: (rules: SegmentationRule[], segmentationData: SegmentationData) => boolean;
 /**
- * Validate a users segmentation data against a single rule
+ * Map of segmentation rule validators
  */
-export declare const validateSegmentationRule: (rule: SegmentationRule, data: SegmentationData) => boolean;
+export declare const segmentationRuleMap: Record<SegmentationRuleOperator, SegmentationRuleFn>;
 /**
  * Returns true if an experiment is able to generate new assignments based on status and start/end dates
  */

package/dist/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserExclusionSet = exports.canGenerateNewAssignments = exports.validateSegmentationRule = exports.validateSegmentationRules = exports.validateTotalBucketRatio = exports.determineBucket = exports.determineAssignment = exports.rollDie = exports.generateUserAssignmentData = void 0;
+exports.getUserExclusionSet = exports.canGenerateNewAssignments = exports.segmentationRuleMap = exports.validateSegmentationRules = exports.validateTotalBucketRatio = exports.determineBucket = exports.determineAssignment = exports.rollDie = exports.generateUserAssignmentData = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const semver_1 = require("semver");
 const types_1 = require("./types");
@@ -81,35 +81,23 @@ exports.validateTotalBucketRatio = validateTotalBucketRatio;
  */
 const validateSegmentationRules = (rules, segmentationData) => {
     for (const rule of rules) {
-        if (!(0, exports.validateSegmentationRule)(rule, segmentationData))
+        const { key, value, operator } = rule;
+        if (!exports.segmentationRuleMap[operator](segmentationData[key], value))
             return false;
     }
     return true;
 };
 exports.validateSegmentationRules = validateSegmentationRules;
 /**
- * Validate a users segmentation data against a single rule
+ * Map of segmentation rule validators
  */
-const validateSegmentationRule = (rule, data) => {
-    const { key, value, operator } = rule;
-    if (operator === '==') {
-        return data[key] === value;
-    }
-    else if (operator === '!=') {
-        return data[key] !== value;
-    }
-    else if (operator === 'semver') {
-        return (0, semver_1.satisfies)(data[key]?.toString() || '', value.toString());
-    }
-    else if (operator === 'regex') {
-        return new RegExp(value.toString()).test(data[key]?.toString() || '');
-    }
-    else if (operator === 'boolean') {
-        return Boolean(value) === data[key];
-    }
-    return false;
+exports.segmentationRuleMap = {
+    [types_1.SegmentationRuleOperator.Equals]: (key, ruleValue) => key === ruleValue,
+    [types_1.SegmentationRuleOperator.NotEquals]: (key, ruleValue) => key !== ruleValue,
+    [types_1.SegmentationRuleOperator.Semver]: (key, ruleValue) => (0, semver_1.satisfies)(key?.toString() || '', ruleValue.toString()),
+    [types_1.SegmentationRuleOperator.Regex]: (key, ruleValue) => new RegExp(`${ruleValue}`).test(`${key || ''}`),
+    [types_1.SegmentationRuleOperator.Boolean]: (key, ruleValue) => new RegExp(`${ruleValue}`).test(`${key || ''}`),
 };
-exports.validateSegmentationRule = validateSegmentationRule;
 /**
  * Returns true if an experiment is able to generate new assignments based on status and start/end dates
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/abba",
-  "version": "1.15.0",
+  "version": "1.15.2",
   "scripts": {
     "prepare": "husky install",
     "build": "build",
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@naturalcycles/dev-lib": "^13.15.0",
-    "@types/node": "^18.11.18",
+    "@types/node": "^20.2.4",
     "@types/semver": "^7.3.9",
     "jest": "^29.3.1"
   },

package/src/abba.ts

@@ -92,7 +92,7 @@ export class Abba {
       validateTotalBucketRatio(buckets)
     }
 
-    const updatedExperiment = await this.experimentDao.save(experiment)
+    const updatedExperiment = await this.experimentDao.save(experiment, { saveMethod: 'update' })
     const updatedBuckets = await this.bucketDao.saveBatch(
       buckets.map(b => ({ ...b, experimentId: experiment.id })),
     )
@@ -132,7 +132,7 @@ export class Abba {
       }
     })
 
-    await this.experimentDao.saveBatch(requiresUpdating)
+    await this.experimentDao.saveBatch(requiresUpdating, { saveMethod: 'update' })
   }
 
   /**

package/src/dao/experiment.dao.ts

@@ -13,9 +13,8 @@ export const experimentDao = (db: CommonDB): ExperimentDao =>
   new ExperimentDao({
     db,
     table: 'Experiment',
-    createId: false, // mysql auto_increment is used instead
+    createId: false, // Always provided on create
     idType: 'number',
-    assignGeneratedIds: true,
     hooks: {
       beforeBMToDBM: bm => ({
         ...bm,

package/src/types.ts

@@ -60,10 +60,24 @@ export enum AssignmentStatus {
 
 export interface SegmentationRule {
   key: string
-  operator: '==' | '!=' | 'semver' | 'regex' | 'boolean'
+  operator: SegmentationRuleOperator
   value: string | boolean | number
 }
 
+export enum SegmentationRuleOperator {
+  Equals = '==',
+  NotEquals = '!=',
+  Semver = 'semver',
+  Regex = 'regex',
+  /* eslint-disable id-blacklist */
+  Boolean = 'boolean',
+}
+
+export type SegmentationRuleFn = (
+  segmentationProp: string | boolean | number,
+  ruleValue: SegmentationRule['value'],
+) => boolean
+
 export interface AssignmentStatistics {
   sampled: number
   buckets: {

package/src/util.ts

@@ -8,6 +8,8 @@ import {
   ExperimentWithBuckets,
   SegmentationData,
   SegmentationRule,
+  SegmentationRuleFn,
+  SegmentationRuleOperator,
   UserAssignment,
 } from './types'
 
@@ -99,31 +101,24 @@ export const validateSegmentationRules = (
   segmentationData: SegmentationData,
 ): boolean => {
   for (const rule of rules) {
-    if (!validateSegmentationRule(rule, segmentationData)) return false
+    const { key, value, operator } = rule
+    if (!segmentationRuleMap[operator](segmentationData[key], value)) return false
   }
   return true
 }
 
 /**
- * Validate a users segmentation data against a single rule
+ * Map of segmentation rule validators
  */
-export const validateSegmentationRule = (
-  rule: SegmentationRule,
-  data: SegmentationData,
-): boolean => {
-  const { key, value, operator } = rule
-  if (operator === '==') {
-    return data[key] === value
-  } else if (operator === '!=') {
-    return data[key] !== value
-  } else if (operator === 'semver') {
-    return satisfies(data[key]?.toString() || '', value.toString())
-  } else if (operator === 'regex') {
-    return new RegExp(value.toString()).test(data[key]?.toString() || '')
-  } else if (operator === 'boolean') {
-    return Boolean(value) === data[key]
-  }
-  return false
+export const segmentationRuleMap: Record<SegmentationRuleOperator, SegmentationRuleFn> = {
+  [SegmentationRuleOperator.Equals]: (key, ruleValue) => key === ruleValue,
+  [SegmentationRuleOperator.NotEquals]: (key, ruleValue) => key !== ruleValue,
+  [SegmentationRuleOperator.Semver]: (key, ruleValue) =>
+    satisfies(key?.toString() || '', ruleValue.toString()),
+  [SegmentationRuleOperator.Regex]: (key, ruleValue) =>
+    new RegExp(`${ruleValue}`).test(`${key || ''}`),
+  [SegmentationRuleOperator.Boolean]: (key, ruleValue) =>
+    new RegExp(`${ruleValue}`).test(`${key || ''}`),
 }
 
 /**