@naturalcycles/abba 2.3.3 → 2.5.0

package/dist/abba.d.ts

@@ -1,4 +1,4 @@
-import type { Unsaved } from '@naturalcycles/js-lib';
+import type { Unsaved } from '@naturalcycles/js-lib/types';
 import { type GetAllExperimentsOpts } from './dao/experiment.dao.js';
 import type { AbbaConfig, Bucket, DecoratedUserAssignment, Experiment, ExperimentAssignmentStatistics, ExperimentWithBuckets, SegmentationData, UserExperiment } from './types.js';
 export declare class Abba {

package/dist/abba.js

@@ -1,6 +1,10 @@
 import { __decorate } from "tslib";
-import { _assert, _Memo, _shuffle, localTime, pMap } from '@naturalcycles/js-lib';
-import { LRUMemoCache } from '@naturalcycles/nodejs-lib';
+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 { LRUMemoCache } from '@naturalcycles/nodejs-lib/lruMemoCache';
 import { bucketDao } from './dao/bucket.dao.js';
 import { experimentDao } from './dao/experiment.dao.js';
 import { userAssignmentDao } from './dao/userAssignment.dao.js';

package/dist/dao/bucket.dao.d.ts

@@ -1,5 +1,5 @@
 import type { CommonDB } from '@naturalcycles/db-lib';
-import { CommonDao } from '@naturalcycles/db-lib';
+import { CommonDao } from '@naturalcycles/db-lib/dao';
 import type { BaseBucket, Bucket } from '../types.js';
 type BucketDBM = BaseBucket & {
     data: string | null;

package/dist/dao/bucket.dao.js

@@ -1,4 +1,4 @@
-import { CommonDao } from '@naturalcycles/db-lib';
+import { CommonDao } from '@naturalcycles/db-lib/dao';
 export class BucketDao extends CommonDao {
     async getByExperimentId(experimentId) {
         return await this.query().filterEq('experimentId', experimentId).runQuery();

package/dist/dao/experiment.dao.d.ts

@@ -1,5 +1,5 @@
 import type { CommonDB } from '@naturalcycles/db-lib';
-import { CommonDao } from '@naturalcycles/db-lib';
+import { CommonDao } from '@naturalcycles/db-lib/dao';
 import type { BaseExperiment, Experiment } from '../types.js';
 export declare class ExperimentDao extends CommonDao<Experiment, ExperimentDBM> {
     getAllExperiments(opt?: GetAllExperimentsOpts): Promise<Experiment[]>;

package/dist/dao/experiment.dao.js

@@ -1,5 +1,5 @@
-import { CommonDao } from '@naturalcycles/db-lib';
-import { localDate } from '@naturalcycles/js-lib';
+import { CommonDao } from '@naturalcycles/db-lib/dao';
+import { localDate } from '@naturalcycles/js-lib/datetime';
 export class ExperimentDao extends CommonDao {
     async getAllExperiments(opt) {
         if (!opt?.includeDeleted) {

package/dist/dao/userAssignment.dao.d.ts

@@ -1,5 +1,5 @@
 import type { CommonDB } from '@naturalcycles/db-lib';
-import { CommonDao } from '@naturalcycles/db-lib';
+import { CommonDao } from '@naturalcycles/db-lib/dao';
 import type { UserAssignment } from '../types.js';
 export declare class UserAssignmentDao extends CommonDao<UserAssignment> {
     getUserAssignmentByExperimentId(userId: string, experimentId: string): Promise<UserAssignment | null>;

package/dist/dao/userAssignment.dao.js

@@ -1,4 +1,4 @@
-import { CommonDao } from '@naturalcycles/db-lib';
+import { CommonDao } from '@naturalcycles/db-lib/dao';
 export class UserAssignmentDao extends CommonDao {
     async getUserAssignmentByExperimentId(userId, experimentId) {
         const query = this.query().filterEq('userId', userId).filterEq('experimentId', experimentId);

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import type { CommonDB } from '@naturalcycles/db-lib';
-import type { AnyObject, BaseDBEntity, IsoDate } from '@naturalcycles/js-lib';
+import type { AnyObject, BaseDBEntity, IsoDate } from '@naturalcycles/js-lib/types';
 export interface AbbaConfig {
     db: CommonDB;
 }

package/dist/util.d.ts

@@ -1,4 +1,4 @@
-import type { Unsaved } from '@naturalcycles/js-lib';
+import type { Unsaved } from '@naturalcycles/js-lib/types';
 import type { Bucket, ExclusionSet, Experiment, ExperimentWithBuckets, SegmentationData, SegmentationRule, SegmentationRuleFn, UserAssignment, UserExperiment } from './types.js';
 import { SegmentationRuleOperator } from './types.js';
 /**

package/dist/util.js

@@ -1,4 +1,4 @@
-import { localDate } from '@naturalcycles/js-lib';
+import { localDate } from '@naturalcycles/js-lib/datetime';
 import { satisfies } from 'semver';
 import { AssignmentStatus, SegmentationRuleOperator } from './types.js';
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/abba",
   "type": "module",
-  "version": "2.3.3",
+  "version": "2.5.0",
   "dependencies": {
     "@naturalcycles/db-lib": "^10",
     "@naturalcycles/js-lib": "^15",

package/src/abba.ts

@@ -1,6 +1,10 @@
-import type { Unsaved } from '@naturalcycles/js-lib'
-import { _assert, _Memo, _shuffle, localTime, pMap } from '@naturalcycles/js-lib'
-import { LRUMemoCache } from '@naturalcycles/nodejs-lib'
+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 type { Unsaved } from '@naturalcycles/js-lib/types'
+import { LRUMemoCache } from '@naturalcycles/nodejs-lib/lruMemoCache'
 import { bucketDao } from './dao/bucket.dao.js'
 import { experimentDao, type GetAllExperimentsOpts } from './dao/experiment.dao.js'
 import { userAssignmentDao } from './dao/userAssignment.dao.js'

package/src/dao/bucket.dao.ts

@@ -1,5 +1,5 @@
 import type { CommonDB } from '@naturalcycles/db-lib'
-import { CommonDao } from '@naturalcycles/db-lib'
+import { CommonDao } from '@naturalcycles/db-lib/dao'
 import type { BaseBucket, Bucket } from '../types.js'
 
 type BucketDBM = BaseBucket & {

package/src/dao/experiment.dao.ts

@@ -1,7 +1,7 @@
 import type { CommonDB } from '@naturalcycles/db-lib'
-import { CommonDao } from '@naturalcycles/db-lib'
-import type { IsoDate } from '@naturalcycles/js-lib'
-import { localDate } from '@naturalcycles/js-lib'
+import { CommonDao } from '@naturalcycles/db-lib/dao'
+import { localDate } from '@naturalcycles/js-lib/datetime'
+import type { IsoDate } from '@naturalcycles/js-lib/types'
 import type { BaseExperiment, Experiment } from '../types.js'
 
 export class ExperimentDao extends CommonDao<Experiment, ExperimentDBM> {

package/src/dao/userAssignment.dao.ts

@@ -1,5 +1,5 @@
 import type { CommonDB } from '@naturalcycles/db-lib'
-import { CommonDao } from '@naturalcycles/db-lib'
+import { CommonDao } from '@naturalcycles/db-lib/dao'
 import type { UserAssignment } from '../types.js'
 
 export class UserAssignmentDao extends CommonDao<UserAssignment> {

package/src/types.ts

@@ -1,5 +1,5 @@
 import type { CommonDB } from '@naturalcycles/db-lib'
-import type { AnyObject, BaseDBEntity, IsoDate } from '@naturalcycles/js-lib'
+import type { AnyObject, BaseDBEntity, IsoDate } from '@naturalcycles/js-lib/types'
 
 export interface AbbaConfig {
   db: CommonDB

package/src/util.ts

@@ -1,5 +1,5 @@
-import type { Unsaved } from '@naturalcycles/js-lib'
-import { localDate } from '@naturalcycles/js-lib'
+import { localDate } from '@naturalcycles/js-lib/datetime'
+import type { Unsaved } from '@naturalcycles/js-lib/types'
 import { satisfies } from 'semver'
 import type {
   Bucket,