aws-service-stack 0.18.412 → 0.18.413
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.
|
@@ -41,6 +41,10 @@ function buildSearchQueryOS(queryParams, config) {
|
|
|
41
41
|
const builtQuery = fn(field, value);
|
|
42
42
|
if (builtQuery.negation)
|
|
43
43
|
boolQuery.must_not.push(builtQuery.query);
|
|
44
|
+
else if (boolQueryType === types_1.BoolQueryTypeOS.prefix) {
|
|
45
|
+
boolQuery.should.push(builtQuery?.query ? builtQuery.query : builtQuery);
|
|
46
|
+
boolQuery.minimum_should_match = 1;
|
|
47
|
+
}
|
|
44
48
|
else
|
|
45
49
|
boolQuery.must.push(builtQuery?.query ? builtQuery.query : builtQuery);
|
|
46
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"opensearch.parser.js","sourceRoot":"","sources":["../../../src/utils/opensearch/opensearch.parser.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"opensearch.parser.js","sourceRoot":"","sources":["../../../src/utils/opensearch/opensearch.parser.ts"],"names":[],"mappings":"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","sourcesContent":["import { BoolQueryOS, BoolQueryTypeOS, EntityConfig, RangeTypeOS } from \"@chinggis/types\";\nimport { buildSearchKeyword } from \"./opensearch.parser.keyword\";\nimport { buildSortOS } from \"./opensearch.parser.sort\";\nimport { boolQueryMap } from \"./opensearch.parser.query.map\";\nimport { parseQueryString } from \"./opensearch.parser.utils\";\nimport { calculatePagination } from \"../opensearch.utils\";\nimport { buildAggregations } from \"./opensearch.parser.aggs\";\n\n// ---------------- Main Function ----------------\nexport function buildSearchQueryOS(queryParams: any, config: EntityConfig) {\n const filterObject =\n typeof queryParams === \"string\" ? Object.fromEntries(new URLSearchParams(queryParams)) : queryParams;\n\n if (config.OWNER_PARENT_ID_FIELD_NAME && filterObject[config.OWNER_PARENT_ID_FIELD_NAME]) {\n filterObject[config.OWNER_PARENT_ID_FIELD_NAME + \".keyword__eq\"] = filterObject[config.OWNER_PARENT_ID_FIELD_NAME];\n }\n\n if (config.OWNER_ID_FIELD_NAME && filterObject[config.OWNER_ID_FIELD_NAME]) {\n filterObject[config.OWNER_ID_FIELD_NAME + \".keyword__eq\"] = filterObject[config.OWNER_ID_FIELD_NAME];\n }\n\n const filters = parseQueryString(filterObject);\n\n const filterMap: Record<string, any> = {}; // merge range per field\n\n const boolQuery: BoolQueryOS = {\n must: [],\n must_not: [],\n filter: [],\n should: [],\n minimum_should_match: undefined,\n };\n\n for (const [key, value] of Object.entries(filters)) {\n const [field, boolQueryType = BoolQueryTypeOS.eq] = key.split(\"__\");\n const fn = boolQueryMap[boolQueryType];\n if (!fn) continue;\n\n // Range filters\n if (boolQueryType === RangeTypeOS.gte || boolQueryType === RangeTypeOS.lte) {\n const existing = filterMap[field]?.range;\n filterMap[field] = fn(field, value, existing);\n continue;\n }\n\n // Other filters\n const builtQuery = fn(field, value);\n if (builtQuery.negation) boolQuery.must_not.push(builtQuery.query);\n else if (boolQueryType === BoolQueryTypeOS.prefix) {\n boolQuery.should.push(builtQuery?.query ? builtQuery.query : builtQuery);\n boolQuery.minimum_should_match = 1;\n } else boolQuery.must.push(builtQuery?.query ? builtQuery.query : builtQuery);\n }\n\n const filter = Object.values(filterMap);\n\n if (filter.length) boolQuery.filter = filter;\n\n buildSearchKeyword(filterObject, boolQuery);\n\n const { size, from } = calculatePagination(filterObject);\n\n const aggs = buildAggregations(filterObject);\n\n return {\n index: config.OPEN_SEARCH.INDEX,\n body: {\n query: {\n bool: boolQuery,\n },\n aggs: aggs,\n size: size ?? 25,\n from: from ?? 0,\n sort: buildSortOS(filterObject),\n },\n };\n}\n"]}
|