@naturalcycles/abba 2.5.0 → 2.7.0

package/dist/abba.js

@@ -1,9 +1,9 @@
 import { __decorate } from "tslib";
-import { _shuffle } from '@naturalcycles/js-lib';
-import { localTime } from '@naturalcycles/js-lib/datetime';
-import { _Memo } from '@naturalcycles/js-lib/decorators';
-import { _assert } from '@naturalcycles/js-lib/error';
-import { pMap } from '@naturalcycles/js-lib/promise';
+import { _shuffle } from '@naturalcycles/js-lib/array/array.util.js';
+import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js';
+import { _Memo } from '@naturalcycles/js-lib/decorators/memo.decorator.js';
+import { _assert } from '@naturalcycles/js-lib/error/assert.js';
+import { pMap } from '@naturalcycles/js-lib/promise/pMap.js';
 import { LRUMemoCache } from '@naturalcycles/nodejs-lib/lruMemoCache';
 import { bucketDao } from './dao/bucket.dao.js';
 import { experimentDao } from './dao/experiment.dao.js';

package/dist/types.d.ts

@@ -88,7 +88,9 @@ export declare enum SegmentationRuleOperator {
     NotEqualsText = "notEqualsText",
     Semver = "semver",
     Regex = "regex",
-    Boolean = "boolean"
+    Boolean = "boolean",
+    GreaterThan = "greaterThan",
+    LessThan = "lessThan"
 }
 export type SegmentationRuleFn = (segmentationProp: string | boolean | number | null | undefined, ruleValue: SegmentationRule['value']) => boolean;
 export interface ExperimentAssignmentStatistics {

package/dist/types.js

@@ -21,6 +21,8 @@ export var SegmentationRuleOperator;
     SegmentationRuleOperator["NotEqualsText"] = "notEqualsText";
     SegmentationRuleOperator["Semver"] = "semver";
     SegmentationRuleOperator["Regex"] = "regex";
-    /* eslint-disable id-blacklist*/
+    /* eslint-disable id-denylist */
     SegmentationRuleOperator["Boolean"] = "boolean";
+    SegmentationRuleOperator["GreaterThan"] = "greaterThan";
+    SegmentationRuleOperator["LessThan"] = "lessThan";
 })(SegmentationRuleOperator || (SegmentationRuleOperator = {}));

package/dist/util.js

@@ -111,6 +111,16 @@ export const segmentationRuleMap = {
         // Anything else cannot be true
         return keyValue?.toString() !== 'true';
     },
+    [SegmentationRuleOperator.GreaterThan](keyValue, ruleValue) {
+        if (keyValue === null || keyValue === undefined)
+            return false;
+        return keyValue > ruleValue;
+    },
+    [SegmentationRuleOperator.LessThan](keyValue, ruleValue) {
+        if (keyValue === null || keyValue === undefined)
+            return false;
+        return keyValue < ruleValue;
+    },
 };
 /**
  * Returns true if an experiment is able to generate new assignments based on status and start/end dates

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/abba",
   "type": "module",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",
@@ -10,8 +10,8 @@
     "tslib": "^2"
   },
   "devDependencies": {
-    "@naturalcycles/dev-lib": "*",
-    "@types/semver": "^7"
+    "@types/semver": "^7",
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js"

package/src/abba.ts

@@ -1,8 +1,8 @@
-import { _shuffle } from '@naturalcycles/js-lib'
-import { localTime } from '@naturalcycles/js-lib/datetime'
-import { _Memo } from '@naturalcycles/js-lib/decorators'
-import { _assert } from '@naturalcycles/js-lib/error'
-import { pMap } from '@naturalcycles/js-lib/promise'
+import { _shuffle } from '@naturalcycles/js-lib/array/array.util.js'
+import { localTime } from '@naturalcycles/js-lib/datetime/localTime.js'
+import { _Memo } from '@naturalcycles/js-lib/decorators/memo.decorator.js'
+import { _assert } from '@naturalcycles/js-lib/error/assert.js'
+import { pMap } from '@naturalcycles/js-lib/promise/pMap.js'
 import type { Unsaved } from '@naturalcycles/js-lib/types'
 import { LRUMemoCache } from '@naturalcycles/nodejs-lib/lruMemoCache'
 import { bucketDao } from './dao/bucket.dao.js'

package/src/types.ts

@@ -100,8 +100,10 @@ export enum SegmentationRuleOperator {
   NotEqualsText = 'notEqualsText',
   Semver = 'semver',
   Regex = 'regex',
-  /* eslint-disable id-blacklist*/
+  /* eslint-disable id-denylist */
   Boolean = 'boolean',
+  GreaterThan = 'greaterThan',
+  LessThan = 'lessThan',
 }
 
 export type SegmentationRuleFn = (

package/src/util.ts

@@ -140,6 +140,14 @@ export const segmentationRuleMap: Record<SegmentationRuleOperator, SegmentationR
     // Anything else cannot be true
     return keyValue?.toString() !== 'true'
   },
+  [SegmentationRuleOperator.GreaterThan](keyValue, ruleValue) {
+    if (keyValue === null || keyValue === undefined) return false
+    return keyValue > ruleValue
+  },
+  [SegmentationRuleOperator.LessThan](keyValue, ruleValue) {
+    if (keyValue === null || keyValue === undefined) return false
+    return keyValue < ruleValue
+  },
 }
 
 /**

package/dist/migrations/init.sql

@@ -1,54 +0,0 @@
--- CreateTable
-CREATE TABLE IF NOT EXISTS `Bucket` (
-    `id` VARCHAR(50) NOT NULL,
-    `experimentId` VARCHAR(50) NOT NULL,
-    `key` VARCHAR(10) NOT NULL,
-    `ratio` INTEGER NOT NULL,
-    `data` JSON NULL,
-    `created` INT NOT NULL,
-    `updated` INT NOT NULL,
-
-    PRIMARY KEY (`id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-
--- CreateTable
-CREATE TABLE IF NOT EXISTS `Experiment` (
-    `id` VARCHAR(50) NOT NULL,
-    `key` VARCHAR(50) NOT NULL,
-    `status` INTEGER NOT NULL,
-    `sampling` INTEGER NOT NULL,
-    `description` VARCHAR(240) NULL,
-    `startDateIncl` DATE NOT NULL,
-    `endDateExcl` DATE NOT NULL,
-    `created` INT NOT NULL,
-    `updated` INT NOT NULL,
-    `rules` JSON NULL,
-    `exclusions` JSON NULL,
-    `data` JSON NULL,
-    `deleted` BOOLEAN NOT NULL DEFAULT FALSE,
-
-    PRIMARY KEY (`id`),
-    UNIQUE INDEX `key_unique` (`key`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-
--- CreateTable
-CREATE TABLE IF NOT EXISTS `UserAssignment` (
-    `id` VARCHAR(50) NOT NULL,
-    `userId` VARCHAR(191) NOT NULL,
-    `experimentId` VARCHAR(50) NOT NULL,
-    `bucketId` VARCHAR(50) NULL,
-    `created` INT NOT NULL,
-    `updated` INT NOT NULL,
-
-    UNIQUE INDEX `UserAssignment_userId_experimentId_key`(`userId`, `experimentId`),
-    PRIMARY KEY (`id`)
-) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-
--- AddForeignKey
-ALTER TABLE `Bucket` ADD CONSTRAINT `Bucket_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`);
-
--- AddForeignKey
-ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_bucketId_fkey` FOREIGN KEY (`bucketId`) REFERENCES `Bucket`(`id`);
-
--- AddForeignKey
-ALTER TABLE `UserAssignment` ADD CONSTRAINT `UserAssignment_experimentId_fkey` FOREIGN KEY (`experimentId`) REFERENCES `Experiment`(`id`);