@naturalcycles/abba 2.7.2 → 2.8.0

package/dist/abba.d.ts

@@ -31,7 +31,7 @@ export declare class Abba {
      * Update experiment information, will also validate the buckets' ratio if experiment.active is true
      * Cold method.
      */
-    saveExperiment(experiment: Experiment, buckets: Unsaved<Bucket>[]): Promise<ExperimentWithBuckets>;
+    saveExperiment(experiment: Experiment, buckets: (Unsaved<Bucket> | BucketInput)[]): Promise<ExperimentWithBuckets>;
     private updateExclusions;
     softDeleteExperiment(experimentId: string): Promise<void>;
     /**

package/dist/abba.js

@@ -15,10 +15,6 @@ import { canGenerateNewAssignments, generateUserAssignmentData, getUserExclusion
  */
 const CACHE_TTL = 600_000;
 export class Abba {
-    cfg;
-    experimentDao;
-    bucketDao;
-    userAssignmentDao;
     constructor(cfg) {
         this.cfg = cfg;
         this.experimentDao = experimentDao(cfg.db);
@@ -72,7 +68,7 @@ export class Abba {
     async mergeAssignmentsForUserIds(fromUserId, intoUserId) {
         const fromAssignments = await this.userAssignmentDao.getBy('userId', fromUserId);
         const existingIntoAssignments = await this.userAssignmentDao.getBy('userId', intoUserId);
-        await pMap(fromAssignments, async from => {
+        await pMap(fromAssignments, async (from) => {
             if (!existingIntoAssignments.some(into => into.experimentId === from.experimentId)) {
                 await this.userAssignmentDao.patch(from, { userId: intoUserId });
             }
@@ -109,7 +105,7 @@ export class Abba {
             validateTotalBucketRatio(buckets);
         }
         const updatedExperiment = await this.experimentDao.save(experiment, { saveMethod: 'update' });
-        const updatedBuckets = await pMap(buckets, async bucket => {
+        const updatedBuckets = await pMap(buckets, async (bucket) => {
             return await this.bucketDao.save({ ...bucket, experimentId: updatedExperiment.id }, { saveMethod: bucket.id ? 'update' : undefined });
         });
         await this.updateExclusions(updatedExperiment.id, updatedExperiment.exclusions);
@@ -221,7 +217,7 @@ export class Abba {
      */
     async getAllExistingUserAssignments(userId) {
         const assignments = await this.userAssignmentDao.getBy('userId', userId);
-        return await pMap(assignments, async assignment => {
+        return await pMap(assignments, async (assignment) => {
             const experiment = await this.experimentDao.requireById(assignment.experimentId);
             const bucket = await this.bucketDao.getById(assignment.bucketId);
             return {
@@ -288,7 +284,7 @@ export class Abba {
     async getExperimentAssignmentStatistics(experimentId) {
         const totalAssignments = await this.userAssignmentDao.getCountByExperimentId(experimentId);
         const buckets = await this.bucketDao.getByExperimentId(experimentId);
-        const bucketAssignments = await pMap(buckets, async bucket => {
+        const bucketAssignments = await pMap(buckets, async (bucket) => {
             const totalAssignments = await this.userAssignmentDao.getCountByBucketId(bucket.id);
             return {
                 bucketId: bucket.id,

package/dist/dao/experiment.dao.js

@@ -19,11 +19,7 @@ export function experimentDao(db) {
             beforeBMToDBM: bm => ({
                 ...bm,
                 rules: bm.rules.length ? JSON.stringify(bm.rules) : null,
-                // We add the map here to account for backwards compatibility where exclusion experimentIds were stored as a number
-                // TODO: Remove after some time when we are certain only strings are stored
-                exclusions: bm.exclusions.length
-                    ? JSON.stringify(bm.exclusions.map(exclusion => exclusion.toString()))
-                    : null,
+                exclusions: bm.exclusions.length ? JSON.stringify(bm.exclusions) : null,
                 data: bm.data ? JSON.stringify(bm.data) : null,
             }),
             beforeDBMToBM: dbm => ({
@@ -31,11 +27,7 @@ export function experimentDao(db) {
                 startDateIncl: parseMySQLDate(dbm.startDateIncl),
                 endDateExcl: parseMySQLDate(dbm.endDateExcl),
                 rules: (dbm.rules && JSON.parse(dbm.rules)) || [],
-                // We add the map here to account for backwards compatibility where exclusion experimentIds were stored as a number
-                // TODO: Remove after some time when we are certain only strings are stored
-                exclusions: (dbm.exclusions &&
-                    JSON.parse(dbm.exclusions).map((exclusion) => exclusion.toString())) ||
-                    [],
+                exclusions: (dbm.exclusions && JSON.parse(dbm.exclusions)) || [],
                 data: dbm.data ? JSON.parse(dbm.data) : null,
             }),
         },

package/dist/types.js

@@ -1,5 +1,4 @@
-export { AssignmentStatus };
-var AssignmentStatus;
+export var AssignmentStatus;
 (function (AssignmentStatus) {
     /**
      * Will return existing assignments and generate new assignments
@@ -14,8 +13,7 @@ var AssignmentStatus;
      */
     AssignmentStatus[AssignmentStatus["Inactive"] = 3] = "Inactive";
 })(AssignmentStatus || (AssignmentStatus = {}));
-export { SegmentationRuleOperator };
-var SegmentationRuleOperator;
+export var SegmentationRuleOperator;
 (function (SegmentationRuleOperator) {
     SegmentationRuleOperator["IsSet"] = "isSet";
     SegmentationRuleOperator["IsNotSet"] = "isNotSet";

package/dist/util.js

@@ -93,12 +93,15 @@ export const segmentationRuleMap = {
         return !keyValue;
     },
     [SegmentationRuleOperator.EqualsText](keyValue, ruleValue) {
+        // oxlint-disable-next-line typescript/no-unnecessary-type-conversion
         return keyValue?.toString() === ruleValue.toString();
     },
     [SegmentationRuleOperator.NotEqualsText](keyValue, ruleValue) {
+        // oxlint-disable-next-line typescript/no-unnecessary-type-conversion
         return keyValue?.toString() !== ruleValue.toString();
     },
     [SegmentationRuleOperator.Semver](keyValue, ruleValue) {
+        // oxlint-disable-next-line typescript/no-unnecessary-type-conversion
         return satisfies(keyValue?.toString() || '', ruleValue.toString());
     },
     [SegmentationRuleOperator.Regex](keyValue, ruleValue) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/abba",
   "type": "module",
-  "version": "2.7.2",
+  "version": "2.8.0",
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",
@@ -11,8 +11,8 @@
   },
   "devDependencies": {
     "@types/semver": "^7",
-    "@typescript/native-preview": "7.0.0-dev.20260301.1",
-    "@naturalcycles/dev-lib": "18.4.2"
+    "@typescript/native-preview": "7.0.0-dev.20260401.1",
+    "@naturalcycles/dev-lib": "20.42.0"
   },
   "exports": {
     ".": "./dist/index.js"

package/src/abba.ts

@@ -157,7 +157,7 @@ export class Abba {
    */
   async saveExperiment(
     experiment: Experiment,
-    buckets: Unsaved<Bucket>[],
+    buckets: (Unsaved<Bucket> | BucketInput)[],
   ): Promise<ExperimentWithBuckets> {
     if (experiment.status === AssignmentStatus.Active) {
       validateTotalBucketRatio(buckets)

package/src/dao/experiment.dao.ts

@@ -26,11 +26,7 @@ export function experimentDao(db: CommonDB): ExperimentDao {
       beforeBMToDBM: bm => ({
         ...bm,
         rules: bm.rules.length ? JSON.stringify(bm.rules) : null,
-        // We add the map here to account for backwards compatibility where exclusion experimentIds were stored as a number
-        // TODO: Remove after some time when we are certain only strings are stored
-        exclusions: bm.exclusions.length
-          ? JSON.stringify(bm.exclusions.map(exclusion => exclusion.toString()))
-          : null,
+        exclusions: bm.exclusions.length ? JSON.stringify(bm.exclusions) : null,
         data: bm.data ? JSON.stringify(bm.data) : null,
       }),
       beforeDBMToBM: dbm => ({
@@ -38,12 +34,7 @@ export function experimentDao(db: CommonDB): ExperimentDao {
         startDateIncl: parseMySQLDate(dbm.startDateIncl),
         endDateExcl: parseMySQLDate(dbm.endDateExcl),
         rules: (dbm.rules && JSON.parse(dbm.rules)) || [],
-        // We add the map here to account for backwards compatibility where exclusion experimentIds were stored as a number
-        // TODO: Remove after some time when we are certain only strings are stored
-        exclusions:
-          (dbm.exclusions &&
-            JSON.parse(dbm.exclusions).map((exclusion: string | number) => exclusion.toString())) ||
-          [],
+        exclusions: (dbm.exclusions && JSON.parse(dbm.exclusions)) || [],
         data: dbm.data ? JSON.parse(dbm.data) : null,
       }),
     },

package/src/util.ts

@@ -124,12 +124,15 @@ export const segmentationRuleMap: Record<SegmentationRuleOperator, SegmentationR
     return !keyValue
   },
   [SegmentationRuleOperator.EqualsText](keyValue, ruleValue) {
+    // oxlint-disable-next-line typescript/no-unnecessary-type-conversion
     return keyValue?.toString() === ruleValue.toString()
   },
   [SegmentationRuleOperator.NotEqualsText](keyValue, ruleValue) {
+    // oxlint-disable-next-line typescript/no-unnecessary-type-conversion
     return keyValue?.toString() !== ruleValue.toString()
   },
   [SegmentationRuleOperator.Semver](keyValue, ruleValue) {
+    // oxlint-disable-next-line typescript/no-unnecessary-type-conversion
     return satisfies(keyValue?.toString() || '', ruleValue.toString())
   },
   [SegmentationRuleOperator.Regex](keyValue, ruleValue) {