@thisisagile/easy-mongo 12.22.31 → 12.22.32

package/dist/Aggregation.d.ts

@@ -1,4 +1,4 @@
-import { Id, Optional } from '@thisisagile/easy';
+import { Optional } from '@thisisagile/easy';
 import { Filter, FindOptions } from './MongoProvider';
 export declare const asc = 1;
 export declare const desc = -1;
@@ -6,30 +6,30 @@ export declare const aggregation: {
     match: (f: Filter) => {
         $match: Filter<unknown>;
     };
-    id: (id: Id) => {
+    id: (id: Filter) => {
         $match: Filter<unknown>;
     };
-    eq: (key: string, value: Id | Filter) => {
+    eq: (key: string, value: Filter) => {
         $match: Filter<unknown>;
     };
-    gt: (key: string, value: Id) => {
+    gt: (key: string, value: Filter) => {
         [x: string]: {
-            $gt: Id;
+            $gt: Filter<unknown>;
         };
     };
-    gte: (key: string, value: Id) => {
+    gte: (key: string, value: Filter) => {
         [x: string]: {
-            $gte: Id;
+            $gte: Filter<unknown>;
         };
     };
-    lt: (key: string, value: Id) => {
+    lt: (key: string, value: Filter) => {
         [x: string]: {
-            $lt: Id;
+            $lt: Filter<unknown>;
         };
     };
-    lte: (key: string, value: Id) => {
+    lte: (key: string, value: Filter) => {
         [x: string]: {
-            $lte: Id;
+            $lte: Filter<unknown>;
         };
     };
     sum: (to: string, from?: string) => {
@@ -37,25 +37,23 @@ export declare const aggregation: {
             $sum: string;
         };
     };
-    group: (id: Id, g: Filter) => {
-        $group: {
-            _id: Id | import("mongodb").Condition<import("bson").ObjectID>;
-            $and?: import("mongodb").Filter<import("mongodb").WithId<unknown>>[] | undefined;
-            $nor?: import("mongodb").Filter<import("mongodb").WithId<unknown>>[] | undefined;
-            $or?: import("mongodb").Filter<import("mongodb").WithId<unknown>>[] | undefined;
-            $text?: {
-                $search: string;
-                $language?: string | undefined;
-                $caseSensitive?: boolean | undefined;
-                $diacriticSensitive?: boolean | undefined;
-            } | undefined;
-            $where?: string | ((this: import("mongodb").WithId<unknown>) => boolean) | undefined;
-            $comment?: string | import("bson").Document | undefined;
+    count: (to?: string) => {
+        [x: string]: {
+            $count: {};
         };
     };
+    group: (by: Filter, ...fs: Filter[]) => {
+        $group: any;
+    };
     skip: ({ skip: $skip }: FindOptions) => Optional<Filter>;
     take: ({ take: $limit }: FindOptions) => Optional<Filter>;
     sort: ($sort: Record<string, typeof asc | typeof desc>) => Optional<Filter>;
     asc: (key: string) => Optional<Filter<unknown>>;
     desc: (key: string) => Optional<Filter<unknown>>;
+    date: (key: string, format?: string) => {
+        $dateToString: {
+            date: string;
+            format: string;
+        };
+    };
 };

package/dist/Aggregation.js

@@ -13,11 +13,13 @@ exports.aggregation = {
     lt: (key, value) => ({ [key]: { $lt: value } }),
     lte: (key, value) => ({ [key]: { $lte: value } }),
     sum: (to, from = to) => ({ [to]: { $sum: `$${from}` } }),
-    group: (id, g) => ({ $group: { _id: id, ...g } }),
+    count: (to = 'count') => ({ [to]: { $count: {} } }),
+    group: (by, ...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 }),
+    date: (key, format = '%Y-%m-%d') => ({ $dateToString: { date: `$${key}`, format } }),
 };
 //# sourceMappingURL=Aggregation.js.map

package/dist/Aggregation.js.map

@@ -1 +1 @@
-{"version":3,"file":"Aggregation.js","sourceRoot":"","sources":["../src/Aggregation.ts"],"names":[],"mappings":";;;AAAA,4CAAuE;AAG1D,QAAA,GAAG,GAAG,CAAC,CAAC;AACR,QAAA,IAAI,GAAG,CAAC,CAAC,CAAC;AAEV,QAAA,WAAW,GAAG;IACzB,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IACrC,EAAE,EAAE,CAAC,EAAM,EAAE,EAAE,CAAC,mBAAW,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;IACzC,EAAE,EAAE,CAAC,GAAW,EAAE,KAAkB,EAAE,EAAE,CAAC,mBAAW,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;IAC5E,EAAE,EAAE,CAAC,GAAW,EAAE,KAAS,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;IAC3D,GAAG,EAAE,CAAC,GAAW,EAAE,KAAS,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;IAC7D,EAAE,EAAE,CAAC,GAAW,EAAE,KAAS,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;IAC3D,GAAG,EAAE,CAAC,GAAW,EAAE,KAAS,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;IAC7D,GAAG,EAAE,CAAC,EAAU,EAAE,OAAe,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC;IACxE,KAAK,EAAE,CAAC,EAAM,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;IAC7D,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAe,EAAoB,EAAE,CAAC,IAAA,gBAAS,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC;IACrF,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAe,EAAoB,EAAE,CAAC,IAAA,gBAAS,EAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC;IACxF,IAAI,EAAE,CAAC,KAA+C,EAAoB,EAAE,CAAC,CAAC,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACvH,GAAG,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,WAAG,EAAE,CAAC;IACtD,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,YAAI,EAAE,CAAC;CACzD,CAAC"}
+{"version":3,"file":"Aggregation.js","sourceRoot":"","sources":["../src/Aggregation.ts"],"names":[],"mappings":";;;AAAA,4CAAmE;AAGtD,QAAA,GAAG,GAAG,CAAC,CAAC;AACR,QAAA,IAAI,GAAG,CAAC,CAAC,CAAC;AAEV,QAAA,WAAW,GAAG;IACzB,KAAK,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IACrC,EAAE,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,mBAAW,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC;IAC7C,EAAE,EAAE,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,mBAAW,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;IACvE,EAAE,EAAE,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;IAC/D,GAAG,EAAE,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;IACjE,EAAE,EAAE,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC;IAC/D,GAAG,EAAE,CAAC,GAAW,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;IACjE,GAAG,EAAE,CAAC,EAAU,EAAE,OAAe,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC;IACxE,KAAK,EAAE,CAAC,EAAE,GAAG,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC;IACnD,KAAK,EAAE,CAAC,EAAU,EAAE,GAAG,EAAY,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IACvF,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAe,EAAoB,EAAE,CAAC,IAAA,gBAAS,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC;IACrF,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAe,EAAoB,EAAE,CAAC,IAAA,gBAAS,EAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC;IACxF,IAAI,EAAE,CAAC,KAA+C,EAAoB,EAAE,CAAC,CAAC,IAAA,gBAAS,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACvH,GAAG,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,WAAG,EAAE,CAAC;IACtD,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,mBAAW,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,YAAI,EAAE,CAAC;IACxD,IAAI,EAAE,CAAC,GAAW,EAAE,MAAM,GAAG,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;CAC7F,CAAC"}

package/package.json

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

package/src/Aggregation.ts

@@ -1,4 +1,4 @@
-import { Id, ifDefined, isPresent, Optional } from '@thisisagile/easy';
+import { ifDefined, isPresent, Optional } from '@thisisagile/easy';
 import { Filter, FindOptions } from './MongoProvider';
 
 export const asc = 1;
@@ -6,17 +6,19 @@ export const desc = -1;
 
 export const aggregation = {
   match: (f: Filter) => ({ $match: f }),
-  id: (id: Id) => aggregation.match({ id }),
-  eq: (key: string, value: Id | Filter) => aggregation.match({ [key]: value }),
-  gt: (key: string, value: Id) => ({ [key]: { $gt: value } }),
-  gte: (key: string, value: Id) => ({ [key]: { $gte: value } }),
-  lt: (key: string, value: Id) => ({ [key]: { $lt: value } }),
-  lte: (key: string, value: Id) => ({ [key]: { $lte: value } }),
+  id: (id: Filter) => aggregation.match({ id }),
+  eq: (key: string, value: Filter) => aggregation.match({ [key]: value }),
+  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 } }),
   sum: (to: string, from: string = to) => ({ [to]: { $sum: `$${from}` } }),
-  group: (id: Id, g: Filter) => ({ $group: { _id: id, ...g } }),
+  count: (to = 'count') => ({ [to]: { $count: {} } }),
+  group: (by: Filter, ...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 }),
+  date: (key: string, format = '%Y-%m-%d') => ({ $dateToString: { date: `$${key}`, format } }),
 };