@thisisagile/easy-mongo 12.22.34 → 12.22.36

package/dist/{Aggregation.d.ts → Aggregations.d.ts}

@@ -2,16 +2,7 @@ import { Optional } from '@thisisagile/easy';
 import { Filter, FindOptions } from './MongoProvider';
 export declare const asc = 1;
 export declare const desc = -1;
-export declare const aggregation: {
-    match: (f: Filter) => {
-        $match: Filter<unknown>;
-    };
-    id: (id: Filter) => {
-        $match: Filter<unknown>;
-    };
-    eq: (key: string, value: Filter) => {
-        $match: Filter<unknown>;
-    };
+export declare const aggregations: {
     gt: (key: string, value: Filter) => {
         [x: string]: {
             $gt: Filter<unknown>;
@@ -32,6 +23,21 @@ export declare const aggregation: {
             $lte: Filter<unknown>;
         };
     };
+    match: (f: Filter) => {
+        $match: Filter<unknown>;
+    };
+    id: (id: Filter) => {
+        $match: Filter<unknown>;
+    };
+    eq: (key: string, value: Filter) => {
+        $match: Filter<unknown>;
+    };
+    after: (key: string, date: unknown) => {
+        $match: Filter<unknown>;
+    };
+    before: (key: string, date: unknown) => {
+        $match: Filter<unknown>;
+    };
     sum: (to: string, from?: string) => {
         [x: string]: {
             $sum: string;
@@ -42,14 +48,10 @@ export declare const aggregation: {
             $count: {};
         };
     };
-    after: (key: string, date: unknown) => {
-        $match: Filter<unknown>;
-    };
-    before: (key: string, date: unknown) => {
-        $match: Filter<unknown>;
-    };
-    group: (by: Filter, ...fs: Filter[]) => {
-        $group: any;
+    groupBy: (by: Filter) => {
+        and: (...fs: Filter[]) => {
+            $group: any;
+        };
     };
     skip: ({ skip: $skip }: FindOptions) => Optional<Filter>;
     take: ({ take: $limit }: FindOptions) => Optional<Filter>;

package/dist/{Aggregation.js → Aggregations.js}

@@ -1,28 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregation = exports.desc = exports.asc = void 0;
+exports.aggregations = exports.desc = exports.asc = void 0;
 const easy_1 = require("@thisisagile/easy");
 const Utils_1 = require("./Utils");
 exports.asc = 1;
 exports.desc = -1;
-exports.aggregation = {
-    match: (f) => ({ $match: f }),
-    id: (id) => exports.aggregation.match({ id }),
-    eq: (key, value) => exports.aggregation.match({ [key]: value }),
+exports.aggregations = {
     gt: (key, value) => ({ [key]: { $gt: value } }),
     gte: (key, value) => ({ [key]: { $gte: value } }),
     lt: (key, value) => ({ [key]: { $lt: value } }),
     lte: (key, value) => ({ [key]: { $lte: value } }),
+    match: (f) => ({ $match: f }),
+    id: (id) => exports.aggregations.match({ id }),
+    eq: (key, value) => exports.aggregations.match({ [key]: value }),
+    after: (key, date) => exports.aggregations.match(exports.aggregations.gte(key, (0, Utils_1.toMongoType)(date))),
+    before: (key, date) => exports.aggregations.match(exports.aggregations.lt(key, (0, Utils_1.toMongoType)(date))),
     sum: (to, from = to) => ({ [to]: { $sum: `$${from}` } }),
     count: (to = 'count') => ({ [to]: { $count: {} } }),
-    after: (key, date) => exports.aggregation.match(exports.aggregation.gte(key, (0, Utils_1.toMongoType)(date))),
-    before: (key, date) => exports.aggregation.match(exports.aggregation.lt(key, (0, Utils_1.toMongoType)(date))),
-    group: (by, ...fs) => ({ $group: Object.assign({ _id: by }, ...fs) }),
+    groupBy: (by) => ({
+        and: (...fs) => ({ $group: Object.assign({ _id: by }, ...fs) }),
+    }),
     skip: ({ skip: $skip }) => (0, easy_1.ifDefined)($skip, { $skip }),
     take: ({ take: $limit }) => (0, easy_1.ifDefined)($limit, { $limit }),
     sort: ($sort) => ((0, easy_1.isPresent)($sort) ? { $sort } : undefined),
-    asc: (key) => exports.aggregation.sort({ [key]: exports.asc }),
-    desc: (key) => exports.aggregation.sort({ [key]: exports.desc }),
+    asc: (key) => exports.aggregations.sort({ [key]: exports.asc }),
+    desc: (key) => exports.aggregations.sort({ [key]: exports.desc }),
     date: (key, format = '%Y-%m-%d') => ({ $dateToString: { date: `$${key}`, format } }),
 };
-//# sourceMappingURL=Aggregation.js.map
+//# sourceMappingURL=Aggregations.js.map

package/dist/Aggregations.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Aggregations.js","sourceRoot":"","sources":["../src/Aggregations.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export * from './Aggregation';
+export * from './Aggregations';
 export * from './Collection';
 export * from './MongoGateway';
 export * from './MongoProvider';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Aggregation"), exports);
+__exportStar(require("./Aggregations"), exports);
 __exportStar(require("./Collection"), exports);
 __exportStar(require("./MongoGateway"), exports);
 __exportStar(require("./MongoProvider"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,+CAA6B;AAC7B,iDAA+B;AAC/B,kDAAgC;AAChC,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,+CAA6B;AAC7B,iDAA+B;AAC/B,kDAAgC;AAChC,0CAAwB"}

package/package.json

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

package/src/{Aggregation.ts → Aggregations.ts}

@@ -5,23 +5,25 @@ import { toMongoType } from './Utils';
 export const asc = 1;
 export const desc = -1;
 
-export const aggregation = {
-  match: (f: Filter) => ({ $match: f }),
-  id: (id: Filter) => aggregation.match({ id }),
-  eq: (key: string, value: Filter) => aggregation.match({ [key]: value }),
+export const aggregations = {
   gt: (key: string, value: Filter) => ({ [key]: { $gt: value } }),
   gte: (key: string, value: Filter) => ({ [key]: { $gte: value } }),
   lt: (key: string, value: Filter) => ({ [key]: { $lt: value } }),
   lte: (key: string, value: Filter) => ({ [key]: { $lte: value } }),
+  match: (f: Filter) => ({ $match: f }),
+  id: (id: Filter) => aggregations.match({ id }),
+  eq: (key: string, value: Filter) => aggregations.match({ [key]: value }),
+  after: (key: string, date: unknown) => aggregations.match(aggregations.gte(key, toMongoType(date))),
+  before: (key: string, date: unknown) => aggregations.match(aggregations.lt(key, toMongoType(date))),
   sum: (to: string, from: string = to) => ({ [to]: { $sum: `$${from}` } }),
   count: (to = 'count') => ({ [to]: { $count: {} } }),
-  after: (key: string, date: unknown) => aggregation.match(aggregation.gte(key, toMongoType(date))),
-  before: (key: string, date: unknown) => aggregation.match(aggregation.lt(key, toMongoType(date))),
-  group: (by: Filter, ...fs: Filter[]) => ({ $group: Object.assign({ _id: by }, ...fs) }),
+  groupBy: (by: Filter) => ({
+    and: (...fs: Filter[]) => ({ $group: Object.assign({ _id: by }, ...fs) }),
+  }),
   skip: ({ skip: $skip }: FindOptions): Optional<Filter> => ifDefined($skip, { $skip }),
   take: ({ take: $limit }: FindOptions): Optional<Filter> => ifDefined($limit, { $limit }),
   sort: ($sort: Record<string, typeof asc | typeof desc>): Optional<Filter> => (isPresent($sort) ? { $sort } : undefined),
-  asc: (key: string) => aggregation.sort({ [key]: asc }),
-  desc: (key: string) => aggregation.sort({ [key]: desc }),
+  asc: (key: string) => aggregations.sort({ [key]: asc }),
+  desc: (key: string) => aggregations.sort({ [key]: desc }),
   date: (key: string, format = '%Y-%m-%d') => ({ $dateToString: { date: `$${key}`, format } }),
 };

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './Aggregation';
+export * from './Aggregations';
 export * from './Collection';
 export * from './MongoGateway';
 export * from './MongoProvider';

package/dist/Aggregation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Aggregation.js","sourceRoot":"","sources":["../src/Aggregation.ts"],"names":[],"mappings":"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"}