@webiny/api-elasticsearch 5.37.3 → 5.37.4-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/normalize.d.ts CHANGED
@@ -3,3 +3,4 @@
3
3
  * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters
4
4
  */
5
5
  export declare const normalizeValue: (value: string) => string;
6
+ export declare const normalizeValueWithAsterisk: (initial: string) => string;
package/normalize.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.normalizeValue = void 0;
6
+ exports.normalizeValueWithAsterisk = exports.normalizeValue = void 0;
7
7
  /**
8
8
  * Before performing the query, we need to escape all special characters.
9
9
  * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters
@@ -12,7 +12,7 @@ exports.normalizeValue = void 0;
12
12
  const specialCharacterToSpace = ["-"];
13
13
  const specialCharacters = ["\\\\", "\\+",
14
14
  // "\\-",
15
- "\\=", "\\&\\&", "\\|\\|", ">", "<", "\\!", "\\(", "\\)", "\\{", "\\}", "\\[", "\\]", "\\^", '\\"', "\\~", "\\*", "\\?", "\\:", "\\/", "\\#"];
15
+ "\\=", "\\&\\&", "\\|\\|", ">", "<", "\\!", "\\(", "\\)", "\\{", "\\}", "\\[", "\\]", "\\^", '\\"', "\\~", "\\*", "\\?", "\\:", `\/`, "\\#"];
16
16
  const normalizeValue = value => {
17
17
  let result = value || "";
18
18
  for (const character of specialCharacterToSpace) {
@@ -23,4 +23,25 @@ const normalizeValue = value => {
23
23
  }
24
24
  return result || "";
25
25
  };
26
- exports.normalizeValue = normalizeValue;
26
+ exports.normalizeValue = normalizeValue;
27
+ const normalizeValueWithAsterisk = initial => {
28
+ const value = normalizeValue(initial);
29
+ const results = value.split(" ");
30
+ let result = value;
31
+ /**
32
+ * If there is a / in the first word, do not put asterisk in front of it.
33
+ */
34
+ const firstWord = results[0];
35
+ if (firstWord && firstWord.includes("/") === false) {
36
+ result = `*${result}`;
37
+ }
38
+ /**
39
+ * If there is a / in the last word, do not put asterisk at the end of it.
40
+ */
41
+ const lastWord = results[results.length - 1];
42
+ if (lastWord && lastWord.includes("/") === false) {
43
+ result = `${result}*`;
44
+ }
45
+ return result;
46
+ };
47
+ exports.normalizeValueWithAsterisk = normalizeValueWithAsterisk;
package/normalize.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["specialCharacterToSpace","specialCharacters","normalizeValue","value","result","character","replace","RegExp","exports"],"sources":["normalize.ts"],"sourcesContent":["/**\n * Before performing the query, we need to escape all special characters.\n * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters\n */\n\nconst specialCharacterToSpace = [\"-\"];\n\nconst specialCharacters = [\n \"\\\\\\\\\",\n \"\\\\+\",\n // \"\\\\-\",\n \"\\\\=\",\n \"\\\\&\\\\&\",\n \"\\\\|\\\\|\",\n \">\",\n \"<\",\n \"\\\\!\",\n \"\\\\(\",\n \"\\\\)\",\n \"\\\\{\",\n \"\\\\}\",\n \"\\\\[\",\n \"\\\\]\",\n \"\\\\^\",\n '\\\\\"',\n \"\\\\~\",\n \"\\\\*\",\n \"\\\\?\",\n \"\\\\:\",\n \"\\\\/\",\n \"\\\\#\"\n];\n\nexport const normalizeValue = (value: string) => {\n let result = value || \"\";\n for (const character of specialCharacterToSpace) {\n result = result.replace(new RegExp(character, \"g\"), \" \");\n }\n\n for (const character of specialCharacters) {\n result = result.replace(new RegExp(character, \"g\"), `\\\\${character}`);\n }\n\n return result || \"\";\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;;AAEA,MAAMA,uBAAuB,GAAG,CAAC,GAAG,CAAC;AAErC,MAAMC,iBAAiB,GAAG,CACtB,MAAM,EACN,KAAK;AACL;AACA,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,GAAG,EACH,GAAG,EACH,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,CACR;AAEM,MAAMC,cAAc,GAAIC,KAAa,IAAK;EAC7C,IAAIC,MAAM,GAAGD,KAAK,IAAI,EAAE;EACxB,KAAK,MAAME,SAAS,IAAIL,uBAAuB,EAAE;IAC7CI,MAAM,GAAGA,MAAM,CAACE,OAAO,CAAC,IAAIC,MAAM,CAACF,SAAS,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;EAC5D;EAEA,KAAK,MAAMA,SAAS,IAAIJ,iBAAiB,EAAE;IACvCG,MAAM,GAAGA,MAAM,CAACE,OAAO,CAAC,IAAIC,MAAM,CAACF,SAAS,EAAE,GAAG,CAAC,EAAG,KAAIA,SAAU,EAAC,CAAC;EACzE;EAEA,OAAOD,MAAM,IAAI,EAAE;AACvB,CAAC;AAACI,OAAA,CAAAN,cAAA,GAAAA,cAAA"}
1
+ {"version":3,"names":["specialCharacterToSpace","specialCharacters","normalizeValue","value","result","character","replace","RegExp","exports","normalizeValueWithAsterisk","initial","results","split","firstWord","includes","lastWord","length"],"sources":["normalize.ts"],"sourcesContent":["/**\n * Before performing the query, we need to escape all special characters.\n * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters\n */\n\nconst specialCharacterToSpace = [\"-\"];\n\nconst specialCharacters = [\n \"\\\\\\\\\",\n \"\\\\+\",\n // \"\\\\-\",\n \"\\\\=\",\n \"\\\\&\\\\&\",\n \"\\\\|\\\\|\",\n \">\",\n \"<\",\n \"\\\\!\",\n \"\\\\(\",\n \"\\\\)\",\n \"\\\\{\",\n \"\\\\}\",\n \"\\\\[\",\n \"\\\\]\",\n \"\\\\^\",\n '\\\\\"',\n \"\\\\~\",\n \"\\\\*\",\n \"\\\\?\",\n \"\\\\:\",\n `\\/`,\n \"\\\\#\"\n];\n\nexport const normalizeValue = (value: string) => {\n let result = value || \"\";\n for (const character of specialCharacterToSpace) {\n result = result.replace(new RegExp(character, \"g\"), \" \");\n }\n\n for (const character of specialCharacters) {\n result = result.replace(new RegExp(character, \"g\"), `\\\\${character}`);\n }\n\n return result || \"\";\n};\n\nexport const normalizeValueWithAsterisk = (initial: string) => {\n const value = normalizeValue(initial);\n const results = value.split(\" \");\n\n let result = value;\n /**\n * If there is a / in the first word, do not put asterisk in front of it.\n */\n const firstWord = results[0];\n if (firstWord && firstWord.includes(\"/\") === false) {\n result = `*${result}`;\n }\n /**\n * If there is a / in the last word, do not put asterisk at the end of it.\n */\n const lastWord = results[results.length - 1];\n if (lastWord && lastWord.includes(\"/\") === false) {\n result = `${result}*`;\n }\n\n return result;\n};\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;;AAEA,MAAMA,uBAAuB,GAAG,CAAC,GAAG,CAAC;AAErC,MAAMC,iBAAiB,GAAG,CACtB,MAAM,EACN,KAAK;AACL;AACA,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,GAAG,EACH,GAAG,EACH,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACL,KAAK,EACJ,IAAG,EACJ,KAAK,CACR;AAEM,MAAMC,cAAc,GAAIC,KAAa,IAAK;EAC7C,IAAIC,MAAM,GAAGD,KAAK,IAAI,EAAE;EACxB,KAAK,MAAME,SAAS,IAAIL,uBAAuB,EAAE;IAC7CI,MAAM,GAAGA,MAAM,CAACE,OAAO,CAAC,IAAIC,MAAM,CAACF,SAAS,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC;EAC5D;EAEA,KAAK,MAAMA,SAAS,IAAIJ,iBAAiB,EAAE;IACvCG,MAAM,GAAGA,MAAM,CAACE,OAAO,CAAC,IAAIC,MAAM,CAACF,SAAS,EAAE,GAAG,CAAC,EAAG,KAAIA,SAAU,EAAC,CAAC;EACzE;EAEA,OAAOD,MAAM,IAAI,EAAE;AACvB,CAAC;AAACI,OAAA,CAAAN,cAAA,GAAAA,cAAA;AAEK,MAAMO,0BAA0B,GAAIC,OAAe,IAAK;EAC3D,MAAMP,KAAK,GAAGD,cAAc,CAACQ,OAAO,CAAC;EACrC,MAAMC,OAAO,GAAGR,KAAK,CAACS,KAAK,CAAC,GAAG,CAAC;EAEhC,IAAIR,MAAM,GAAGD,KAAK;EAClB;AACJ;AACA;EACI,MAAMU,SAAS,GAAGF,OAAO,CAAC,CAAC,CAAC;EAC5B,IAAIE,SAAS,IAAIA,SAAS,CAACC,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;IAChDV,MAAM,GAAI,IAAGA,MAAO,EAAC;EACzB;EACA;AACJ;AACA;EACI,MAAMW,QAAQ,GAAGJ,OAAO,CAACA,OAAO,CAACK,MAAM,GAAG,CAAC,CAAC;EAC5C,IAAID,QAAQ,IAAIA,QAAQ,CAACD,QAAQ,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;IAC9CV,MAAM,GAAI,GAAEA,MAAO,GAAE;EACzB;EAEA,OAAOA,MAAM;AACjB,CAAC;AAACI,OAAA,CAAAC,0BAAA,GAAAA,0BAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/api-elasticsearch",
3
- "version": "5.37.3",
3
+ "version": "5.37.4-beta.1",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/webiny/webiny-js.git",
@@ -13,10 +13,10 @@
13
13
  "license": "MIT",
14
14
  "dependencies": {
15
15
  "@elastic/elasticsearch": "7.12.0",
16
- "@webiny/api": "5.37.3",
17
- "@webiny/error": "5.37.3",
18
- "@webiny/plugins": "5.37.3",
19
- "@webiny/utils": "5.37.3",
16
+ "@webiny/api": "5.37.4-beta.1",
17
+ "@webiny/error": "5.37.4-beta.1",
18
+ "@webiny/plugins": "5.37.4-beta.1",
19
+ "@webiny/utils": "5.37.4-beta.1",
20
20
  "aws-elasticsearch-connector": "9.2.0",
21
21
  "aws-sdk": "2.1310.0",
22
22
  "elastic-ts": "0.8.0"
@@ -24,8 +24,8 @@
24
24
  "devDependencies": {
25
25
  "@babel/cli": "7.22.6",
26
26
  "@babel/core": "7.22.8",
27
- "@webiny/cli": "5.37.3",
28
- "@webiny/project-utils": "5.37.3",
27
+ "@webiny/cli": "5.37.4-beta.1",
28
+ "@webiny/project-utils": "5.37.4-beta.1",
29
29
  "rimraf": "3.0.2",
30
30
  "ttypescript": "1.5.15",
31
31
  "typescript": "4.7.4"
@@ -45,5 +45,5 @@
45
45
  ]
46
46
  }
47
47
  },
48
- "gitHead": "c454fc068c68c86bd817b21291e51c845296c15a"
48
+ "gitHead": "be5b7d29a08583657ab5abfc89bdc9512c975116"
49
49
  }
@@ -25,7 +25,7 @@ class ElasticsearchQueryBuilderOperatorContainsPlugin extends _ElasticsearchQuer
25
25
  query_string: {
26
26
  allow_leading_wildcard: true,
27
27
  fields: [basePath],
28
- query: `*${(0, _normalize.normalizeValue)(value)}*`,
28
+ query: (0, _normalize.normalizeValueWithAsterisk)(value),
29
29
  default_operator: "and"
30
30
  }
31
31
  });
@@ -1 +1 @@
1
- {"version":3,"names":["_ElasticsearchQueryBuilderOperatorPlugin","require","_normalize","ElasticsearchQueryBuilderOperatorContainsPlugin","ElasticsearchQueryBuilderOperatorPlugin","constructor","args","_defineProperty2","default","getOperator","apply","query","params","value","basePath","must","push","query_string","allow_leading_wildcard","fields","normalizeValue","default_operator","exports"],"sources":["contains.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { normalizeValue } from \"~/normalize\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n public override name = \"elasticsearch.queryBuilder.operator.contains.default\";\n\n public getOperator(): string {\n return \"contains\";\n }\n\n public apply(\n query: ElasticsearchBoolQueryConfig,\n params: ElasticsearchQueryBuilderArgsPlugin\n ): void {\n const { value, basePath } = params;\n query.must.push({\n query_string: {\n allow_leading_wildcard: true,\n fields: [basePath],\n query: `*${normalizeValue(value)}*`,\n default_operator: \"and\"\n }\n });\n }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,wCAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAGO,MAAME,+CAA+C,SAASC,gFAAuC,CAAC;EAAAC,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,gBAClF,sDAAsD;EAAA;EAEtEC,WAAWA,CAAA,EAAW;IACzB,OAAO,UAAU;EACrB;EAEOC,KAAKA,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGF,MAAM;IAClCD,KAAK,CAACI,IAAI,CAACC,IAAI,CAAC;MACZC,YAAY,EAAE;QACVC,sBAAsB,EAAE,IAAI;QAC5BC,MAAM,EAAE,CAACL,QAAQ,CAAC;QAClBH,KAAK,EAAG,IAAG,IAAAS,yBAAc,EAACP,KAAK,CAAE,GAAE;QACnCQ,gBAAgB,EAAE;MACtB;IACJ,CAAC,CAAC;EACN;AACJ;AAACC,OAAA,CAAAnB,+CAAA,GAAAA,+CAAA"}
1
+ {"version":3,"names":["_ElasticsearchQueryBuilderOperatorPlugin","require","_normalize","ElasticsearchQueryBuilderOperatorContainsPlugin","ElasticsearchQueryBuilderOperatorPlugin","constructor","args","_defineProperty2","default","getOperator","apply","query","params","value","basePath","must","push","query_string","allow_leading_wildcard","fields","normalizeValueWithAsterisk","default_operator","exports"],"sources":["contains.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { normalizeValueWithAsterisk } from \"~/normalize\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n public override name = \"elasticsearch.queryBuilder.operator.contains.default\";\n\n public getOperator(): string {\n return \"contains\";\n }\n\n public apply(\n query: ElasticsearchBoolQueryConfig,\n params: ElasticsearchQueryBuilderArgsPlugin\n ): void {\n const { value, basePath } = params;\n query.must.push({\n query_string: {\n allow_leading_wildcard: true,\n fields: [basePath],\n query: normalizeValueWithAsterisk(value),\n default_operator: \"and\"\n }\n });\n }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,wCAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAGO,MAAME,+CAA+C,SAASC,gFAAuC,CAAC;EAAAC,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,gBAClF,sDAAsD;EAAA;EAEtEC,WAAWA,CAAA,EAAW;IACzB,OAAO,UAAU;EACrB;EAEOC,KAAKA,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGF,MAAM;IAClCD,KAAK,CAACI,IAAI,CAACC,IAAI,CAAC;MACZC,YAAY,EAAE;QACVC,sBAAsB,EAAE,IAAI;QAC5BC,MAAM,EAAE,CAACL,QAAQ,CAAC;QAClBH,KAAK,EAAE,IAAAS,qCAA0B,EAACP,KAAK,CAAC;QACxCQ,gBAAgB,EAAE;MACtB;IACJ,CAAC,CAAC;EACN;AACJ;AAACC,OAAA,CAAAnB,+CAAA,GAAAA,+CAAA"}
@@ -27,17 +27,17 @@ class ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin extends _Elasticse
27
27
  value: initialValue,
28
28
  basePath
29
29
  } = params;
30
- const value = (0, _normalize.normalizeValue)(initialValue);
30
+ const value = (0, _normalize.normalizeValueWithAsterisk)(initialValue);
31
31
  query.must.push({
32
32
  multi_match: {
33
- query: `*${value}*`,
33
+ query: value,
34
34
  type: "phrase",
35
35
  fields: [`${basePath}.ngram`]
36
36
  }
37
37
  });
38
38
  query.should.push({
39
39
  multi_match: {
40
- query: `*${value}*`,
40
+ query: value,
41
41
  type: "phrase",
42
42
  fields: [`${basePath}`]
43
43
  }
@@ -1 +1 @@
1
- {"version":3,"names":["_ElasticsearchQueryBuilderOperatorPlugin","require","_normalize","ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin","ElasticsearchQueryBuilderOperatorPlugin","constructor","args","_defineProperty2","default","isLocaleSupported","code","includes","toLowerCase","getOperator","apply","query","params","value","initialValue","basePath","normalizeValue","must","push","multi_match","type","fields","should","exports"],"sources":["contains.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { normalizeValue } from \"~/normalize\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n public override name = \"elasticsearch.queryBuilder.operator.contains.japanese\";\n\n public override isLocaleSupported(code: string): boolean {\n if (!code) {\n return false;\n }\n return [\"ja\", \"ja-jp\"].includes(code.toLowerCase());\n }\n\n public getOperator(): string {\n return \"contains\";\n }\n\n public apply(\n query: ElasticsearchBoolQueryConfig,\n params: ElasticsearchQueryBuilderArgsPlugin\n ): void {\n const { value: initialValue, basePath } = params;\n\n const value = normalizeValue(initialValue);\n query.must.push({\n multi_match: {\n query: `*${value}*`,\n type: \"phrase\",\n fields: [`${basePath}.ngram`]\n }\n });\n query.should.push({\n multi_match: {\n query: `*${value}*`,\n type: \"phrase\",\n fields: [`${basePath}`]\n }\n });\n }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,wCAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAGO,MAAME,uDAAuD,SAASC,gFAAuC,CAAC;EAAAC,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,gBAC1F,uDAAuD;EAAA;EAE9DC,iBAAiBA,CAACC,IAAY,EAAW;IACrD,IAAI,CAACA,IAAI,EAAE;MACP,OAAO,KAAK;IAChB;IACA,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAACC,QAAQ,CAACD,IAAI,CAACE,WAAW,CAAC,CAAC,CAAC;EACvD;EAEOC,WAAWA,CAAA,EAAW;IACzB,OAAO,UAAU;EACrB;EAEOC,KAAKA,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK,EAAEC,YAAY;MAAEC;IAAS,CAAC,GAAGH,MAAM;IAEhD,MAAMC,KAAK,GAAG,IAAAG,yBAAc,EAACF,YAAY,CAAC;IAC1CH,KAAK,CAACM,IAAI,CAACC,IAAI,CAAC;MACZC,WAAW,EAAE;QACTR,KAAK,EAAG,IAAGE,KAAM,GAAE;QACnBO,IAAI,EAAE,QAAQ;QACdC,MAAM,EAAE,CAAE,GAAEN,QAAS,QAAO;MAChC;IACJ,CAAC,CAAC;IACFJ,KAAK,CAACW,MAAM,CAACJ,IAAI,CAAC;MACdC,WAAW,EAAE;QACTR,KAAK,EAAG,IAAGE,KAAM,GAAE;QACnBO,IAAI,EAAE,QAAQ;QACdC,MAAM,EAAE,CAAE,GAAEN,QAAS,EAAC;MAC1B;IACJ,CAAC,CAAC;EACN;AACJ;AAACQ,OAAA,CAAAxB,uDAAA,GAAAA,uDAAA"}
1
+ {"version":3,"names":["_ElasticsearchQueryBuilderOperatorPlugin","require","_normalize","ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin","ElasticsearchQueryBuilderOperatorPlugin","constructor","args","_defineProperty2","default","isLocaleSupported","code","includes","toLowerCase","getOperator","apply","query","params","value","initialValue","basePath","normalizeValueWithAsterisk","must","push","multi_match","type","fields","should","exports"],"sources":["contains.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { normalizeValueWithAsterisk } from \"~/normalize\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderJapaneseOperatorContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n public override name = \"elasticsearch.queryBuilder.operator.contains.japanese\";\n\n public override isLocaleSupported(code: string): boolean {\n if (!code) {\n return false;\n }\n return [\"ja\", \"ja-jp\"].includes(code.toLowerCase());\n }\n\n public getOperator(): string {\n return \"contains\";\n }\n\n public apply(\n query: ElasticsearchBoolQueryConfig,\n params: ElasticsearchQueryBuilderArgsPlugin\n ): void {\n const { value: initialValue, basePath } = params;\n\n const value = normalizeValueWithAsterisk(initialValue);\n query.must.push({\n multi_match: {\n query: value,\n type: \"phrase\",\n fields: [`${basePath}.ngram`]\n }\n });\n query.should.push({\n multi_match: {\n query: value,\n type: \"phrase\",\n fields: [`${basePath}`]\n }\n });\n }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,wCAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAGO,MAAME,uDAAuD,SAASC,gFAAuC,CAAC;EAAAC,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,gBAC1F,uDAAuD;EAAA;EAE9DC,iBAAiBA,CAACC,IAAY,EAAW;IACrD,IAAI,CAACA,IAAI,EAAE;MACP,OAAO,KAAK;IAChB;IACA,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAACC,QAAQ,CAACD,IAAI,CAACE,WAAW,CAAC,CAAC,CAAC;EACvD;EAEOC,WAAWA,CAAA,EAAW;IACzB,OAAO,UAAU;EACrB;EAEOC,KAAKA,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK,EAAEC,YAAY;MAAEC;IAAS,CAAC,GAAGH,MAAM;IAEhD,MAAMC,KAAK,GAAG,IAAAG,qCAA0B,EAACF,YAAY,CAAC;IACtDH,KAAK,CAACM,IAAI,CAACC,IAAI,CAAC;MACZC,WAAW,EAAE;QACTR,KAAK,EAAEE,KAAK;QACZO,IAAI,EAAE,QAAQ;QACdC,MAAM,EAAE,CAAE,GAAEN,QAAS,QAAO;MAChC;IACJ,CAAC,CAAC;IACFJ,KAAK,CAACW,MAAM,CAACJ,IAAI,CAAC;MACdC,WAAW,EAAE;QACTR,KAAK,EAAEE,KAAK;QACZO,IAAI,EAAE,QAAQ;QACdC,MAAM,EAAE,CAAE,GAAEN,QAAS,EAAC;MAC1B;IACJ,CAAC,CAAC;EACN;AACJ;AAACQ,OAAA,CAAAxB,uDAAA,GAAAA,uDAAA"}
@@ -25,7 +25,7 @@ class ElasticsearchQueryBuilderOperatorNotContainsPlugin extends _ElasticsearchQ
25
25
  query_string: {
26
26
  allow_leading_wildcard: true,
27
27
  fields: [basePath],
28
- query: `*${(0, _normalize.normalizeValue)(value)}*`,
28
+ query: (0, _normalize.normalizeValueWithAsterisk)(value),
29
29
  default_operator: "and"
30
30
  }
31
31
  });
@@ -1 +1 @@
1
- {"version":3,"names":["_ElasticsearchQueryBuilderOperatorPlugin","require","_normalize","ElasticsearchQueryBuilderOperatorNotContainsPlugin","ElasticsearchQueryBuilderOperatorPlugin","constructor","args","_defineProperty2","default","getOperator","apply","query","params","value","basePath","must_not","push","query_string","allow_leading_wildcard","fields","normalizeValue","default_operator","exports"],"sources":["notContains.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { normalizeValue } from \"~/normalize\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorNotContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n public override name = \"elasticsearch.queryBuilder.operator.notContains.default\";\n\n public getOperator(): string {\n return \"not_contains\";\n }\n\n public apply(\n query: ElasticsearchBoolQueryConfig,\n params: ElasticsearchQueryBuilderArgsPlugin\n ): void {\n const { value, basePath } = params;\n query.must_not.push({\n query_string: {\n allow_leading_wildcard: true,\n fields: [basePath],\n query: `*${normalizeValue(value)}*`,\n default_operator: \"and\"\n }\n });\n }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,wCAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAGO,MAAME,kDAAkD,SAASC,gFAAuC,CAAC;EAAAC,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,gBACrF,yDAAyD;EAAA;EAEzEC,WAAWA,CAAA,EAAW;IACzB,OAAO,cAAc;EACzB;EAEOC,KAAKA,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGF,MAAM;IAClCD,KAAK,CAACI,QAAQ,CAACC,IAAI,CAAC;MAChBC,YAAY,EAAE;QACVC,sBAAsB,EAAE,IAAI;QAC5BC,MAAM,EAAE,CAACL,QAAQ,CAAC;QAClBH,KAAK,EAAG,IAAG,IAAAS,yBAAc,EAACP,KAAK,CAAE,GAAE;QACnCQ,gBAAgB,EAAE;MACtB;IACJ,CAAC,CAAC;EACN;AACJ;AAACC,OAAA,CAAAnB,kDAAA,GAAAA,kDAAA"}
1
+ {"version":3,"names":["_ElasticsearchQueryBuilderOperatorPlugin","require","_normalize","ElasticsearchQueryBuilderOperatorNotContainsPlugin","ElasticsearchQueryBuilderOperatorPlugin","constructor","args","_defineProperty2","default","getOperator","apply","query","params","value","basePath","must_not","push","query_string","allow_leading_wildcard","fields","normalizeValueWithAsterisk","default_operator","exports"],"sources":["notContains.ts"],"sourcesContent":["import { ElasticsearchQueryBuilderOperatorPlugin } from \"~/plugins/definition/ElasticsearchQueryBuilderOperatorPlugin\";\nimport { normalizeValueWithAsterisk } from \"~/normalize\";\nimport { ElasticsearchBoolQueryConfig, ElasticsearchQueryBuilderArgsPlugin } from \"~/types\";\n\nexport class ElasticsearchQueryBuilderOperatorNotContainsPlugin extends ElasticsearchQueryBuilderOperatorPlugin {\n public override name = \"elasticsearch.queryBuilder.operator.notContains.default\";\n\n public getOperator(): string {\n return \"not_contains\";\n }\n\n public apply(\n query: ElasticsearchBoolQueryConfig,\n params: ElasticsearchQueryBuilderArgsPlugin\n ): void {\n const { value, basePath } = params;\n query.must_not.push({\n query_string: {\n allow_leading_wildcard: true,\n fields: [basePath],\n query: normalizeValueWithAsterisk(value),\n default_operator: \"and\"\n }\n });\n }\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,wCAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAGO,MAAME,kDAAkD,SAASC,gFAAuC,CAAC;EAAAC,YAAA,GAAAC,IAAA;IAAA,SAAAA,IAAA;IAAA,IAAAC,gBAAA,CAAAC,OAAA,gBACrF,yDAAyD;EAAA;EAEzEC,WAAWA,CAAA,EAAW;IACzB,OAAO,cAAc;EACzB;EAEOC,KAAKA,CACRC,KAAmC,EACnCC,MAA2C,EACvC;IACJ,MAAM;MAAEC,KAAK;MAAEC;IAAS,CAAC,GAAGF,MAAM;IAClCD,KAAK,CAACI,QAAQ,CAACC,IAAI,CAAC;MAChBC,YAAY,EAAE;QACVC,sBAAsB,EAAE,IAAI;QAC5BC,MAAM,EAAE,CAACL,QAAQ,CAAC;QAClBH,KAAK,EAAE,IAAAS,qCAA0B,EAACP,KAAK,CAAC;QACxCQ,gBAAgB,EAAE;MACtB;IACJ,CAAC,CAAC;EACN;AACJ;AAACC,OAAA,CAAAnB,kDAAA,GAAAA,kDAAA"}