@thisisagile/easy-mongo 15.25.3 → 15.26.0

package/dist/Lucene.d.ts

@@ -39,7 +39,7 @@ type Compound = {
 export declare const lucene: {
     clause: (c: Clauses) => List<unknown>;
     clauses: (cs: OneOrMore<Clauses>) => unknown[];
-    compound: (query: Record<string, string | number>, def: SearchDefinition) => Partial<Compound>;
+    compound: (query: Record<string, string | number>, def: SearchDefinition, wildcard?: boolean) => Partial<Compound>;
     search: (c: Partial<Compound>, index?: string) => {
         $search: {
             compound: any;

package/dist/Lucene.js

@@ -30,16 +30,16 @@ const filter = (query, def) => (0, import_easy.entries)(query).mapDefined(([k, v
 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)),
-  compound: (query, def) => (0, import_easy.entries)({
-    should: (0, import_easy.ifNotEmpty)(should(query, def).concat(filter(query, def), must(query, def), mustNot(query, def)), should(query, def), [
-      { wildcard: lucene.wildcard() }
-    ]),
-    ...(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)), {
-    minimumShouldMatch: should(query, def).length > 0 ? 1 : 0
-  }),
+  compound: (query, def, wildcard = true) => (0, import_easy.ifNotEmpty)(
+    (0, import_easy.entries)({
+      should: should(query, def),
+      filter: filter(query, def),
+      mustNot: mustNot(query, def),
+      must: must(query, def)
+    }).filter(([_, v]) => v.length > 0),
+    (e) => e.reduce((res, [k, v]) => (0, import_easy.on)(res, (r) => r[k] = lucene.clauses(v)), { minimumShouldMatch: should(query, def).length > 0 ? 1 : 0 }),
+    () => (0, import_easy.ifTrue)(wildcard, () => ({ should: lucene.clauses([{ wildcard: lucene.wildcard() }]), minimumShouldMatch: 0 }))
+  ),
   search: (c, index) => ({
     $search: {
       ...(0, import_easy.ifDefined)(index, { index }),

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    q?: Record<string, 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, query)?.should);\nconst must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.must);\nconst mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] =>\n  entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.mustNot);\nconst filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.filter);\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  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  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, query)?.sort)\n      .first();\n    return {\n      $search: { ...ifDefined(index, { index }), compound: lucene.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: lucene.compound(query, def),\n            },\n            facets: lucene.facets(def),\n          },\n        },\n        { compound: lucene.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;AA+B5B,MAAM,SAAS,CAAC,OAAwC,YAAqC,qBAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,MAAM;AAC7J,MAAM,OAAO,CAAC,OAAwC,YAAqC,qBAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,IAAI;AACzJ,MAAM,UAAU,CAAC,OAAwC,YACvD,qBAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,OAAO;AACnE,MAAM,SAAS,CAAC,OAAwC,YAAqC,qBAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,MAAM;AAEtJ,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,UAAU,CAAC,OAAwC,YACjD,qBAAQ;AAAA,IACN,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,MAC3H,EAAE,UAAU,OAAO,SAAS,EAAE;AAAA,IAChC,CAAC;AAAA,IACD,OAAG,wBAAW,OAAO,OAAO,GAAG,GAAG,QAAM,EAAE,QAAQ,EAAE,EAAE;AAAA,IACtD,OAAG,wBAAW,QAAQ,OAAO,GAAG,GAAG,QAAM,EAAE,SAAS,EAAE,EAAE;AAAA,IACxD,OAAG,wBAAW,KAAK,OAAO,GAAG,GAAG,QAAM,EAAE,MAAM,EAAE,EAAE;AAAA,EACpD,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,UAAM,gBAAG,KAAK,OAAM,EAAE,CAAC,IAAI,OAAO,QAAQ,CAAC,CAAE,GAAG;AAAA,IACnE,oBAAoB,OAAO,OAAO,GAAG,EAAE,SAAS,IAAI,IAAI;AAAA,EAC1D,CAAQ;AAAA,EACV,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,GAAG,KAAK,GAAG,IAAI,EACnD,MAAM;AACT,WAAO;AAAA,MACL,SAAS,EAAE,OAAG,uBAAU,OAAO,EAAE,MAAM,CAAC,GAAG,UAAU,OAAO,SAAS,OAAO,OAAO,GAAG,OAAG,uBAAU,MAAM,EAAE,KAAK,CAAC,GAAG,OAAO,EAAE,MAAM,MAAM,EAAE;AAAA,IAC7I;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,OAAO,SAAS,OAAO,GAAG;AAAA,YACtC;AAAA,YACA,QAAQ,OAAO,OAAO,GAAG;AAAA,UAC3B;AAAA,QACF;AAAA,QACA,EAAE,UAAU,OAAO,SAAS,OAAO,GAAG,EAAE;AAAA,MAC1C;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":[]}
+{"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    q?: Record<string, 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, query)?.should);\nconst must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.must);\nconst mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] =>\n  entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.mustNot);\nconst filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.filter);\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  compound: (query: Record<string, string | number>, def: SearchDefinition, wildcard = true): Partial<Compound> =>\n    ifNotEmpty(\n      entries({\n        should: should(query, def),\n        filter: filter(query, def),\n        mustNot: mustNot(query, def),\n        must: must(query, def),\n      }).filter(([_, v]) => v.length > 0),\n      e => e.reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), { minimumShouldMatch: should(query, def).length > 0 ? 1 : 0 } as any),\n      () => ifTrue(wildcard, () => ({ should: lucene.clauses([{ wildcard: lucene.wildcard() }]), minimumShouldMatch: 0 }))\n    ),\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, query)?.sort)\n      .first();\n    return {\n      $search: { ...ifDefined(index, { index }), compound: lucene.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: lucene.compound(query, def),\n            },\n            facets: lucene.facets(def),\n          },\n        },\n        { compound: lucene.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/Lucene.mjs

@@ -18,16 +18,16 @@ const filter = (query, def) => entries(query).mapDefined(([k, v]) => def[k]?.(v,
 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)),
-  compound: (query, def) => 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)), {
-    minimumShouldMatch: should(query, def).length > 0 ? 1 : 0
-  }),
+  compound: (query, def, wildcard = true) => ifNotEmpty(
+    entries({
+      should: should(query, def),
+      filter: filter(query, def),
+      mustNot: mustNot(query, def),
+      must: must(query, def)
+    }).filter(([_, v]) => v.length > 0),
+    (e) => e.reduce((res, [k, v]) => on(res, (r) => r[k] = lucene.clauses(v)), { minimumShouldMatch: should(query, def).length > 0 ? 1 : 0 }),
+    () => ifTrue(wildcard, () => ({ should: lucene.clauses([{ wildcard: lucene.wildcard() }]), minimumShouldMatch: 0 }))
+  ),
   search: (c, index) => ({
     $search: {
       ...ifDefined(index, { index }),

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    q?: Record<string, 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, query)?.should);\nconst must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.must);\nconst mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] =>\n  entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.mustNot);\nconst filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.filter);\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  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  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, query)?.sort)\n      .first();\n    return {\n      $search: { ...ifDefined(index, { index }), compound: lucene.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: lucene.compound(query, def),\n            },\n            facets: lucene.facets(def),\n          },\n        },\n        { compound: lucene.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,EAEE;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EAIA;AAAA,EACA;AAAA,OACK;AACP,SAAS,mBAAmB;AA+B5B,MAAM,SAAS,CAAC,OAAwC,QAAqC,QAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,MAAM;AAC7J,MAAM,OAAO,CAAC,OAAwC,QAAqC,QAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,IAAI;AACzJ,MAAM,UAAU,CAAC,OAAwC,QACvD,QAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,OAAO;AACnE,MAAM,SAAS,CAAC,OAAwC,QAAqC,QAAQ,KAAK,EAAE,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,GAAG,KAAK,GAAG,MAAM;AAEtJ,MAAM,SAAS;AAAA,EACpB,QAAQ,CAAC,MAAe,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;AAAA,EACtG,SAAS,CAAC,OAA2B,QAAQ,EAAE,EAAE,QAAQ,OAAK,OAAO,OAAO,CAAC,CAAC;AAAA,EAC9E,UAAU,CAAC,OAAwC,QACjD,QAAQ;AAAA,IACN,QAAQ,WAAW,OAAO,OAAO,GAAG,EAAE,OAAO,OAAO,OAAO,GAAG,GAAG,KAAK,OAAO,GAAG,GAAG,QAAQ,OAAO,GAAG,CAAC,GAAG,OAAO,OAAO,GAAG,GAAG;AAAA,MAC3H,EAAE,UAAU,OAAO,SAAS,EAAE;AAAA,IAChC,CAAC;AAAA,IACD,GAAG,WAAW,OAAO,OAAO,GAAG,GAAG,QAAM,EAAE,QAAQ,EAAE,EAAE;AAAA,IACtD,GAAG,WAAW,QAAQ,OAAO,GAAG,GAAG,QAAM,EAAE,SAAS,EAAE,EAAE;AAAA,IACxD,GAAG,WAAW,KAAK,OAAO,GAAG,GAAG,QAAM,EAAE,MAAM,EAAE,EAAE;AAAA,EACpD,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,KAAK,OAAM,EAAE,CAAC,IAAI,OAAO,QAAQ,CAAC,CAAE,GAAG;AAAA,IACnE,oBAAoB,OAAO,OAAO,GAAG,EAAE,SAAS,IAAI,IAAI;AAAA,EAC1D,CAAQ;AAAA,EACV,QAAQ,CAAC,GAAsB,WAAoB;AAAA,IACjD,SAAS;AAAA,MACP,GAAG,UAAU,OAAO,EAAE,MAAM,CAAC;AAAA,MAC7B,UAAU,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,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,OAAO,QAAQ,KAAK,EACvB,WAAW,CAAC,CAAC,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,GAAG,KAAK,GAAG,IAAI,EACnD,MAAM;AACT,WAAO;AAAA,MACL,SAAS,EAAE,GAAG,UAAU,OAAO,EAAE,MAAM,CAAC,GAAG,UAAU,OAAO,SAAS,OAAO,OAAO,GAAG,GAAG,UAAU,MAAM,EAAE,KAAK,CAAC,GAAG,OAAO,EAAE,MAAM,MAAM,EAAE;AAAA,IAC7I;AAAA,EACF;AAAA,EACA,YAAY,CAAC,OAAwC,KAAuB,QAAgC,SAAS,WAAoB;AAAA,IACvI,aAAa;AAAA,MACX,GAAG,UAAU,OAAO,EAAE,MAAM,CAAC;AAAA,MAC7B,GAAG;AAAA,QACD,CAAC,cAAc,OAAO,OAAO,GAAG,CAAC;AAAA,QACjC;AAAA,UACE,OAAO;AAAA,YACL,UAAU;AAAA,cACR,UAAU,OAAO,SAAS,OAAO,GAAG;AAAA,YACtC;AAAA,YACA,QAAQ,OAAO,OAAO,GAAG;AAAA,UAC3B;AAAA,QACF;AAAA,QACA,EAAE,UAAU,OAAO,SAAS,OAAO,GAAG,EAAE;AAAA,MAC1C;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,SACC,UAAU,OAAO,QAAM;AAAA,IACrB,MAAM;AAAA,MACJ,MAAM,SAAS,aAAa,EAAE,UAAU,IAAI,IAAI;AAAA,MAChD,OAAO;AAAA,MACP,GAAG,UAAU,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,OAAO,UAAU,OAAO,OAAO,GAAG;AAAA,MAClC;AAAA,IACF;AAAA,EACF;AAAA,EACF,IACE,CAAC,UACD,CAAC,SACC,UAAU,OAAO,SAAO,EAAE,OAAO,EAAE,MAAM,GAAG,EAAE,EAAE;AAAA,EACpD,KACE,CAAC,UACD,CAAC,SACC,UAAU,OAAO,UAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,EAAE;AAAA,EACtD,IACE,CAAC,UACD,CAAC,SACC,UAAU,OAAO,SAAO,EAAE,OAAO,EAAE,MAAM,GAAG,EAAE,EAAE;AAAA,EACpD,KACE,CAAC,UACD,CAAC,SACC,UAAU,OAAO,UAAQ,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,EAAE;AAAA,EACtD,OAAO,CAAC,SAA4B,OAAO,IAAI,YAAY,IAAI,CAAC;AAAA,EAChE,QAAQ,CAAC,SAA4B,OAAO,GAAG,YAAY,IAAI,CAAC;AAAA,EAChE,SACE,CAAC,OAAgB,WACjB,CAAC,UAAkB;AAAA,IACjB,OAAO;AAAA,MACL;AAAA,MACA,KAAK,YAAY,KAAK;AAAA,MACtB,IAAI,YAAY,MAAM;AAAA,IACxB;AAAA,EACF;AAAA,EACF,QAAQ,CAAC,QACP,QAAQ,GAAG,EACR,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,UAAU,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,GAAG,UAAU,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,GAAG,UAAU,KAAK,QAAM,EAAE,SAAS,EAAE,EAAE;AAAA,IACzC;AAAA,EACF;AACF;","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    q?: Record<string, 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, query)?.should);\nconst must = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.must);\nconst mustNot = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] =>\n  entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.mustNot);\nconst filter = (query: Record<string, string | number>, def: SearchDefinition): Clauses[] => entries(query).mapDefined(([k, v]) => def[k]?.(v, query)?.filter);\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  compound: (query: Record<string, string | number>, def: SearchDefinition, wildcard = true): Partial<Compound> =>\n    ifNotEmpty(\n      entries({\n        should: should(query, def),\n        filter: filter(query, def),\n        mustNot: mustNot(query, def),\n        must: must(query, def),\n      }).filter(([_, v]) => v.length > 0),\n      e => e.reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), { minimumShouldMatch: should(query, def).length > 0 ? 1 : 0 } as any),\n      () => ifTrue(wildcard, () => ({ should: lucene.clauses([{ wildcard: lucene.wildcard() }]), minimumShouldMatch: 0 }))\n    ),\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, query)?.sort)\n      .first();\n    return {\n      $search: { ...ifDefined(index, { index }), compound: lucene.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: lucene.compound(query, def),\n            },\n            facets: lucene.facets(def),\n          },\n        },\n        { compound: lucene.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/package.json

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

package/src/Lucene.ts

@@ -56,17 +56,17 @@ const filter = (query: Record<string, string | number>, def: SearchDefinition):
 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)),
-  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))), {
-      minimumShouldMatch: should(query, def).length > 0 ? 1 : 0,
-    } as any),
+  compound: (query: Record<string, string | number>, def: SearchDefinition, wildcard = true): Partial<Compound> =>
+    ifNotEmpty(
+      entries({
+        should: should(query, def),
+        filter: filter(query, def),
+        mustNot: mustNot(query, def),
+        must: must(query, def),
+      }).filter(([_, v]) => v.length > 0),
+      e => e.reduce((res, [k, v]) => on(res, r => (r[k] = lucene.clauses(v))), { minimumShouldMatch: should(query, def).length > 0 ? 1 : 0 } as any),
+      () => ifTrue(wildcard, () => ({ should: lucene.clauses([{ wildcard: lucene.wildcard() }]), minimumShouldMatch: 0 }))
+    ),
   search: (c: Partial<Compound>, index?: string) => ({
     $search: {
       ...ifDefined(index, { index }),