@thisisagile/easy-mongo 15.23.6 → 15.24.0

package/dist/MongoProvider.d.ts

@@ -1,4 +1,4 @@
-import { Condition, Database, FetchOptions, Field, Id, Json, JsonValue, LogicalCondition, OneOrMore, PageList, Sort } from '@thisisagile/easy';
+import { Condition, FetchOptions, Field, Id, Json, JsonValue, LogicalCondition, OneOrMore, PageList, Sort } from '@thisisagile/easy';
 import { AggregationCursor, Collection as MongoCollection, CreateIndexesOptions, Document, FindCursor, FindOptions as MongoFindOptions, IndexSpecification, MongoClient, StrictFilter as MongoFilter } from 'mongodb';
 import { Collection } from './Collection';
 export type Projection = Record<string, 0 | 1>;
@@ -16,13 +16,14 @@ export type IndexOptions = {
 export type Indexes = OneOrMore<string | Field | Sort | Record<string, 1 | -1>>;
 export declare class MongoProvider {
     readonly coll: Collection;
-    protected client?: Promise<MongoClient> | undefined;
     protected static readonly clients: {
-        [key: string]: Promise<MongoClient>;
+        [key: string]: MongoClient;
     };
-    constructor(coll: Collection, client?: Promise<MongoClient> | undefined);
-    static client(db: Database): Promise<MongoClient>;
+    constructor(coll: Collection);
     cluster(): Promise<MongoClient>;
+    collection<T extends Document = Document>(): Promise<MongoCollection<T>>;
+    private static connect;
+    static disconnect(): void;
     toMongoJson(query: Query): Json;
     find(query: Query, options?: FindOptions): Promise<PageList<Json>>;
     all(options?: FindOptions): Promise<PageList<Json>>;
@@ -37,7 +38,6 @@ export declare class MongoProvider {
     createIndex(indexes: Indexes, options?: IndexOptions): Promise<string>;
     createPartialIndex(indexes: Indexes, filter: Query, options?: Omit<IndexOptions, 'filter'>): Promise<string>;
     createTextIndex(indexes: OneOrMore<Field | string>, options?: IndexOptions): Promise<string>;
-    collection<T extends Document = Document>(): Promise<MongoCollection<T>>;
     protected toFindOptions(options?: FindOptions): MongoFindOptions & {
         total: boolean;
     };

package/dist/MongoProvider.js

@@ -26,30 +26,36 @@ var import_mongodb = require("mongodb");
 var import_Utils = require("./Utils");
 const omitId = (j) => import_easy.json.delete(j, "_id");
 class MongoProvider {
-  constructor(coll, client) {
+  constructor(coll) {
     this.coll = coll;
-    this.client = client;
   }
   static clients = {};
-  static client(db) {
-    return (0, import_easy.when)(db.options?.cluster).not.isDefined.reject(import_easy.Exception.IsNotValid.because("Missing cluster in database options.")).then(
-      (u) => MongoProvider.clients[u] = MongoProvider.clients[u] ?? import_mongodb.MongoClient.connect(u, {
-        auth: {
-          username: (0, import_easy.asString)(db.options?.user),
-          password: (0, import_easy.asString)(db.options?.password)
-        },
-        ...db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize },
-        ...db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize },
-        ...db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }
-      })
-    );
-  }
-  cluster() {
-    return Promise.resolve().then(() => this.client ?? (this.client = MongoProvider.client(this.coll.db))).catch((e) => {
-      this.client = void 0;
-      return (0, import_easy.reject)(e);
+  async cluster() {
+    const db = this.coll.db;
+    const c = await (0, import_easy.when)(db.options?.cluster).not.isDefined.reject(import_easy.Exception.IsNotValid.because("Missing cluster in database options."));
+    return MongoProvider.clients[c] ?? (MongoProvider.clients[c] = await MongoProvider.connect(c, db));
+  }
+  collection() {
+    return this.cluster().then((c) => c.db(this.coll.db.name)).then((db) => db.collection((0, import_easy.asString)(this.coll)));
+  }
+  static connect(u, db) {
+    return import_mongodb.MongoClient.connect(u, {
+      auth: {
+        username: (0, import_easy.asString)(db.options?.user),
+        password: (0, import_easy.asString)(db.options?.password)
+      },
+      ...db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize },
+      ...db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize },
+      ...db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }
+    }).then((c) => {
+      c.on("error", () => delete MongoProvider.clients[u]);
+      c.on("close", () => delete MongoProvider.clients[u]);
+      return c;
     });
   }
+  static disconnect() {
+    Object.values(MongoProvider.clients).forEach((c) => void c.close());
+  }
   toMongoJson(query) {
     return (0, import_Utils.toMongoType)((0, import_easy.asJson)(query));
   }
@@ -98,9 +104,6 @@ class MongoProvider {
     const ii = (0, import_easy.toArray)(indexes).reduce((i, f) => ({ ...i, [(0, import_easy.asString)(f)]: "text" }), {});
     return this.createIndex(ii, { unique: false, ...options });
   }
-  collection() {
-    return this.cluster().then((c) => c.db(this.coll.db.name)).then((db) => db.collection((0, import_easy.asString)(this.coll)));
-  }
   toFindOptions(options) {
     return {
       limit: (0, import_easy.asNumber)(options?.take ?? 250),

package/dist/MongoProvider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/MongoProvider.ts"],"sourcesContent":["import {\n  asJson,\n  asNumber,\n  asString,\n  choose,\n  Condition,\n  Database,\n  Exception,\n  FetchOptions,\n  Field,\n  Id,\n  ifTrue,\n  isArray,\n  isDefined,\n  isField,\n  isSortCondition,\n  json,\n  Json,\n  JsonValue,\n  LogicalCondition,\n  OneOrMore,\n  PageList,\n  reject,\n  Sort,\n  toArray,\n  toPageList,\n  tuple2,\n  tuple3,\n  when,\n} from '@thisisagile/easy';\nimport {\n  AggregationCursor,\n  Collection as MongoCollection,\n  CreateIndexesOptions,\n  Document,\n  FindCursor,\n  FindOptions as MongoFindOptions,\n  IndexSpecification,\n  MongoClient,\n  StrictFilter as MongoFilter,\n} from 'mongodb';\nimport { Collection } from './Collection';\nimport { toMongoType } from './Utils';\n\nconst omitId = (j: Json): Json => json.delete(j, '_id');\n\nexport type Projection = Record<string, 0 | 1>;\nexport type FindOptions = FetchOptions & { projection?: Projection };\nexport type Filter<T = unknown> = MongoFilter<T>;\nexport type Query = Condition | LogicalCondition | Filter<any>;\n\nexport type IndexOptions = {\n  unique?: boolean;\n  filter?: Query;\n  languageOverride?: string;\n  languageDefault?: string;\n};\n\nexport type Indexes = OneOrMore<string | Field | Sort | Record<string, 1 | -1>>;\n\nexport class MongoProvider {\n  protected static readonly clients: { [key: string]: Promise<MongoClient> } = {};\n\n  constructor(readonly coll: Collection, protected client?: Promise<MongoClient>) {}\n\n  static client(db: Database): Promise<MongoClient> {\n    return when(db.options?.cluster)\n      .not.isDefined.reject(Exception.IsNotValid.because('Missing cluster in database options.'))\n      .then(\n        u =>\n          (MongoProvider.clients[u] =\n            MongoProvider.clients[u] ??\n            MongoClient.connect(u, {\n              auth: {\n                username: asString(db.options?.user),\n                password: asString(db.options?.password),\n              },\n              ...(db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize }),\n              ...(db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize }),\n              ...(db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }),\n            }))\n      );\n  }\n\n  cluster(): Promise<MongoClient> {\n    return Promise.resolve()\n      .then(() => this.client ?? (this.client = MongoProvider.client(this.coll.db)))\n      .catch(e => {\n        this.client = undefined;\n        return reject(e);\n      });\n  }\n\n  toMongoJson(query: Query): Json {\n    return toMongoType(asJson(query));\n  }\n\n  find(query: Query, options?: FindOptions): Promise<PageList<Json>> {\n    return tuple3(this.collection(), this.toMongoJson(query), this.toFindOptions(options))\n      .then(([c, q, o]) =>\n        tuple2(\n          c.find(q, o),\n          ifTrue(o.total, () => c.countDocuments(q))\n        )\n      )\n      .then(([res, total]) => this.toArray(res, { ...options, total }));\n  }\n\n  all(options?: FindOptions): Promise<PageList<Json>> {\n    return this.find({}, options);\n  }\n\n  byId(id: Id, options?: FindOptions): Promise<Json> {\n    return this.collection().then(c => c.findOne(this.toMongoJson({ id: id }), this.toFindOptions(options)) as Promise<Json>);\n  }\n\n  by(key: string, value: JsonValue, options?: FindOptions): Promise<PageList<Json>> {\n    return this.find({ [key]: value }, options);\n  }\n\n  group(qs: Filter<any>[]): Promise<PageList<Json>> {\n    return this.aggregate(qs);\n  }\n\n  aggregate(qs: Filter<any>[]): Promise<PageList<Json>> {\n    return this.collection()\n      .then(c => c.aggregate(qs.map(q => this.toMongoJson(q))))\n      .then(res => this.toArray(res));\n  }\n\n  add(item: Json): Promise<Json> {\n    return this.collection()\n      .then(c => c.insertOne(omitId(item)))\n      .then(() => omitId(item));\n  }\n\n  update(item: Json): Promise<Json> {\n    return this.collection()\n      .then(c => c.updateOne(this.toMongoJson({ id: item.id }), { $set: omitId(item) }))\n      .then(() => this.byId(item.id as Id));\n  }\n\n  remove(id: Id): Promise<boolean> {\n    return this.collection()\n      .then(c => c.deleteOne(this.toMongoJson({ id })))\n      .then(d => d.acknowledged);\n  }\n\n  count(query?: Query): Promise<number> {\n    return this.collection().then(c => c.countDocuments(this.toMongoJson(query ?? {})));\n  }\n\n  createIndex(indexes: Indexes, options?: IndexOptions): Promise<string> {\n    return this.collection().then(c => c.createIndex(this.toIndexSpecification(indexes), this.toCreateIndexesOptions(options)));\n  }\n\n  createPartialIndex(indexes: Indexes, filter: Query, options?: Omit<IndexOptions, 'filter'>): Promise<string> {\n    return this.createIndex(indexes, { ...options, filter });\n  }\n\n  createTextIndex(indexes: OneOrMore<Field | string>, options?: IndexOptions): Promise<string> {\n    const ii = toArray(indexes).reduce((i, f) => ({ ...i, [asString(f)]: 'text' }), {});\n    return this.createIndex(ii, { unique: false, ...options });\n  }\n\n  collection<T extends Document = Document>(): Promise<MongoCollection<T>> {\n    return this.cluster()\n      .then(c => c.db(this.coll.db.name))\n      .then(db => db.collection<T>(asString(this.coll)));\n  }\n\n  protected toFindOptions(options?: FindOptions): MongoFindOptions & { total: boolean } {\n    return {\n      limit: asNumber(options?.take ?? 250),\n      ...(options?.skip && { skip: asNumber(options?.skip) }),\n      ...((options?.sorts && { sort: options?.sorts }) || (options?.sort && { sort: this.coll.sort(...(options?.sort ?? [])) })),\n      total: isDefined(options?.skip) || isDefined(options?.take),\n      projection: options?.projection ?? { _id: 0 },\n    };\n  }\n\n  protected toIndexSpecification(index: Indexes): IndexSpecification {\n    return choose(index)\n      .type(isField, f => f.property as IndexSpecification)\n      .type(isSortCondition, s => s.toJSON() as IndexSpecification)\n      .type(isArray, aa => aa.map(a => this.toIndexSpecification(a)) as IndexSpecification)\n      .else(i => i as IndexSpecification);\n  }\n\n  protected toCreateIndexesOptions(options?: IndexOptions): CreateIndexesOptions {\n    return {\n      unique: options?.unique ?? true,\n      ...(options?.languageOverride && { language_override: options.languageOverride }),\n      ...(options?.languageDefault && { default_language: options.languageDefault }),\n      ...(options?.filter && { partialFilterExpression: toMongoType(asJson(options.filter)) }),\n    };\n  }\n\n  protected toArray(\n    cursor: FindCursor<Document> | AggregationCursor<Document>,\n    options?: { take?: number; skip?: number; total?: number }\n  ): Promise<PageList<Json>> {\n    return cursor.toArray().then(r => toPageList<Json>(r, options));\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/MongoProvider.ts"],"sourcesContent":["import {\n  asJson,\n  asNumber,\n  asString,\n  choose,\n  Condition,\n  Database,\n  Exception,\n  FetchOptions,\n  Field,\n  Id,\n  ifTrue,\n  isArray,\n  isDefined,\n  isField,\n  isSortCondition,\n  json,\n  Json,\n  JsonValue,\n  LogicalCondition,\n  OneOrMore,\n  PageList,\n  Sort,\n  toArray,\n  toPageList,\n  tuple2,\n  tuple3,\n  when,\n} from '@thisisagile/easy';\nimport {\n  AggregationCursor,\n  Collection as MongoCollection,\n  CreateIndexesOptions,\n  Document,\n  FindCursor,\n  FindOptions as MongoFindOptions,\n  IndexSpecification,\n  MongoClient,\n  StrictFilter as MongoFilter,\n} from 'mongodb';\nimport { Collection } from './Collection';\nimport { toMongoType } from './Utils';\n\nconst omitId = (j: Json): Json => json.delete(j, '_id');\n\nexport type Projection = Record<string, 0 | 1>;\nexport type FindOptions = FetchOptions & { projection?: Projection };\nexport type Filter<T = unknown> = MongoFilter<T>;\nexport type Query = Condition | LogicalCondition | Filter<any>;\n\nexport type IndexOptions = {\n  unique?: boolean;\n  filter?: Query;\n  languageOverride?: string;\n  languageDefault?: string;\n};\n\nexport type Indexes = OneOrMore<string | Field | Sort | Record<string, 1 | -1>>;\n\nexport class MongoProvider {\n  protected static readonly clients: { [key: string]: MongoClient } = {};\n\n  constructor(readonly coll: Collection) {}\n\n  async cluster(): Promise<MongoClient> {\n    const db = this.coll.db;\n    const c = await when(db.options?.cluster).not.isDefined.reject(Exception.IsNotValid.because('Missing cluster in database options.'));\n    return MongoProvider.clients[c] ?? (MongoProvider.clients[c] = await MongoProvider.connect(c, db));\n  }\n\n  collection<T extends Document = Document>(): Promise<MongoCollection<T>> {\n    return this.cluster()\n      .then(c => c.db(this.coll.db.name))\n      .then(db => db.collection<T>(asString(this.coll)));\n  }\n\n  private static connect(u: string, db: Database) {\n    return MongoClient.connect(u, {\n      auth: {\n        username: asString(db.options?.user),\n        password: asString(db.options?.password),\n      },\n      ...(db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize }),\n      ...(db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize }),\n      ...(db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }),\n    }).then(c => {\n      c.on('error', () => delete MongoProvider.clients[u]);\n      c.on('close', () => delete MongoProvider.clients[u]);\n      return c;\n    });\n  }\n\n  static disconnect() {\n    Object.values(MongoProvider.clients).forEach(c => void c.close());\n  }\n\n  toMongoJson(query: Query): Json {\n    return toMongoType(asJson(query));\n  }\n\n  find(query: Query, options?: FindOptions): Promise<PageList<Json>> {\n    return tuple3(this.collection(), this.toMongoJson(query), this.toFindOptions(options))\n      .then(([c, q, o]) =>\n        tuple2(\n          c.find(q, o),\n          ifTrue(o.total, () => c.countDocuments(q))\n        )\n      )\n      .then(([res, total]) => this.toArray(res, { ...options, total }));\n  }\n\n  all(options?: FindOptions): Promise<PageList<Json>> {\n    return this.find({}, options);\n  }\n\n  byId(id: Id, options?: FindOptions): Promise<Json> {\n    return this.collection().then(c => c.findOne(this.toMongoJson({ id: id }), this.toFindOptions(options)) as Promise<Json>);\n  }\n\n  by(key: string, value: JsonValue, options?: FindOptions): Promise<PageList<Json>> {\n    return this.find({ [key]: value }, options);\n  }\n\n  group(qs: Filter<any>[]): Promise<PageList<Json>> {\n    return this.aggregate(qs);\n  }\n\n  aggregate(qs: Filter<any>[]): Promise<PageList<Json>> {\n    return this.collection()\n      .then(c => c.aggregate(qs.map(q => this.toMongoJson(q))))\n      .then(res => this.toArray(res));\n  }\n\n  add(item: Json): Promise<Json> {\n    return this.collection()\n      .then(c => c.insertOne(omitId(item)))\n      .then(() => omitId(item));\n  }\n\n  update(item: Json): Promise<Json> {\n    return this.collection()\n      .then(c => c.updateOne(this.toMongoJson({ id: item.id }), { $set: omitId(item) }))\n      .then(() => this.byId(item.id as Id));\n  }\n\n  remove(id: Id): Promise<boolean> {\n    return this.collection()\n      .then(c => c.deleteOne(this.toMongoJson({ id })))\n      .then(d => d.acknowledged);\n  }\n\n  count(query?: Query): Promise<number> {\n    return this.collection().then(c => c.countDocuments(this.toMongoJson(query ?? {})));\n  }\n\n  createIndex(indexes: Indexes, options?: IndexOptions): Promise<string> {\n    return this.collection().then(c => c.createIndex(this.toIndexSpecification(indexes), this.toCreateIndexesOptions(options)));\n  }\n\n  createPartialIndex(indexes: Indexes, filter: Query, options?: Omit<IndexOptions, 'filter'>): Promise<string> {\n    return this.createIndex(indexes, { ...options, filter });\n  }\n\n  createTextIndex(indexes: OneOrMore<Field | string>, options?: IndexOptions): Promise<string> {\n    const ii = toArray(indexes).reduce((i, f) => ({ ...i, [asString(f)]: 'text' }), {});\n    return this.createIndex(ii, { unique: false, ...options });\n  }\n\n  protected toFindOptions(options?: FindOptions): MongoFindOptions & { total: boolean } {\n    return {\n      limit: asNumber(options?.take ?? 250),\n      ...(options?.skip && { skip: asNumber(options?.skip) }),\n      ...((options?.sorts && { sort: options?.sorts }) || (options?.sort && { sort: this.coll.sort(...(options?.sort ?? [])) })),\n      total: isDefined(options?.skip) || isDefined(options?.take),\n      projection: options?.projection ?? { _id: 0 },\n    };\n  }\n\n  protected toIndexSpecification(index: Indexes): IndexSpecification {\n    return choose(index)\n      .type(isField, f => f.property as IndexSpecification)\n      .type(isSortCondition, s => s.toJSON() as IndexSpecification)\n      .type(isArray, aa => aa.map(a => this.toIndexSpecification(a)) as IndexSpecification)\n      .else(i => i as IndexSpecification);\n  }\n\n  protected toCreateIndexesOptions(options?: IndexOptions): CreateIndexesOptions {\n    return {\n      unique: options?.unique ?? true,\n      ...(options?.languageOverride && { language_override: options.languageOverride }),\n      ...(options?.languageDefault && { default_language: options.languageDefault }),\n      ...(options?.filter && { partialFilterExpression: toMongoType(asJson(options.filter)) }),\n    };\n  }\n\n  protected toArray(\n    cursor: FindCursor<Document> | AggregationCursor<Document>,\n    options?: { take?: number; skip?: number; total?: number }\n  ): Promise<PageList<Json>> {\n    return cursor.toArray().then(r => toPageList<Json>(r, options));\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/MongoProvider.mjs

@@ -10,7 +10,6 @@ import {
   isField,
   isSortCondition,
   json,
-  reject,
   toArray,
   toPageList,
   tuple2,
@@ -23,30 +22,36 @@ import {
 import { toMongoType } from "./Utils";
 const omitId = (j) => json.delete(j, "_id");
 class MongoProvider {
-  constructor(coll, client) {
+  constructor(coll) {
     this.coll = coll;
-    this.client = client;
   }
   static clients = {};
-  static client(db) {
-    return when(db.options?.cluster).not.isDefined.reject(Exception.IsNotValid.because("Missing cluster in database options.")).then(
-      (u) => MongoProvider.clients[u] = MongoProvider.clients[u] ?? MongoClient.connect(u, {
-        auth: {
-          username: asString(db.options?.user),
-          password: asString(db.options?.password)
-        },
-        ...db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize },
-        ...db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize },
-        ...db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }
-      })
-    );
-  }
-  cluster() {
-    return Promise.resolve().then(() => this.client ?? (this.client = MongoProvider.client(this.coll.db))).catch((e) => {
-      this.client = void 0;
-      return reject(e);
+  async cluster() {
+    const db = this.coll.db;
+    const c = await when(db.options?.cluster).not.isDefined.reject(Exception.IsNotValid.because("Missing cluster in database options."));
+    return MongoProvider.clients[c] ?? (MongoProvider.clients[c] = await MongoProvider.connect(c, db));
+  }
+  collection() {
+    return this.cluster().then((c) => c.db(this.coll.db.name)).then((db) => db.collection(asString(this.coll)));
+  }
+  static connect(u, db) {
+    return MongoClient.connect(u, {
+      auth: {
+        username: asString(db.options?.user),
+        password: asString(db.options?.password)
+      },
+      ...db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize },
+      ...db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize },
+      ...db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }
+    }).then((c) => {
+      c.on("error", () => delete MongoProvider.clients[u]);
+      c.on("close", () => delete MongoProvider.clients[u]);
+      return c;
     });
   }
+  static disconnect() {
+    Object.values(MongoProvider.clients).forEach((c) => void c.close());
+  }
   toMongoJson(query) {
     return toMongoType(asJson(query));
   }
@@ -95,9 +100,6 @@ class MongoProvider {
     const ii = toArray(indexes).reduce((i, f) => ({ ...i, [asString(f)]: "text" }), {});
     return this.createIndex(ii, { unique: false, ...options });
   }
-  collection() {
-    return this.cluster().then((c) => c.db(this.coll.db.name)).then((db) => db.collection(asString(this.coll)));
-  }
   toFindOptions(options) {
     return {
       limit: asNumber(options?.take ?? 250),

package/dist/MongoProvider.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/MongoProvider.ts"],"sourcesContent":["import {\n  asJson,\n  asNumber,\n  asString,\n  choose,\n  Condition,\n  Database,\n  Exception,\n  FetchOptions,\n  Field,\n  Id,\n  ifTrue,\n  isArray,\n  isDefined,\n  isField,\n  isSortCondition,\n  json,\n  Json,\n  JsonValue,\n  LogicalCondition,\n  OneOrMore,\n  PageList,\n  reject,\n  Sort,\n  toArray,\n  toPageList,\n  tuple2,\n  tuple3,\n  when,\n} from '@thisisagile/easy';\nimport {\n  AggregationCursor,\n  Collection as MongoCollection,\n  CreateIndexesOptions,\n  Document,\n  FindCursor,\n  FindOptions as MongoFindOptions,\n  IndexSpecification,\n  MongoClient,\n  StrictFilter as MongoFilter,\n} from 'mongodb';\nimport { Collection } from './Collection';\nimport { toMongoType } from './Utils';\n\nconst omitId = (j: Json): Json => json.delete(j, '_id');\n\nexport type Projection = Record<string, 0 | 1>;\nexport type FindOptions = FetchOptions & { projection?: Projection };\nexport type Filter<T = unknown> = MongoFilter<T>;\nexport type Query = Condition | LogicalCondition | Filter<any>;\n\nexport type IndexOptions = {\n  unique?: boolean;\n  filter?: Query;\n  languageOverride?: string;\n  languageDefault?: string;\n};\n\nexport type Indexes = OneOrMore<string | Field | Sort | Record<string, 1 | -1>>;\n\nexport class MongoProvider {\n  protected static readonly clients: { [key: string]: Promise<MongoClient> } = {};\n\n  constructor(readonly coll: Collection, protected client?: Promise<MongoClient>) {}\n\n  static client(db: Database): Promise<MongoClient> {\n    return when(db.options?.cluster)\n      .not.isDefined.reject(Exception.IsNotValid.because('Missing cluster in database options.'))\n      .then(\n        u =>\n          (MongoProvider.clients[u] =\n            MongoProvider.clients[u] ??\n            MongoClient.connect(u, {\n              auth: {\n                username: asString(db.options?.user),\n                password: asString(db.options?.password),\n              },\n              ...(db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize }),\n              ...(db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize }),\n              ...(db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }),\n            }))\n      );\n  }\n\n  cluster(): Promise<MongoClient> {\n    return Promise.resolve()\n      .then(() => this.client ?? (this.client = MongoProvider.client(this.coll.db)))\n      .catch(e => {\n        this.client = undefined;\n        return reject(e);\n      });\n  }\n\n  toMongoJson(query: Query): Json {\n    return toMongoType(asJson(query));\n  }\n\n  find(query: Query, options?: FindOptions): Promise<PageList<Json>> {\n    return tuple3(this.collection(), this.toMongoJson(query), this.toFindOptions(options))\n      .then(([c, q, o]) =>\n        tuple2(\n          c.find(q, o),\n          ifTrue(o.total, () => c.countDocuments(q))\n        )\n      )\n      .then(([res, total]) => this.toArray(res, { ...options, total }));\n  }\n\n  all(options?: FindOptions): Promise<PageList<Json>> {\n    return this.find({}, options);\n  }\n\n  byId(id: Id, options?: FindOptions): Promise<Json> {\n    return this.collection().then(c => c.findOne(this.toMongoJson({ id: id }), this.toFindOptions(options)) as Promise<Json>);\n  }\n\n  by(key: string, value: JsonValue, options?: FindOptions): Promise<PageList<Json>> {\n    return this.find({ [key]: value }, options);\n  }\n\n  group(qs: Filter<any>[]): Promise<PageList<Json>> {\n    return this.aggregate(qs);\n  }\n\n  aggregate(qs: Filter<any>[]): Promise<PageList<Json>> {\n    return this.collection()\n      .then(c => c.aggregate(qs.map(q => this.toMongoJson(q))))\n      .then(res => this.toArray(res));\n  }\n\n  add(item: Json): Promise<Json> {\n    return this.collection()\n      .then(c => c.insertOne(omitId(item)))\n      .then(() => omitId(item));\n  }\n\n  update(item: Json): Promise<Json> {\n    return this.collection()\n      .then(c => c.updateOne(this.toMongoJson({ id: item.id }), { $set: omitId(item) }))\n      .then(() => this.byId(item.id as Id));\n  }\n\n  remove(id: Id): Promise<boolean> {\n    return this.collection()\n      .then(c => c.deleteOne(this.toMongoJson({ id })))\n      .then(d => d.acknowledged);\n  }\n\n  count(query?: Query): Promise<number> {\n    return this.collection().then(c => c.countDocuments(this.toMongoJson(query ?? {})));\n  }\n\n  createIndex(indexes: Indexes, options?: IndexOptions): Promise<string> {\n    return this.collection().then(c => c.createIndex(this.toIndexSpecification(indexes), this.toCreateIndexesOptions(options)));\n  }\n\n  createPartialIndex(indexes: Indexes, filter: Query, options?: Omit<IndexOptions, 'filter'>): Promise<string> {\n    return this.createIndex(indexes, { ...options, filter });\n  }\n\n  createTextIndex(indexes: OneOrMore<Field | string>, options?: IndexOptions): Promise<string> {\n    const ii = toArray(indexes).reduce((i, f) => ({ ...i, [asString(f)]: 'text' }), {});\n    return this.createIndex(ii, { unique: false, ...options });\n  }\n\n  collection<T extends Document = Document>(): Promise<MongoCollection<T>> {\n    return this.cluster()\n      .then(c => c.db(this.coll.db.name))\n      .then(db => db.collection<T>(asString(this.coll)));\n  }\n\n  protected toFindOptions(options?: FindOptions): MongoFindOptions & { total: boolean } {\n    return {\n      limit: asNumber(options?.take ?? 250),\n      ...(options?.skip && { skip: asNumber(options?.skip) }),\n      ...((options?.sorts && { sort: options?.sorts }) || (options?.sort && { sort: this.coll.sort(...(options?.sort ?? [])) })),\n      total: isDefined(options?.skip) || isDefined(options?.take),\n      projection: options?.projection ?? { _id: 0 },\n    };\n  }\n\n  protected toIndexSpecification(index: Indexes): IndexSpecification {\n    return choose(index)\n      .type(isField, f => f.property as IndexSpecification)\n      .type(isSortCondition, s => s.toJSON() as IndexSpecification)\n      .type(isArray, aa => aa.map(a => this.toIndexSpecification(a)) as IndexSpecification)\n      .else(i => i as IndexSpecification);\n  }\n\n  protected toCreateIndexesOptions(options?: IndexOptions): CreateIndexesOptions {\n    return {\n      unique: options?.unique ?? true,\n      ...(options?.languageOverride && { language_override: options.languageOverride }),\n      ...(options?.languageDefault && { default_language: options.languageDefault }),\n      ...(options?.filter && { partialFilterExpression: toMongoType(asJson(options.filter)) }),\n    };\n  }\n\n  protected toArray(\n    cursor: FindCursor<Document> | AggregationCursor<Document>,\n    options?: { take?: number; skip?: number; total?: number }\n  ): Promise<PageList<Json>> {\n    return cursor.toArray().then(r => toPageList<Json>(r, options));\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/MongoProvider.ts"],"sourcesContent":["import {\n  asJson,\n  asNumber,\n  asString,\n  choose,\n  Condition,\n  Database,\n  Exception,\n  FetchOptions,\n  Field,\n  Id,\n  ifTrue,\n  isArray,\n  isDefined,\n  isField,\n  isSortCondition,\n  json,\n  Json,\n  JsonValue,\n  LogicalCondition,\n  OneOrMore,\n  PageList,\n  Sort,\n  toArray,\n  toPageList,\n  tuple2,\n  tuple3,\n  when,\n} from '@thisisagile/easy';\nimport {\n  AggregationCursor,\n  Collection as MongoCollection,\n  CreateIndexesOptions,\n  Document,\n  FindCursor,\n  FindOptions as MongoFindOptions,\n  IndexSpecification,\n  MongoClient,\n  StrictFilter as MongoFilter,\n} from 'mongodb';\nimport { Collection } from './Collection';\nimport { toMongoType } from './Utils';\n\nconst omitId = (j: Json): Json => json.delete(j, '_id');\n\nexport type Projection = Record<string, 0 | 1>;\nexport type FindOptions = FetchOptions & { projection?: Projection };\nexport type Filter<T = unknown> = MongoFilter<T>;\nexport type Query = Condition | LogicalCondition | Filter<any>;\n\nexport type IndexOptions = {\n  unique?: boolean;\n  filter?: Query;\n  languageOverride?: string;\n  languageDefault?: string;\n};\n\nexport type Indexes = OneOrMore<string | Field | Sort | Record<string, 1 | -1>>;\n\nexport class MongoProvider {\n  protected static readonly clients: { [key: string]: MongoClient } = {};\n\n  constructor(readonly coll: Collection) {}\n\n  async cluster(): Promise<MongoClient> {\n    const db = this.coll.db;\n    const c = await when(db.options?.cluster).not.isDefined.reject(Exception.IsNotValid.because('Missing cluster in database options.'));\n    return MongoProvider.clients[c] ?? (MongoProvider.clients[c] = await MongoProvider.connect(c, db));\n  }\n\n  collection<T extends Document = Document>(): Promise<MongoCollection<T>> {\n    return this.cluster()\n      .then(c => c.db(this.coll.db.name))\n      .then(db => db.collection<T>(asString(this.coll)));\n  }\n\n  private static connect(u: string, db: Database) {\n    return MongoClient.connect(u, {\n      auth: {\n        username: asString(db.options?.user),\n        password: asString(db.options?.password),\n      },\n      ...(db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize }),\n      ...(db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize }),\n      ...(db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }),\n    }).then(c => {\n      c.on('error', () => delete MongoProvider.clients[u]);\n      c.on('close', () => delete MongoProvider.clients[u]);\n      return c;\n    });\n  }\n\n  static disconnect() {\n    Object.values(MongoProvider.clients).forEach(c => void c.close());\n  }\n\n  toMongoJson(query: Query): Json {\n    return toMongoType(asJson(query));\n  }\n\n  find(query: Query, options?: FindOptions): Promise<PageList<Json>> {\n    return tuple3(this.collection(), this.toMongoJson(query), this.toFindOptions(options))\n      .then(([c, q, o]) =>\n        tuple2(\n          c.find(q, o),\n          ifTrue(o.total, () => c.countDocuments(q))\n        )\n      )\n      .then(([res, total]) => this.toArray(res, { ...options, total }));\n  }\n\n  all(options?: FindOptions): Promise<PageList<Json>> {\n    return this.find({}, options);\n  }\n\n  byId(id: Id, options?: FindOptions): Promise<Json> {\n    return this.collection().then(c => c.findOne(this.toMongoJson({ id: id }), this.toFindOptions(options)) as Promise<Json>);\n  }\n\n  by(key: string, value: JsonValue, options?: FindOptions): Promise<PageList<Json>> {\n    return this.find({ [key]: value }, options);\n  }\n\n  group(qs: Filter<any>[]): Promise<PageList<Json>> {\n    return this.aggregate(qs);\n  }\n\n  aggregate(qs: Filter<any>[]): Promise<PageList<Json>> {\n    return this.collection()\n      .then(c => c.aggregate(qs.map(q => this.toMongoJson(q))))\n      .then(res => this.toArray(res));\n  }\n\n  add(item: Json): Promise<Json> {\n    return this.collection()\n      .then(c => c.insertOne(omitId(item)))\n      .then(() => omitId(item));\n  }\n\n  update(item: Json): Promise<Json> {\n    return this.collection()\n      .then(c => c.updateOne(this.toMongoJson({ id: item.id }), { $set: omitId(item) }))\n      .then(() => this.byId(item.id as Id));\n  }\n\n  remove(id: Id): Promise<boolean> {\n    return this.collection()\n      .then(c => c.deleteOne(this.toMongoJson({ id })))\n      .then(d => d.acknowledged);\n  }\n\n  count(query?: Query): Promise<number> {\n    return this.collection().then(c => c.countDocuments(this.toMongoJson(query ?? {})));\n  }\n\n  createIndex(indexes: Indexes, options?: IndexOptions): Promise<string> {\n    return this.collection().then(c => c.createIndex(this.toIndexSpecification(indexes), this.toCreateIndexesOptions(options)));\n  }\n\n  createPartialIndex(indexes: Indexes, filter: Query, options?: Omit<IndexOptions, 'filter'>): Promise<string> {\n    return this.createIndex(indexes, { ...options, filter });\n  }\n\n  createTextIndex(indexes: OneOrMore<Field | string>, options?: IndexOptions): Promise<string> {\n    const ii = toArray(indexes).reduce((i, f) => ({ ...i, [asString(f)]: 'text' }), {});\n    return this.createIndex(ii, { unique: false, ...options });\n  }\n\n  protected toFindOptions(options?: FindOptions): MongoFindOptions & { total: boolean } {\n    return {\n      limit: asNumber(options?.take ?? 250),\n      ...(options?.skip && { skip: asNumber(options?.skip) }),\n      ...((options?.sorts && { sort: options?.sorts }) || (options?.sort && { sort: this.coll.sort(...(options?.sort ?? [])) })),\n      total: isDefined(options?.skip) || isDefined(options?.take),\n      projection: options?.projection ?? { _id: 0 },\n    };\n  }\n\n  protected toIndexSpecification(index: Indexes): IndexSpecification {\n    return choose(index)\n      .type(isField, f => f.property as IndexSpecification)\n      .type(isSortCondition, s => s.toJSON() as IndexSpecification)\n      .type(isArray, aa => aa.map(a => this.toIndexSpecification(a)) as IndexSpecification)\n      .else(i => i as IndexSpecification);\n  }\n\n  protected toCreateIndexesOptions(options?: IndexOptions): CreateIndexesOptions {\n    return {\n      unique: options?.unique ?? true,\n      ...(options?.languageOverride && { language_override: options.languageOverride }),\n      ...(options?.languageDefault && { default_language: options.languageDefault }),\n      ...(options?.filter && { partialFilterExpression: toMongoType(asJson(options.filter)) }),\n    };\n  }\n\n  protected toArray(\n    cursor: FindCursor<Document> | AggregationCursor<Document>,\n    options?: { take?: number; skip?: number; total?: number }\n  ): Promise<PageList<Json>> {\n    return cursor.toArray().then(r => toPageList<Json>(r, options));\n  }\n}\n"],"mappings":"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","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thisisagile/easy-mongo",
-  "version": "15.23.6",
+  "version": "15.24.0",
   "description": "Add support for MongoDB",
   "author": "Sander Hoogendoorn",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "access": "public"
   },
   "devDependencies": {
-    "@thisisagile/easy-test": "15.23.6"
+    "@thisisagile/easy-test": "15.24.0"
   },
   "dependencies": {
-    "@thisisagile/easy": "^15.23.6",
+    "@thisisagile/easy": "^15.24.0",
     "mongodb": "^5.6.0"
   }
 }

package/src/MongoProvider.ts

@@ -20,7 +20,6 @@ import {
   LogicalCondition,
   OneOrMore,
   PageList,
-  reject,
   Sort,
   toArray,
   toPageList,
@@ -59,36 +58,40 @@ export type IndexOptions = {
 export type Indexes = OneOrMore<string | Field | Sort | Record<string, 1 | -1>>;
 
 export class MongoProvider {
-  protected static readonly clients: { [key: string]: Promise<MongoClient> } = {};
-
-  constructor(readonly coll: Collection, protected client?: Promise<MongoClient>) {}
-
-  static client(db: Database): Promise<MongoClient> {
-    return when(db.options?.cluster)
-      .not.isDefined.reject(Exception.IsNotValid.because('Missing cluster in database options.'))
-      .then(
-        u =>
-          (MongoProvider.clients[u] =
-            MongoProvider.clients[u] ??
-            MongoClient.connect(u, {
-              auth: {
-                username: asString(db.options?.user),
-                password: asString(db.options?.password),
-              },
-              ...(db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize }),
-              ...(db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize }),
-              ...(db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }),
-            }))
-      );
-  }
-
-  cluster(): Promise<MongoClient> {
-    return Promise.resolve()
-      .then(() => this.client ?? (this.client = MongoProvider.client(this.coll.db)))
-      .catch(e => {
-        this.client = undefined;
-        return reject(e);
-      });
+  protected static readonly clients: { [key: string]: MongoClient } = {};
+
+  constructor(readonly coll: Collection) {}
+
+  async cluster(): Promise<MongoClient> {
+    const db = this.coll.db;
+    const c = await when(db.options?.cluster).not.isDefined.reject(Exception.IsNotValid.because('Missing cluster in database options.'));
+    return MongoProvider.clients[c] ?? (MongoProvider.clients[c] = await MongoProvider.connect(c, db));
+  }
+
+  collection<T extends Document = Document>(): Promise<MongoCollection<T>> {
+    return this.cluster()
+      .then(c => c.db(this.coll.db.name))
+      .then(db => db.collection<T>(asString(this.coll)));
+  }
+
+  private static connect(u: string, db: Database) {
+    return MongoClient.connect(u, {
+      auth: {
+        username: asString(db.options?.user),
+        password: asString(db.options?.password),
+      },
+      ...(db.options?.maxPoolSize && { maxPoolSize: db.options?.maxPoolSize }),
+      ...(db.options?.minPoolSize && { minPoolSize: db.options?.minPoolSize }),
+      ...(db.options?.maxIdleTimeMS && { maxIdleTimeMS: db.options?.maxIdleTimeMS }),
+    }).then(c => {
+      c.on('error', () => delete MongoProvider.clients[u]);
+      c.on('close', () => delete MongoProvider.clients[u]);
+      return c;
+    });
+  }
+
+  static disconnect() {
+    Object.values(MongoProvider.clients).forEach(c => void c.close());
   }
 
   toMongoJson(query: Query): Json {
@@ -163,12 +166,6 @@ export class MongoProvider {
     return this.createIndex(ii, { unique: false, ...options });
   }
 
-  collection<T extends Document = Document>(): Promise<MongoCollection<T>> {
-    return this.cluster()
-      .then(c => c.db(this.coll.db.name))
-      .then(db => db.collection<T>(asString(this.coll)));
-  }
-
   protected toFindOptions(options?: FindOptions): MongoFindOptions & { total: boolean } {
     return {
       limit: asNumber(options?.take ?? 250),