@thisisagile/easy-mongo 15.9.6 → 15.9.9

package/dist/Lucene.js

@@ -34,7 +34,9 @@ const compound = (query, def) => (0, import_easy.entries)({
   ...(0, import_easy.ifNotEmpty)(filter(query, def), (f) => ({ filter: f })),
   ...(0, import_easy.ifNotEmpty)(mustNot(query, def), (m) => ({ mustNot: m })),
   ...(0, import_easy.ifNotEmpty)(must(query, def), (m) => ({ must: m }))
-}).reduce((res, [k, v]) => (0, import_easy.on)(res, (r) => r[k] = lucene.clauses(v)), {});
+}).reduce((res, [k, v]) => (0, import_easy.on)(res, (r) => r[k] = lucene.clauses(v)), {
+  minimumShouldMatch: should(query, def).length > 0 ? 1 : 0
+});
 const lucene = {
   clause: (c) => (0, import_easy.entries)(c).reduce((res, [k, v]) => res.add((0, import_easy.isFunction)(v) ? v(k) : v), (0, import_easy.toList)()),
   clauses: (cs) => (0, import_easy.toArray)(cs).flatMap((c) => lucene.clause(c)),

package/dist/Lucene.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Lucene.ts"],"sourcesContent":["import {\n  DateTime,\n  entries,\n  Func,\n  ifDefined,\n  ifNotEmpty,\n  ifTrue,\n  isDefined,\n  isEmptyObject,\n  isFunction,\n  List,\n  on,\n  OneOrMore,\n  Optional,\n  RequireAtLeastOne,\n  toArray,\n  toList,\n} from '@thisisagile/easy';\nimport { toMongoType } from './Utils';\n\ntype FuzzyOptions = {\n  maxEdits: number;\n  prefixLength: number;\n  maxExpansions: number;\n};\n\nexport type Facet =\n  | { path: string; type: 'string'; numBuckets: number }\n  | { path: string; type: 'number'; boundaries: number[]; default?: string }\n  | { path: string; type: 'date'; boundaries: Date[]; default?: string };\n\nexport type Operator = Func<Optional<object>, string>;\nexport type Clause = object | Operator;\nexport type Clauses = Record<string, Clause>;\nexport type SearchDefinition = Record<\n  string,\n  (\n    v: string | number\n  ) => RequireAtLeastOne<{ should?: Clauses; filter?: Clauses; must?: Clauses; mustNot?: Clauses; sort?: Record<string, 1 | -1>; facet?: Facet }>\n>;\n\ntype Compound = {\n  must: OneOrMore<Clauses>;\n  should: OneOrMore<Clauses>;\n  mustNot: OneOrMore<Clauses>;\n  filter: OneOrMore<Clauses>;\n};\n\nconst should = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.should);\nconst must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.must);\nconst mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.mustNot);\nconst filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.filter);\n\nconst compound = (query: Record<string, string | number>, def: SearchDefinition): Partial<Compound> =>\n  entries({\n    should: ifNotEmpty(should(query, def).concat(filter(query, def), must(query, def), mustNot(query, def)), should(query, def), [\n      { wildcard: lucene.wildcard() },\n    ]),\n    ...ifNotEmpty(filter(query, def), f => ({ filter: f })),\n    ...ifNotEmpty(mustNot(query, def), m => ({ mustNot: m })),\n    ...ifNotEmpty(must(query, def), m => ({ must: m })),\n  }).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any);\n\nexport const lucene = {\n  clause: (c: Clauses) => entries(c).reduce((res, [k, v]) => res.add(isFunction(v) ? v(k) : v), toList()),\n  clauses: (cs: OneOrMore<Clauses>) => toArray(cs).flatMap(c => lucene.clause(c)),\n  search: (c: Partial<Compound>, index?: string) => ({\n    $search: {\n      ...ifDefined(index, { index }),\n      compound: entries(c).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any),\n    },\n  }),\n  searchWithDef: (query: Record<string, string | number>, options: SearchDefinition, count: 'total' | 'lowerBound' = 'total', index?: string) => {\n    const sort = entries(query)\n      .mapDefined(([k, v]) => options[k]?.(v)?.sort)\n      .first();\n    return {\n      $search: { ...ifDefined(index, { index }), compound: compound(query, options), ...ifDefined(sort, { sort }), count: { type: count } },\n    };\n  },\n  searchMeta: (query: Record<string, string | number>, def: SearchDefinition, count: 'total' | 'lowerBound' = 'total', index?: string) => ({\n    $searchMeta: {\n      ...ifDefined(index, { index }),\n      ...ifTrue(\n        !isEmptyObject(lucene.facets(def)),\n        {\n          facet: {\n            operator: {\n              compound: compound(query, def),\n            },\n            facets: lucene.facets(def),\n          },\n        },\n        { compound: compound(query, def) }\n      ),\n      count: { type: count }\n    },\n  }),\n  exists: (): Operator => (path: string) => ({ exists: { path } }),\n  text:\n    (value?: OneOrMore<unknown>, fuzzy?: Partial<FuzzyOptions>): Operator =>\n    (path: string) =>\n      ifDefined(value, v => ({\n        text: {\n          path: path === 'wildcard' ? { wildcard: '*' } : path,\n          query: v,\n          ...ifDefined(fuzzy, { fuzzy }),\n        },\n      })),\n  wildcard:\n    (value?: OneOrMore<unknown>, allowAnalyzedField = true): Operator =>\n    (path: string) => ({\n      wildcard: {\n        path: path === 'wildcard' ? { wildcard: '*' } : path,\n        query: ifDefined(value, value, '*'),\n        allowAnalyzedField,\n      },\n    }),\n  lt:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, lt => ({ range: { path, lt } })),\n  lte:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, lte => ({ range: { path, lte } })),\n  gt:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, gt => ({ range: { path, gt } })),\n  gte:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, gte => ({ range: { path, gte } })),\n  after: (date: unknown): Operator => lucene.gte(toMongoType(date)),\n  before: (date: unknown): Operator => lucene.lt(toMongoType(date)),\n  between:\n    (after: unknown, before: unknown): Operator =>\n    (path: string) => ({\n      range: {\n        path,\n        gte: toMongoType(after),\n        lt: toMongoType(before),\n      },\n    }),\n  facets: (def: SearchDefinition) =>\n    entries(def)\n      .filter(([k, v]) => isDefined(v(k)?.facet))\n      .map(([k, v]) => ({ [k]: v(k)?.facet }))\n      .reduce((acc, v) => ({ ...acc, ...v }), {}),\n  facet: {\n    string: (path: string, numBuckets = 1000): Facet => ({\n      type: 'string',\n      path,\n      numBuckets,\n    }),\n    number: (path: string, boundaries: List<number>, alt?: string): Facet => ({\n      type: 'number',\n      path,\n      boundaries,\n      ...ifDefined(alt, a => ({ default: a })),\n    }),\n    date: (path: string, boundaries: List<DateTime>, alt?: string): Facet => ({\n      type: 'date',\n      path,\n      boundaries: boundaries.mapDefined(b => b.toDate()),\n      ...ifDefined(alt, a => ({ default: a })),\n    }),\n  },\n};\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/Lucene.ts"],"sourcesContent":["import {\n  DateTime,\n  entries,\n  Func,\n  ifDefined,\n  ifNotEmpty,\n  ifTrue,\n  isDefined,\n  isEmptyObject,\n  isFunction,\n  List,\n  on,\n  OneOrMore,\n  Optional,\n  RequireAtLeastOne,\n  toArray,\n  toList,\n} from '@thisisagile/easy';\nimport { toMongoType } from './Utils';\n\ntype FuzzyOptions = {\n  maxEdits: number;\n  prefixLength: number;\n  maxExpansions: number;\n};\n\nexport type Facet =\n  | { path: string; type: 'string'; numBuckets: number }\n  | { path: string; type: 'number'; boundaries: number[]; default?: string }\n  | { path: string; type: 'date'; boundaries: Date[]; default?: string };\n\nexport type Operator = Func<Optional<object>, string>;\nexport type Clause = object | Operator;\nexport type Clauses = Record<string, Clause>;\nexport type SearchDefinition = Record<\n  string,\n  (\n    v: string | number\n  ) => RequireAtLeastOne<{ should?: Clauses; filter?: Clauses; must?: Clauses; mustNot?: Clauses; sort?: Record<string, 1 | -1>; facet?: Facet }>\n>;\n\ntype Compound = {\n  must: OneOrMore<Clauses>;\n  should: OneOrMore<Clauses>;\n  mustNot: OneOrMore<Clauses>;\n  filter: OneOrMore<Clauses>;\n};\n\nconst should = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.should);\nconst must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.must);\nconst mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.mustNot);\nconst filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.filter);\n\nconst compound = (query: Record<string, string | number>, def: SearchDefinition): Partial<Compound> =>\n  entries({\n    should: ifNotEmpty(should(query, def).concat(filter(query, def), must(query, def), mustNot(query, def)), should(query, def), [\n      { wildcard: lucene.wildcard() },\n    ]),\n    ...ifNotEmpty(filter(query, def), f => ({ filter: f })),\n    ...ifNotEmpty(mustNot(query, def), m => ({ mustNot: m })),\n    ...ifNotEmpty(must(query, def), m => ({ must: m })),\n  }).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {\n    minimumShouldMatch: should(query, def).length > 0 ? 1 : 0,\n  } as any);\n\nexport const lucene = {\n  clause: (c: Clauses) => entries(c).reduce((res, [k, v]) => res.add(isFunction(v) ? v(k) : v), toList()),\n  clauses: (cs: OneOrMore<Clauses>) => toArray(cs).flatMap(c => lucene.clause(c)),\n  search: (c: Partial<Compound>, index?: string) => ({\n    $search: {\n      ...ifDefined(index, { index }),\n      compound: entries(c).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any),\n    },\n  }),\n  searchWithDef: (query: Record<string, string | number>, options: SearchDefinition, count: 'total' | 'lowerBound' = 'total', index?: string) => {\n    const sort = entries(query)\n      .mapDefined(([k, v]) => options[k]?.(v)?.sort)\n      .first();\n    return {\n      $search: { ...ifDefined(index, { index }), compound: compound(query, options), ...ifDefined(sort, { sort }), count: { type: count } },\n    };\n  },\n  searchMeta: (query: Record<string, string | number>, def: SearchDefinition, count: 'total' | 'lowerBound' = 'total', index?: string) => ({\n    $searchMeta: {\n      ...ifDefined(index, { index }),\n      ...ifTrue(\n        !isEmptyObject(lucene.facets(def)),\n        {\n          facet: {\n            operator: {\n              compound: compound(query, def),\n            },\n            facets: lucene.facets(def),\n          },\n        },\n        { compound: compound(query, def) }\n      ),\n      count: { type: count },\n    },\n  }),\n  exists: (): Operator => (path: string) => ({ exists: { path } }),\n  text:\n    (value?: OneOrMore<unknown>, fuzzy?: Partial<FuzzyOptions>): Operator =>\n    (path: string) =>\n      ifDefined(value, v => ({\n        text: {\n          path: path === 'wildcard' ? { wildcard: '*' } : path,\n          query: v,\n          ...ifDefined(fuzzy, { fuzzy }),\n        },\n      })),\n  wildcard:\n    (value?: OneOrMore<unknown>, allowAnalyzedField = true): Operator =>\n    (path: string) => ({\n      wildcard: {\n        path: path === 'wildcard' ? { wildcard: '*' } : path,\n        query: ifDefined(value, value, '*'),\n        allowAnalyzedField,\n      },\n    }),\n  lt:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, lt => ({ range: { path, lt } })),\n  lte:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, lte => ({ range: { path, lte } })),\n  gt:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, gt => ({ range: { path, gt } })),\n  gte:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, gte => ({ range: { path, gte } })),\n  after: (date: unknown): Operator => lucene.gte(toMongoType(date)),\n  before: (date: unknown): Operator => lucene.lt(toMongoType(date)),\n  between:\n    (after: unknown, before: unknown): Operator =>\n    (path: string) => ({\n      range: {\n        path,\n        gte: toMongoType(after),\n        lt: toMongoType(before),\n      },\n    }),\n  facets: (def: SearchDefinition) =>\n    entries(def)\n      .filter(([k, v]) => isDefined(v(k)?.facet))\n      .map(([k, v]) => ({ [k]: v(k)?.facet }))\n      .reduce((acc, v) => ({ ...acc, ...v }), {}),\n  facet: {\n    string: (path: string, numBuckets = 1000): Facet => ({\n      type: 'string',\n      path,\n      numBuckets,\n    }),\n    number: (path: string, boundaries: List<number>, alt?: string): Facet => ({\n      type: 'number',\n      path,\n      boundaries,\n      ...ifDefined(alt, a => ({ default: a })),\n    }),\n    date: (path: string, boundaries: List<DateTime>, alt?: string): Facet => ({\n      type: 'date',\n      path,\n      boundaries: boundaries.mapDefined(b => b.toDate()),\n      ...ifDefined(alt, a => ({ default: a })),\n    }),\n  },\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,kBAiBO;AACP,mBAA4B;AA8B5B,MAAM,SAAS,CAAC,OAAwC,YAAqC,qBAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM;AACtJ,MAAM,OAAO,CAAC,OAAwC,YAAqC,qBAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI;AAClJ,MAAM,UAAU,CAAC,OAAwC,YAAqC,qBAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,OAAO;AACxJ,MAAM,SAAS,CAAC,OAAwC,YAAqC,qBAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM;AAEtJ,MAAM,WAAW,CAAC,OAAwC,YACxD,qBAAQ;AAAA,EACN,YAAQ,wBAAW,OAAO,OAAO,GAAG,EAAE,OAAO,OAAO,OAAO,GAAG,GAAG,KAAK,OAAO,GAAG,GAAG,QAAQ,OAAO,GAAG,CAAC,GAAG,OAAO,OAAO,GAAG,GAAG;AAAA,IAC3H,EAAE,UAAU,OAAO,SAAS,EAAE;AAAA,EAChC,CAAC;AAAA,EACD,OAAG,wBAAW,OAAO,OAAO,GAAG,GAAG,QAAM,EAAE,QAAQ,EAAE,EAAE;AAAA,EACtD,OAAG,wBAAW,QAAQ,OAAO,GAAG,GAAG,QAAM,EAAE,SAAS,EAAE,EAAE;AAAA,EACxD,OAAG,wBAAW,KAAK,OAAO,GAAG,GAAG,QAAM,EAAE,MAAM,EAAE,EAAE;AACpD,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,UAAM,gBAAG,KAAK,OAAM,EAAE,CAAC,IAAI,OAAO,QAAQ,CAAC,CAAE,GAAG;AAAA,EACnE,oBAAoB,OAAO,OAAO,GAAG,EAAE,SAAS,IAAI,IAAI;AAC1D,CAAQ;AAEH,MAAM,SAAS;AAAA,EACpB,QAAQ,CAAC,UAAe,qBAAQ,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,QAAI,wBAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,OAAG,oBAAO,CAAC;AAAA,EACtG,SAAS,CAAC,WAA2B,qBAAQ,EAAE,EAAE,QAAQ,OAAK,OAAO,OAAO,CAAC,CAAC;AAAA,EAC9E,QAAQ,CAAC,GAAsB,WAAoB;AAAA,IACjD,SAAS;AAAA,MACP,OAAG,uBAAU,OAAO,EAAE,MAAM,CAAC;AAAA,MAC7B,cAAU,qBAAQ,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,UAAM,gBAAG,KAAK,OAAM,EAAE,CAAC,IAAI,OAAO,QAAQ,CAAC,CAAE,GAAG,CAAC,CAAQ;AAAA,IAClG;AAAA,EACF;AAAA,EACA,eAAe,CAAC,OAAwC,SAA2B,QAAgC,SAAS,UAAmB;AAC7I,UAAM,WAAO,qBAAQ,KAAK,EACvB,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,EAC5C,MAAM;AACT,WAAO;AAAA,MACL,SAAS,EAAE,OAAG,uBAAU,OAAO,EAAE,MAAM,CAAC,GAAG,UAAU,SAAS,OAAO,OAAO,GAAG,OAAG,uBAAU,MAAM,EAAE,KAAK,CAAC,GAAG,OAAO,EAAE,MAAM,MAAM,EAAE;AAAA,IACtI;AAAA,EACF;AAAA,EACA,YAAY,CAAC,OAAwC,KAAuB,QAAgC,SAAS,WAAoB;AAAA,IACvI,aAAa;AAAA,MACX,OAAG,uBAAU,OAAO,EAAE,MAAM,CAAC;AAAA,MAC7B,OAAG;AAAA,QACD,KAAC,2BAAc,OAAO,OAAO,GAAG,CAAC;AAAA,QACjC;AAAA,UACE,OAAO;AAAA,YACL,UAAU;AAAA,cACR,UAAU,SAAS,OAAO,GAAG;AAAA,YAC/B;AAAA,YACA,QAAQ,OAAO,OAAO,GAAG;AAAA,UAC3B;AAAA,QACF;AAAA,QACA,EAAE,UAAU,SAAS,OAAO,GAAG,EAAE;AAAA,MACnC;AAAA,MACA,OAAO,EAAE,MAAM,MAAM;AAAA,IACvB;AAAA,EACF;AAAA,EACA,QAAQ,MAAgB,CAAC,UAAkB,EAAE,QAAQ,EAAE,KAAK,EAAE;AAAA,EAC9D,MACE,CAAC,OAA4B,UAC7B,CAAC,aACC,uBAAU,OAAO,QAAM;AAAA,IACrB,MAAM;AAAA,MACJ,MAAM,SAAS,aAAa,EAAE,UAAU,IAAI,IAAI;AAAA,MAChD,OAAO;AAAA,MACP,OAAG,uBAAU,OAAO,EAAE,MAAM,CAAC;AAAA,IAC/B;AAAA,EACF,EAAE;AAAA,EACN,UACE,CAAC,OAA4B,qBAAqB,SAClD,CAAC,UAAkB;AAAA,IACjB,UAAU;AAAA,MACR,MAAM,SAAS,aAAa,EAAE,UAAU,IAAI,IAAI;AAAA,MAChD,WAAO,uBAAU,OAAO,OAAO,GAAG;AAAA,MAClC;AAAA,IACF;AAAA,EACF;AAAA,EACF,IACE,CAAC,UACD,CAAC,aACC,uBAAU,OAAO,SAAO,EAAE,OAAO,EAAE,MAAM,GAAG,EAAE,EAAE;AAAA,EACpD,KACE,CAAC,UACD,CAAC,aACC,uBAAU,OAAO,UAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,EAAE;AAAA,EACtD,IACE,CAAC,UACD,CAAC,aACC,uBAAU,OAAO,SAAO,EAAE,OAAO,EAAE,MAAM,GAAG,EAAE,EAAE;AAAA,EACpD,KACE,CAAC,UACD,CAAC,aACC,uBAAU,OAAO,UAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,EAAE;AAAA,EACtD,OAAO,CAAC,SAA4B,OAAO,QAAI,0BAAY,IAAI,CAAC;AAAA,EAChE,QAAQ,CAAC,SAA4B,OAAO,OAAG,0BAAY,IAAI,CAAC;AAAA,EAChE,SACE,CAAC,OAAgB,WACjB,CAAC,UAAkB;AAAA,IACjB,OAAO;AAAA,MACL;AAAA,MACA,SAAK,0BAAY,KAAK;AAAA,MACtB,QAAI,0BAAY,MAAM;AAAA,IACxB;AAAA,EACF;AAAA,EACF,QAAQ,CAAC,YACP,qBAAQ,GAAG,EACR,OAAO,CAAC,CAAC,GAAG,CAAC,UAAM,uBAAU,EAAE,CAAC,GAAG,KAAK,CAAC,EACzC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,MAAM,EAAE,EACtC,OAAO,CAAC,KAAK,OAAO,EAAE,GAAG,KAAK,GAAG,EAAE,IAAI,CAAC,CAAC;AAAA,EAC9C,OAAO;AAAA,IACL,QAAQ,CAAC,MAAc,aAAa,SAAiB;AAAA,MACnD,MAAM;AAAA,MACN;AAAA,MACA;AAAA,IACF;AAAA,IACA,QAAQ,CAAC,MAAc,YAA0B,SAAyB;AAAA,MACxE,MAAM;AAAA,MACN;AAAA,MACA;AAAA,MACA,OAAG,uBAAU,KAAK,QAAM,EAAE,SAAS,EAAE,EAAE;AAAA,IACzC;AAAA,IACA,MAAM,CAAC,MAAc,YAA4B,SAAyB;AAAA,MACxE,MAAM;AAAA,MACN;AAAA,MACA,YAAY,WAAW,WAAW,OAAK,EAAE,OAAO,CAAC;AAAA,MACjD,OAAG,uBAAU,KAAK,QAAM,EAAE,SAAS,EAAE,EAAE;AAAA,IACzC;AAAA,EACF;AACF;","names":[]}

package/dist/Lucene.mjs

@@ -22,7 +22,9 @@ const compound = (query, def) => entries({
   ...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)), {});
+}).reduce((res, [k, v]) => on(res, (r) => r[k] = lucene.clauses(v)), {
+  minimumShouldMatch: should(query, def).length > 0 ? 1 : 0
+});
 const lucene = {
   clause: (c) => entries(c).reduce((res, [k, v]) => res.add(isFunction(v) ? v(k) : v), toList()),
   clauses: (cs) => toArray(cs).flatMap((c) => lucene.clause(c)),

package/dist/Lucene.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Lucene.ts"],"sourcesContent":["import {\n  DateTime,\n  entries,\n  Func,\n  ifDefined,\n  ifNotEmpty,\n  ifTrue,\n  isDefined,\n  isEmptyObject,\n  isFunction,\n  List,\n  on,\n  OneOrMore,\n  Optional,\n  RequireAtLeastOne,\n  toArray,\n  toList,\n} from '@thisisagile/easy';\nimport { toMongoType } from './Utils';\n\ntype FuzzyOptions = {\n  maxEdits: number;\n  prefixLength: number;\n  maxExpansions: number;\n};\n\nexport type Facet =\n  | { path: string; type: 'string'; numBuckets: number }\n  | { path: string; type: 'number'; boundaries: number[]; default?: string }\n  | { path: string; type: 'date'; boundaries: Date[]; default?: string };\n\nexport type Operator = Func<Optional<object>, string>;\nexport type Clause = object | Operator;\nexport type Clauses = Record<string, Clause>;\nexport type SearchDefinition = Record<\n  string,\n  (\n    v: string | number\n  ) => RequireAtLeastOne<{ should?: Clauses; filter?: Clauses; must?: Clauses; mustNot?: Clauses; sort?: Record<string, 1 | -1>; facet?: Facet }>\n>;\n\ntype Compound = {\n  must: OneOrMore<Clauses>;\n  should: OneOrMore<Clauses>;\n  mustNot: OneOrMore<Clauses>;\n  filter: OneOrMore<Clauses>;\n};\n\nconst should = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.should);\nconst must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.must);\nconst mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.mustNot);\nconst filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.filter);\n\nconst compound = (query: Record<string, string | number>, def: SearchDefinition): Partial<Compound> =>\n  entries({\n    should: ifNotEmpty(should(query, def).concat(filter(query, def), must(query, def), mustNot(query, def)), should(query, def), [\n      { wildcard: lucene.wildcard() },\n    ]),\n    ...ifNotEmpty(filter(query, def), f => ({ filter: f })),\n    ...ifNotEmpty(mustNot(query, def), m => ({ mustNot: m })),\n    ...ifNotEmpty(must(query, def), m => ({ must: m })),\n  }).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any);\n\nexport const lucene = {\n  clause: (c: Clauses) => entries(c).reduce((res, [k, v]) => res.add(isFunction(v) ? v(k) : v), toList()),\n  clauses: (cs: OneOrMore<Clauses>) => toArray(cs).flatMap(c => lucene.clause(c)),\n  search: (c: Partial<Compound>, index?: string) => ({\n    $search: {\n      ...ifDefined(index, { index }),\n      compound: entries(c).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any),\n    },\n  }),\n  searchWithDef: (query: Record<string, string | number>, options: SearchDefinition, count: 'total' | 'lowerBound' = 'total', index?: string) => {\n    const sort = entries(query)\n      .mapDefined(([k, v]) => options[k]?.(v)?.sort)\n      .first();\n    return {\n      $search: { ...ifDefined(index, { index }), compound: compound(query, options), ...ifDefined(sort, { sort }), count: { type: count } },\n    };\n  },\n  searchMeta: (query: Record<string, string | number>, def: SearchDefinition, count: 'total' | 'lowerBound' = 'total', index?: string) => ({\n    $searchMeta: {\n      ...ifDefined(index, { index }),\n      ...ifTrue(\n        !isEmptyObject(lucene.facets(def)),\n        {\n          facet: {\n            operator: {\n              compound: compound(query, def),\n            },\n            facets: lucene.facets(def),\n          },\n        },\n        { compound: compound(query, def) }\n      ),\n      count: { type: count }\n    },\n  }),\n  exists: (): Operator => (path: string) => ({ exists: { path } }),\n  text:\n    (value?: OneOrMore<unknown>, fuzzy?: Partial<FuzzyOptions>): Operator =>\n    (path: string) =>\n      ifDefined(value, v => ({\n        text: {\n          path: path === 'wildcard' ? { wildcard: '*' } : path,\n          query: v,\n          ...ifDefined(fuzzy, { fuzzy }),\n        },\n      })),\n  wildcard:\n    (value?: OneOrMore<unknown>, allowAnalyzedField = true): Operator =>\n    (path: string) => ({\n      wildcard: {\n        path: path === 'wildcard' ? { wildcard: '*' } : path,\n        query: ifDefined(value, value, '*'),\n        allowAnalyzedField,\n      },\n    }),\n  lt:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, lt => ({ range: { path, lt } })),\n  lte:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, lte => ({ range: { path, lte } })),\n  gt:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, gt => ({ range: { path, gt } })),\n  gte:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, gte => ({ range: { path, gte } })),\n  after: (date: unknown): Operator => lucene.gte(toMongoType(date)),\n  before: (date: unknown): Operator => lucene.lt(toMongoType(date)),\n  between:\n    (after: unknown, before: unknown): Operator =>\n    (path: string) => ({\n      range: {\n        path,\n        gte: toMongoType(after),\n        lt: toMongoType(before),\n      },\n    }),\n  facets: (def: SearchDefinition) =>\n    entries(def)\n      .filter(([k, v]) => isDefined(v(k)?.facet))\n      .map(([k, v]) => ({ [k]: v(k)?.facet }))\n      .reduce((acc, v) => ({ ...acc, ...v }), {}),\n  facet: {\n    string: (path: string, numBuckets = 1000): Facet => ({\n      type: 'string',\n      path,\n      numBuckets,\n    }),\n    number: (path: string, boundaries: List<number>, alt?: string): Facet => ({\n      type: 'number',\n      path,\n      boundaries,\n      ...ifDefined(alt, a => ({ default: a })),\n    }),\n    date: (path: string, boundaries: List<DateTime>, alt?: string): Facet => ({\n      type: 'date',\n      path,\n      boundaries: boundaries.mapDefined(b => b.toDate()),\n      ...ifDefined(alt, a => ({ default: a })),\n    }),\n  },\n};\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/Lucene.ts"],"sourcesContent":["import {\n  DateTime,\n  entries,\n  Func,\n  ifDefined,\n  ifNotEmpty,\n  ifTrue,\n  isDefined,\n  isEmptyObject,\n  isFunction,\n  List,\n  on,\n  OneOrMore,\n  Optional,\n  RequireAtLeastOne,\n  toArray,\n  toList,\n} from '@thisisagile/easy';\nimport { toMongoType } from './Utils';\n\ntype FuzzyOptions = {\n  maxEdits: number;\n  prefixLength: number;\n  maxExpansions: number;\n};\n\nexport type Facet =\n  | { path: string; type: 'string'; numBuckets: number }\n  | { path: string; type: 'number'; boundaries: number[]; default?: string }\n  | { path: string; type: 'date'; boundaries: Date[]; default?: string };\n\nexport type Operator = Func<Optional<object>, string>;\nexport type Clause = object | Operator;\nexport type Clauses = Record<string, Clause>;\nexport type SearchDefinition = Record<\n  string,\n  (\n    v: string | number\n  ) => RequireAtLeastOne<{ should?: Clauses; filter?: Clauses; must?: Clauses; mustNot?: Clauses; sort?: Record<string, 1 | -1>; facet?: Facet }>\n>;\n\ntype Compound = {\n  must: OneOrMore<Clauses>;\n  should: OneOrMore<Clauses>;\n  mustNot: OneOrMore<Clauses>;\n  filter: OneOrMore<Clauses>;\n};\n\nconst should = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.should);\nconst must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.must);\nconst mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.mustNot);\nconst filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v)?.filter);\n\nconst compound = (query: Record<string, string | number>, def: SearchDefinition): Partial<Compound> =>\n  entries({\n    should: ifNotEmpty(should(query, def).concat(filter(query, def), must(query, def), mustNot(query, def)), should(query, def), [\n      { wildcard: lucene.wildcard() },\n    ]),\n    ...ifNotEmpty(filter(query, def), f => ({ filter: f })),\n    ...ifNotEmpty(mustNot(query, def), m => ({ mustNot: m })),\n    ...ifNotEmpty(must(query, def), m => ({ must: m })),\n  }).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {\n    minimumShouldMatch: should(query, def).length > 0 ? 1 : 0,\n  } as any);\n\nexport const lucene = {\n  clause: (c: Clauses) => entries(c).reduce((res, [k, v]) => res.add(isFunction(v) ? v(k) : v), toList()),\n  clauses: (cs: OneOrMore<Clauses>) => toArray(cs).flatMap(c => lucene.clause(c)),\n  search: (c: Partial<Compound>, index?: string) => ({\n    $search: {\n      ...ifDefined(index, { index }),\n      compound: entries(c).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {} as any),\n    },\n  }),\n  searchWithDef: (query: Record<string, string | number>, options: SearchDefinition, count: 'total' | 'lowerBound' = 'total', index?: string) => {\n    const sort = entries(query)\n      .mapDefined(([k, v]) => options[k]?.(v)?.sort)\n      .first();\n    return {\n      $search: { ...ifDefined(index, { index }), compound: compound(query, options), ...ifDefined(sort, { sort }), count: { type: count } },\n    };\n  },\n  searchMeta: (query: Record<string, string | number>, def: SearchDefinition, count: 'total' | 'lowerBound' = 'total', index?: string) => ({\n    $searchMeta: {\n      ...ifDefined(index, { index }),\n      ...ifTrue(\n        !isEmptyObject(lucene.facets(def)),\n        {\n          facet: {\n            operator: {\n              compound: compound(query, def),\n            },\n            facets: lucene.facets(def),\n          },\n        },\n        { compound: compound(query, def) }\n      ),\n      count: { type: count },\n    },\n  }),\n  exists: (): Operator => (path: string) => ({ exists: { path } }),\n  text:\n    (value?: OneOrMore<unknown>, fuzzy?: Partial<FuzzyOptions>): Operator =>\n    (path: string) =>\n      ifDefined(value, v => ({\n        text: {\n          path: path === 'wildcard' ? { wildcard: '*' } : path,\n          query: v,\n          ...ifDefined(fuzzy, { fuzzy }),\n        },\n      })),\n  wildcard:\n    (value?: OneOrMore<unknown>, allowAnalyzedField = true): Operator =>\n    (path: string) => ({\n      wildcard: {\n        path: path === 'wildcard' ? { wildcard: '*' } : path,\n        query: ifDefined(value, value, '*'),\n        allowAnalyzedField,\n      },\n    }),\n  lt:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, lt => ({ range: { path, lt } })),\n  lte:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, lte => ({ range: { path, lte } })),\n  gt:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, gt => ({ range: { path, gt } })),\n  gte:\n    (value: unknown): Operator =>\n    (path: string) =>\n      ifDefined(value, gte => ({ range: { path, gte } })),\n  after: (date: unknown): Operator => lucene.gte(toMongoType(date)),\n  before: (date: unknown): Operator => lucene.lt(toMongoType(date)),\n  between:\n    (after: unknown, before: unknown): Operator =>\n    (path: string) => ({\n      range: {\n        path,\n        gte: toMongoType(after),\n        lt: toMongoType(before),\n      },\n    }),\n  facets: (def: SearchDefinition) =>\n    entries(def)\n      .filter(([k, v]) => isDefined(v(k)?.facet))\n      .map(([k, v]) => ({ [k]: v(k)?.facet }))\n      .reduce((acc, v) => ({ ...acc, ...v }), {}),\n  facet: {\n    string: (path: string, numBuckets = 1000): Facet => ({\n      type: 'string',\n      path,\n      numBuckets,\n    }),\n    number: (path: string, boundaries: List<number>, alt?: string): Facet => ({\n      type: 'number',\n      path,\n      boundaries,\n      ...ifDefined(alt, a => ({ default: a })),\n    }),\n    date: (path: string, boundaries: List<DateTime>, alt?: string): Facet => ({\n      type: 'date',\n      path,\n      boundaries: boundaries.mapDefined(b => b.toDate()),\n      ...ifDefined(alt, a => ({ default: a })),\n    }),\n  },\n};\n"],"mappings":"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","names":[]}

package/dist/MongoProvider.d.ts

@@ -37,7 +37,7 @@ 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(): Promise<MongoCollection>;
+    collection<T extends Document = Document>(): Promise<MongoCollection<T>>;
     protected toFindOptions(options?: FindOptions): MongoFindOptions & {
         total: boolean;
     };

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(): Promise<MongoCollection> {\n    return this.cluster()\n      .then(c => c.db(this.coll.db.name))\n      .then(db => db.collection(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  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":[]}

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(): Promise<MongoCollection> {\n    return this.cluster()\n      .then(c => c.db(this.coll.db.name))\n      .then(db => db.collection(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  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":[]}

package/package.json

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

package/src/Lucene.ts

@@ -59,7 +59,9 @@ const compound = (query: Record<string, string | number>, def: SearchDefinition)
     ...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);
+  }).reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), {
+    minimumShouldMatch: should(query, def).length > 0 ? 1 : 0,
+  } as any);
 
 export const lucene = {
   clause: (c: Clauses) => entries(c).reduce((res, [k, v]) => res.add(isFunction(v) ? v(k) : v), toList()),
@@ -93,7 +95,7 @@ export const lucene = {
         },
         { compound: compound(query, def) }
       ),
-      count: { type: count }
+      count: { type: count },
     },
   }),
   exists: (): Operator => (path: string) => ({ exists: { path } }),

package/src/MongoProvider.ts

@@ -163,10 +163,10 @@ export class MongoProvider {
     return this.createIndex(ii, { unique: false, ...options });
   }
 
-  collection(): Promise<MongoCollection> {
+  collection<T extends Document = Document>(): Promise<MongoCollection<T>> {
     return this.cluster()
       .then(c => c.db(this.coll.db.name))
-      .then(db => db.collection(asString(this.coll)));
+      .then(db => db.collection<T>(asString(this.coll)));
   }
 
   protected toFindOptions(options?: FindOptions): MongoFindOptions & { total: boolean } {