@thisisagile/easy-mongo 15.4.0 → 15.5.1

package/dist/AtlasSearchGateway.d.ts

@@ -0,0 +1,12 @@
+import { MongoGateway } from './MongoGateway';
+import { Collection } from './Collection';
+import { MongoProvider } from './MongoProvider';
+import { SearchDefinition } from './Lucene';
+import { Filter, Json, PageList } from '@thisisagile/easy';
+export declare const toFilters: (facets: unknown) => Filter[];
+export declare class AtlasSearchGateway extends MongoGateway {
+    readonly searchDef: SearchDefinition;
+    readonly sortDef: Record<string, Record<string, 1 | -1>>;
+    constructor(collection: Collection, searchDef: SearchDefinition, sortDef?: Record<string, Record<string, 1 | -1>>, provider?: MongoProvider);
+    query: (query: Record<keyof typeof this.searchDef, string | number>) => Promise<PageList<Json>>;
+}

package/dist/AtlasSearchGateway.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AtlasSearchGateway = exports.toFilters = void 0;
+const Stages_1 = require("./Stages");
+const MongoGateway_1 = require("./MongoGateway");
+const Lucene_1 = require("./Lucene");
+const easy_1 = require("@thisisagile/easy");
+const { skip, take } = Stages_1.stages.skip;
+const { replaceWith } = Stages_1.stages.replaceWith;
+const { searchWithDef, searchMeta, facets } = Lucene_1.lucene;
+const toFilters = (facets) => (0, easy_1.entries)(facets).map(([k, fs]) => ({
+    label: (0, easy_1.text)(k).title.toString(),
+    field: k,
+    values: fs.map((f) => toValue(f)),
+}));
+exports.toFilters = toFilters;
+const toValue = (f) => ({ label: f._id ?? 'unknown', value: f._id ?? 'unknown', count: f.count });
+class AtlasSearchGateway extends MongoGateway_1.MongoGateway {
+    constructor(collection, searchDef, sortDef = {}, provider = collection.provider) {
+        super(collection, provider);
+        this.searchDef = searchDef;
+        this.sortDef = sortDef;
+        this.query = async (query) => {
+            return (0, easy_1.tuple2)(this.aggregate(searchWithDef(query, this.searchDef), skip({ skip: query?.skip ?? 0 }), take({ take: query?.take ?? 250 })), this.aggregate(searchMeta(query, this.searchDef), replaceWith({
+                total: '$count.lowerBound',
+                facets: Object.keys(facets(this.searchDef)).reduce((acc, k) => ({ ...acc, [k]: `$facet.${k}.buckets` }), {}),
+            })))
+                .then(([data, meta]) => ({ data, meta: meta.first() }))
+                .then(({ data, meta }) => (0, easy_1.toPageList)(data, {
+                total: meta?.total ?? 0,
+                skip: query?.skip ?? 0,
+                take: query?.take ?? 250,
+                sorts: Object.keys(this.sortDef),
+                filters: (0, exports.toFilters)(meta.facets),
+            }));
+        };
+    }
+}
+exports.AtlasSearchGateway = AtlasSearchGateway;
+//# sourceMappingURL=AtlasSearchGateway.js.map

package/dist/AtlasSearchGateway.js.map

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

package/dist/Lucene.d.ts

@@ -1,12 +1,35 @@
-import { Func, OneOrMore, Optional } from "@thisisagile/easy";
+import { DateTime, Func, List, OneOrMore, Optional, RequireAtLeastOne } from '@thisisagile/easy';
 type FuzzyOptions = {
     maxEdits: number;
     prefixLength: number;
     maxExpansions: number;
 };
+export type Facet = {
+    path: string;
+    type: 'string';
+    numBuckets: number;
+} | {
+    path: string;
+    type: 'number';
+    boundaries: number[];
+    default?: string;
+} | {
+    path: string;
+    type: 'date';
+    boundaries: Date[];
+    default?: string;
+};
 export type Operator = Func<Optional<object>, string>;
 export type Clause = object | Operator;
 export type Clauses = Record<string, Clause>;
+export type SearchDefinition = Record<string, (v: string | number) => RequireAtLeastOne<{
+    should?: Clauses;
+    filter?: Clauses;
+    must?: Clauses;
+    mustNot?: Clauses;
+    sort?: Record<string, 1 | -1>;
+    facet?: Facet;
+}>>;
 type Compound = {
     must: OneOrMore<Clauses>;
     should: OneOrMore<Clauses>;
@@ -14,7 +37,7 @@ type Compound = {
     filter: OneOrMore<Clauses>;
 };
 export declare const lucene: {
-    clause: (c: Clauses) => import("@thisisagile/easy").List<unknown>;
+    clause: (c: Clauses) => List<unknown>;
     clauses: (cs: OneOrMore<Clauses>) => unknown[];
     search: (c: Partial<Compound>, index?: string) => {
         $search: {
@@ -22,7 +45,29 @@ export declare const lucene: {
             index?: string | undefined;
         };
     };
+    searchWithDef: (query: Record<string, string | number>, options: SearchDefinition, index?: string) => {
+        $search: {
+            sort?: Record<string, 1 | -1> | undefined;
+            compound: Partial<Compound>;
+            index?: string | undefined;
+        };
+    };
+    searchMeta: (query: Record<string, string | number>, def: SearchDefinition, index?: string) => {
+        $searchMeta: {
+            facet: {
+                operator: {
+                    compound: Partial<Compound>;
+                };
+                facets: {
+                    [x: string]: Facet | undefined;
+                };
+            };
+            index?: string | undefined;
+        };
+    };
+    exists: () => Operator;
     text: (value?: OneOrMore<unknown>, fuzzy?: Partial<FuzzyOptions>) => Operator;
+    wildcard: (value?: OneOrMore<unknown>) => Operator;
     lt: (value: unknown) => Operator;
     lte: (value: unknown) => Operator;
     gt: (value: unknown) => Operator;
@@ -30,5 +75,13 @@ export declare const lucene: {
     after: (date: unknown) => Operator;
     before: (date: unknown) => Operator;
     between: (after: unknown, before: unknown) => Operator;
+    facets: (def: SearchDefinition) => {
+        [x: string]: Facet | undefined;
+    };
+    facet: {
+        string: (path: string, numBuckets?: number) => Facet;
+        number: (path: string, boundaries: List<number>, alt?: string) => Facet;
+        date: (path: string, boundaries: List<DateTime>, alt?: string) => Facet;
+    };
 };
 export {};

package/dist/Lucene.js

@@ -3,22 +3,60 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.lucene = void 0;
 const easy_1 = require("@thisisagile/easy");
 const Utils_1 = require("./Utils");
+const should = (query, def) => (0, easy_1.entries)(query).mapDefined(([k, v]) => def[k]?.(v)?.should);
+const must = (query, def) => (0, easy_1.entries)(query).mapDefined(([k, v]) => def[k]?.(v)?.must);
+const mustNot = (query, def) => (0, easy_1.entries)(query).mapDefined(([k, v]) => def[k]?.(v)?.mustNot);
+const filter = (query, def) => (0, easy_1.entries)(query).mapDefined(([k, v]) => def[k]?.(v)?.filter);
+const compound = (query, def) => (0, easy_1.entries)({
+    should: (0, easy_1.ifNotEmpty)(should(query, def).concat(filter(query, def), must(query, def), mustNot(query, def)), should(query, def), [
+        { wildcard: exports.lucene.wildcard() },
+    ]),
+    ...(0, easy_1.ifNotEmpty)(filter(query, def), f => ({ filter: f })),
+    ...(0, easy_1.ifNotEmpty)(mustNot(query, def), m => ({ mustNot: m })),
+    ...(0, easy_1.ifNotEmpty)(must(query, def), m => ({ must: m })),
+}).reduce((res, [k, v]) => (0, easy_1.on)(res, r => (r[k] = exports.lucene.clauses(v))), {});
 exports.lucene = {
     clause: (c) => (0, easy_1.entries)(c).reduce((res, [k, v]) => res.add((0, easy_1.isFunction)(v) ? v(k) : v), (0, easy_1.toList)()),
     clauses: (cs) => (0, easy_1.toArray)(cs).flatMap(c => exports.lucene.clause(c)),
     search: (c, index) => ({
         $search: {
             ...(0, easy_1.ifDefined)(index, { index }),
-            compound: (0, easy_1.entries)(c).reduce((res, [k, v]) => (0, easy_1.on)(res, r => (r[k] = exports.lucene.clauses(v))), {})
-        }
+            compound: (0, easy_1.entries)(c).reduce((res, [k, v]) => (0, easy_1.on)(res, r => (r[k] = exports.lucene.clauses(v))), {}),
+        },
     }),
+    searchWithDef: (query, options, index) => {
+        const sort = (0, easy_1.entries)(query)
+            .mapDefined(([k, v]) => options[k]?.(v)?.sort)
+            .first();
+        return {
+            $search: { ...(0, easy_1.ifDefined)(index, { index }), compound: compound(query, options), ...(0, easy_1.ifDefined)(sort, { sort }) },
+        };
+    },
+    searchMeta: (query, def, index) => ({
+        $searchMeta: {
+            ...(0, easy_1.ifDefined)(index, { index }),
+            facet: {
+                operator: {
+                    compound: compound(query, def),
+                },
+                facets: exports.lucene.facets(def),
+            },
+        },
+    }),
+    exists: () => (path) => ({ exists: { path } }),
     text: (value, fuzzy) => (path) => (0, easy_1.ifDefined)(value, v => ({
         text: {
             path: path === 'wildcard' ? { wildcard: '*' } : path,
             query: v,
-            ...(0, easy_1.ifDefined)(fuzzy, { fuzzy })
-        }
+            ...(0, easy_1.ifDefined)(fuzzy, { fuzzy }),
+        },
     })),
+    wildcard: (value) => (path) => ({
+        wildcard: {
+            path: path === 'wildcard' ? { wildcard: '*' } : path,
+            query: (0, easy_1.ifDefined)(value, value, '*'),
+        },
+    }),
     lt: (value) => (path) => (0, easy_1.ifDefined)(value, lt => ({ range: { path, lt } })),
     lte: (value) => (path) => (0, easy_1.ifDefined)(value, lte => ({ range: { path, lte } })),
     gt: (value) => (path) => (0, easy_1.ifDefined)(value, gt => ({ range: { path, gt } })),
@@ -29,8 +67,31 @@ exports.lucene = {
         range: {
             path,
             gte: (0, Utils_1.toMongoType)(after),
-            lt: (0, Utils_1.toMongoType)(before)
-        }
-    })
+            lt: (0, Utils_1.toMongoType)(before),
+        },
+    }),
+    facets: (def) => (0, easy_1.entries)(def)
+        .filter(([k, v]) => (0, easy_1.isDefined)(v(k)?.facet))
+        .map(([k, v]) => ({ [k]: v(k)?.facet }))
+        .reduce((acc, v) => ({ ...acc, ...v }), {}),
+    facet: {
+        string: (path, numBuckets = 1000) => ({
+            type: 'string',
+            path,
+            numBuckets,
+        }),
+        number: (path, boundaries, alt) => ({
+            type: 'number',
+            path,
+            boundaries,
+            ...(0, easy_1.ifDefined)(alt, a => ({ default: a })),
+        }),
+        date: (path, boundaries, alt) => ({
+            type: 'date',
+            path,
+            boundaries: boundaries.mapDefined(b => b.toDate()),
+            ...(0, easy_1.ifDefined)(alt, a => ({ default: a })),
+        }),
+    },
 };
 //# sourceMappingURL=Lucene.js.map

package/dist/Lucene.js.map

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

package/dist/MongoGateway.js

@@ -36,7 +36,7 @@ class MongoGateway {
         return this.provider.aggregate((0, easy_1.toArray)(...filters).filter(easy_1.isPresent));
     }
     count(...filters) {
-        return this.aggregate(...filters, { $count: 'total' }).then(d => d.first().total ?? 0);
+        return this.aggregate(...filters, { $count: 'total' }).then(d => d.first()?.total ?? 0);
     }
     match(f) {
         return this.aggregate(Stages_1.stages.match.match(f));

package/dist/MongoGateway.js.map

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

package/package.json

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

package/src/AtlasSearchGateway.ts

@@ -0,0 +1,55 @@
+import { stages } from './Stages';
+import { MongoGateway } from './MongoGateway';
+import { Collection } from './Collection';
+import { MongoProvider } from './MongoProvider';
+import { lucene, SearchDefinition } from './Lucene';
+import { entries, Filter, Json, PageList, text, toPageList, tuple2 } from '@thisisagile/easy';
+
+const { skip, take } = stages.skip;
+const { replaceWith } = stages.replaceWith;
+const { searchWithDef, searchMeta, facets } = lucene;
+
+type FacetResult = { _id: string; count: number };
+type Value = { label: string; value: string; count: number };
+export const toFilters = (facets: unknown): Filter[] =>
+  entries(facets as Record<string, unknown>).map(([k, fs]) => ({
+    label: text(k).title.toString(),
+    field: k,
+    values: (fs as []).map((f: FacetResult) => toValue(f)),
+  }));
+
+const toValue = (f: FacetResult): Value => ({ label: f._id ?? 'unknown', value: f._id ?? 'unknown', count: f.count });
+
+export class AtlasSearchGateway extends MongoGateway {
+  constructor(
+    collection: Collection,
+    readonly searchDef: SearchDefinition,
+    readonly sortDef: Record<string, Record<string, 1 | -1>> = {},
+    provider: MongoProvider = collection.provider
+  ) {
+    super(collection, provider);
+  }
+
+  query = async (query: Record<keyof typeof this.searchDef, string | number>): Promise<PageList<Json>> => {
+    return tuple2(
+      this.aggregate(searchWithDef(query, this.searchDef), skip({ skip: (query?.skip as number) ?? 0 }), take({ take: (query?.take as number) ?? 250 })),
+      this.aggregate(
+        searchMeta(query, this.searchDef),
+        replaceWith({
+          total: '$count.lowerBound',
+          facets: Object.keys(facets(this.searchDef)).reduce((acc, k) => ({ ...acc, [k]: `$facet.${k}.buckets` }), {}),
+        })
+      )
+    )
+      .then(([data, meta]) => ({ data, meta: meta.first() as any }))
+      .then(({ data, meta }) =>
+        toPageList<Json>(data, {
+          total: meta?.total ?? 0,
+          skip: (query?.skip as number) ?? 0,
+          take: (query?.take as number) ?? 250,
+          sorts: Object.keys(this.sortDef),
+          filters: toFilters(meta.facets),
+        })
+      );
+  };
+}

package/src/Lucene.ts

@@ -1,5 +1,20 @@
-import { entries, Func, ifDefined, isFunction, on, OneOrMore, Optional, toArray, toList } from "@thisisagile/easy";
-import { toMongoType } from "./Utils";
+import {
+  DateTime,
+  entries,
+  Func,
+  ifDefined,
+  ifNotEmpty,
+  isDefined,
+  isFunction,
+  List,
+  on,
+  OneOrMore,
+  Optional,
+  RequireAtLeastOne,
+  toArray,
+  toList,
+} from '@thisisagile/easy';
+import { toMongoType } from './Utils';
 
 type FuzzyOptions = {
   maxEdits: number;
@@ -7,9 +22,20 @@ type FuzzyOptions = {
   maxExpansions: number;
 };
 
+export type Facet =
+  | { path: string; type: 'string'; numBuckets: number }
+  | { path: string; type: 'number'; boundaries: number[]; default?: string }
+  | { path: string; type: 'date'; boundaries: Date[]; default?: string };
+
 export type Operator = Func<Optional<object>, string>;
 export type Clause = object | Operator;
 export type Clauses = Record<string, Clause>;
+export type SearchDefinition = Record<
+  string,
+  (
+    v: string | number
+  ) => RequireAtLeastOne<{ should?: Clauses; filter?: Clauses; must?: Clauses; mustNot?: Clauses; sort?: Record<string, 1 | -1>; facet?: Facet }>
+>;
 
 type Compound = {
   must: OneOrMore<Clauses>;
@@ -18,50 +44,117 @@ type Compound = {
   filter: OneOrMore<Clauses>;
 };
 
+const should = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.should);
+const must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.must);
+const mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.mustNot);
+const filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.filter);
+
+const compound = (query: Record<string, string | number>, def: SearchDefinition): Partial<Compound> =>
+  entries({
+    should: ifNotEmpty(should(query, def).concat(filter(query, def), must(query, def), mustNot(query, def)), should(query, def), [
+      { wildcard: lucene.wildcard() },
+    ]),
+    ...ifNotEmpty(filter(query, def), f => ({ filter: f })),
+    ...ifNotEmpty(mustNot(query, def), m => ({ mustNot: m })),
+    ...ifNotEmpty(must(query, def), m => ({ must: m })),
+  }).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any);
+
 export const lucene = {
   clause: (c: Clauses) => entries(c).reduce((res, [k, v]) => res.add(isFunction(v) ? v(k) : v), toList()),
   clauses: (cs: OneOrMore<Clauses>) => toArray(cs).flatMap(c => lucene.clause(c)),
   search: (c: Partial<Compound>, index?: string) => ({
     $search: {
       ...ifDefined(index, { index }),
-      compound: entries(c).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any)
-    }
+      compound: entries(c).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any),
+    },
+  }),
+  searchWithDef: (query: Record<string, string | number>, options: SearchDefinition, index?: string) => {
+    const sort = entries(query)
+      .mapDefined(([k, v]) => options[k]?.(v)?.sort)
+      .first();
+    return {
+      $search: { ...ifDefined(index, { index }), compound: compound(query, options), ...ifDefined(sort, { sort }) },
+    };
+  },
+  searchMeta: (query: Record<string, string | number>, def: SearchDefinition, index?: string) => ({
+    $searchMeta: {
+      ...ifDefined(index, { index }),
+      facet: {
+        operator: {
+          compound: compound(query, def),
+        },
+        facets: lucene.facets(def),
+      },
+    },
   }),
+  exists: (): Operator => (path: string) => ({ exists: { path } }),
   text:
     (value?: OneOrMore<unknown>, fuzzy?: Partial<FuzzyOptions>): Operator =>
-      (path: string ) =>
-        ifDefined(value, v => ({
-          text: {
-            path: path === 'wildcard' ? { wildcard: '*' } : path,
-            query: v,
-            ...ifDefined(fuzzy, { fuzzy })
-          }
-        })),
+    (path: string) =>
+      ifDefined(value, v => ({
+        text: {
+          path: path === 'wildcard' ? { wildcard: '*' } : path,
+          query: v,
+          ...ifDefined(fuzzy, { fuzzy }),
+        },
+      })),
+  wildcard:
+    (value?: OneOrMore<unknown>): Operator =>
+    (path: string) => ({
+      wildcard: {
+        path: path === 'wildcard' ? { wildcard: '*' } : path,
+        query: ifDefined(value, value, '*'),
+      },
+    }),
   lt:
     (value: unknown): Operator =>
-      (path: string) =>
-        ifDefined(value, lt => ({ range: { path, lt } })),
+    (path: string) =>
+      ifDefined(value, lt => ({ range: { path, lt } })),
   lte:
     (value: unknown): Operator =>
-      (path: string) =>
-        ifDefined(value, lte => ({ range: { path, lte } })),
+    (path: string) =>
+      ifDefined(value, lte => ({ range: { path, lte } })),
   gt:
     (value: unknown): Operator =>
-      (path: string) =>
-        ifDefined(value, gt => ({ range: { path, gt } })),
+    (path: string) =>
+      ifDefined(value, gt => ({ range: { path, gt } })),
   gte:
     (value: unknown): Operator =>
-      (path: string) =>
-        ifDefined(value, gte => ({ range: { path, gte } })),
+    (path: string) =>
+      ifDefined(value, gte => ({ range: { path, gte } })),
   after: (date: unknown): Operator => lucene.gte(toMongoType(date)),
   before: (date: unknown): Operator => lucene.lt(toMongoType(date)),
   between:
     (after: unknown, before: unknown): Operator =>
-      (path: string) => ({
-        range: {
-          path,
-          gte: toMongoType(after),
-          lt: toMongoType(before)
-        }
-      })
+    (path: string) => ({
+      range: {
+        path,
+        gte: toMongoType(after),
+        lt: toMongoType(before),
+      },
+    }),
+  facets: (def: SearchDefinition) =>
+    entries(def)
+      .filter(([k, v]) => isDefined(v(k)?.facet))
+      .map(([k, v]) => ({ [k]: v(k)?.facet }))
+      .reduce((acc, v) => ({ ...acc, ...v }), {}),
+  facet: {
+    string: (path: string, numBuckets = 1000): Facet => ({
+      type: 'string',
+      path,
+      numBuckets,
+    }),
+    number: (path: string, boundaries: List<number>, alt?: string): Facet => ({
+      type: 'number',
+      path,
+      boundaries,
+      ...ifDefined(alt, a => ({ default: a })),
+    }),
+    date: (path: string, boundaries: List<DateTime>, alt?: string): Facet => ({
+      type: 'date',
+      path,
+      boundaries: boundaries.mapDefined(b => b.toDate()),
+      ...ifDefined(alt, a => ({ default: a })),
+    }),
+  },
 };

package/src/MongoGateway.ts

@@ -58,7 +58,7 @@ export class MongoGateway implements Gateway<FindOptions> {
   }
 
   count(...filters: Optional<Filter>[]): Promise<number> {
-    return this.aggregate(...filters, {$count: 'total' }).then(d => d.first().total as number ?? 0);
+    return this.aggregate(...filters, {$count: 'total' }).then(d => d.first()?.total as number ?? 0);
   }
 
   match(f: Filter): Promise<PageList<Json>> {