@webiny/api-headless-cms-ddb 5.37.5 → 5.37.6-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.
|
@@ -17,6 +17,18 @@ const executeFilter = params => {
|
|
|
17
17
|
value,
|
|
18
18
|
filter
|
|
19
19
|
} = params;
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* We need to check if the filter can be used.
|
|
23
|
+
* If it cannot, we will just return true.
|
|
24
|
+
*/
|
|
25
|
+
const canUse = filter.plugin.canUse({
|
|
26
|
+
value,
|
|
27
|
+
compareValue: filter.compareValue
|
|
28
|
+
});
|
|
29
|
+
if (!canUse) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
20
32
|
const matched = filter.plugin.matches({
|
|
21
33
|
value,
|
|
22
34
|
compareValue: filter.compareValue
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_ValueFilterPlugin","require","_error","_interopRequireDefault","_fullTextSearch","_createExpressions","_transform","_getValue","executeFilter","params","value","filter","
|
|
1
|
+
{"version":3,"names":["_ValueFilterPlugin","require","_error","_interopRequireDefault","_fullTextSearch","_createExpressions","_transform","_getValue","executeFilter","params","value","filter","canUse","plugin","compareValue","matched","matches","negate","executeExpressions","expressions","getCachedValue","filters","condition","length","result","expression","_objectSpread2","default","items","records","where","plugins","fields","fullTextSearch","keys","Object","createExpressions","term","fullTextSearchPlugin","byType","ValueFilterPlugin","type","find","getOperation","WebinyError","search","createFullTextSearch","targetFields","record","cachedValues","path","undefined","plainValue","getValue","rawValue","transformValue","transform","exprResult","exports"],"sources":["filter.ts"],"sourcesContent":["import { CmsEntry, CmsEntryListWhere } from \"@webiny/api-headless-cms/types\";\nimport { ValueFilterPlugin } from \"@webiny/db-dynamodb/plugins/definitions/ValueFilterPlugin\";\nimport WebinyError from \"@webiny/error\";\nimport { PluginsContainer } from \"@webiny/plugins\";\nimport { Field } from \"./types\";\nimport { createFullTextSearch } from \"./fullTextSearch\";\nimport { createExpressions, Expression, ExpressionCondition, Filter } from \"./createExpressions\";\nimport { transformValue } from \"./transform\";\nimport { getValue } from \"~/operations/entry/filtering/getValue\";\n\ninterface ExecuteFilterParams {\n value: any;\n filter: Filter;\n}\n\nconst executeFilter = (params: ExecuteFilterParams) => {\n const { value, filter } = params;\n\n /**\n * We need to check if the filter can be used.\n * If it cannot, we will just return true.\n */\n const canUse = filter.plugin.canUse({\n value,\n compareValue: filter.compareValue\n });\n if (!canUse) {\n return true;\n }\n\n const matched = filter.plugin.matches({\n value,\n compareValue: filter.compareValue\n });\n if (filter.negate) {\n return matched === false;\n }\n return matched;\n};\n\ninterface ExecuteExpressionsParams {\n getCachedValue: (filter: Filter) => Promise<any>;\n expressions: Expression[];\n filters: Filter[];\n condition: ExpressionCondition;\n}\n\nconst executeExpressions = (params: ExecuteExpressionsParams): boolean => {\n const { expressions, getCachedValue, filters, condition } = params;\n if (expressions.length === 0 && filters.length === 0) {\n return true;\n }\n /**\n * Always run filters first as they might trigger an early return.\n */\n for (const filter of filters) {\n const value = getCachedValue(filter);\n\n const result = executeFilter({\n value,\n filter\n });\n /**\n * Filters are ALWAYS executed as an AND.\n * So if even one is false, everything false.\n */\n if (!result) {\n return false;\n }\n }\n /**\n * Then we move onto expressions, which are basically nested upon nested filters with different conditions.\n */\n for (const expression of expressions) {\n const result = executeExpressions({\n ...expression,\n getCachedValue\n });\n if (result && condition === \"OR\") {\n return true;\n } else if (!result && condition == \"AND\") {\n return false;\n }\n }\n /**\n * If condition is an OR, we can fail the expressions check because the code would return a lot earlier than this line.\n *\n * Also, if condition is not an OR, we can say that the expressions check is ok, because it would fail a lot earlier than this line.\n */\n return condition === \"OR\" ? false : true;\n};\n\ninterface Params {\n items: CmsEntry[];\n where: Partial<CmsEntryListWhere>;\n plugins: PluginsContainer;\n fields: Record<string, Field>;\n fullTextSearch?: {\n term?: string;\n fields?: string[];\n };\n}\n\nexport const filter = (params: Params): CmsEntry[] => {\n const { items: records, where, plugins, fields, fullTextSearch } = params;\n\n const keys = Object.keys(where);\n if (keys.length === 0 && !fullTextSearch) {\n return records;\n }\n const expression = createExpressions({\n plugins,\n where,\n fields\n });\n\n /**\n * No point in going further if there are no expressions to be applied and no full text search to be executed.\n */\n if (\n expression.filters.length === 0 &&\n expression.expressions.length === 0 &&\n !fullTextSearch?.term\n ) {\n return records;\n }\n /**\n * We need the contains plugin to run the full text search.\n */\n const fullTextSearchPlugin = plugins\n .byType<ValueFilterPlugin>(ValueFilterPlugin.type)\n .find(plugin => plugin.getOperation() === \"contains\");\n if (!fullTextSearchPlugin) {\n throw new WebinyError(\n `Missing \"contains\" plugin to run the full-text search.`,\n \"MISSING_PLUGIN\"\n );\n }\n\n const search = createFullTextSearch({\n term: fullTextSearch?.term,\n targetFields: fullTextSearch?.fields,\n fields,\n plugin: fullTextSearchPlugin\n });\n\n return records.filter(record => {\n const cachedValues: Record<string, any> = {};\n\n const getCachedValue = (filter: Filter) => {\n const { path } = filter;\n if (cachedValues[path] !== undefined) {\n return cachedValues[path];\n }\n const plainValue = getValue(record, path);\n\n const rawValue = transformValue({\n value: plainValue,\n transform: filter.transformValue\n });\n\n cachedValues[path] = rawValue;\n return rawValue;\n };\n\n const exprResult = executeExpressions({ ...expression, getCachedValue });\n /**\n * If expression result is false we do not need to continue further.\n * Also, if there is no full text search defined, just return the expression result.\n */\n if (!exprResult || !search) {\n return exprResult;\n }\n\n return search(record);\n });\n};\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webiny/api-headless-cms-ddb",
|
|
3
|
-
"version": "5.37.
|
|
3
|
+
"version": "5.37.6-beta.1",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"@webiny/api-headless-cms",
|
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
"license": "MIT",
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@babel/runtime": "7.22.6",
|
|
26
|
-
"@webiny/api-headless-cms": "5.37.
|
|
27
|
-
"@webiny/db-dynamodb": "5.37.
|
|
28
|
-
"@webiny/error": "5.37.
|
|
29
|
-
"@webiny/handler-db": "5.37.
|
|
30
|
-
"@webiny/utils": "5.37.
|
|
26
|
+
"@webiny/api-headless-cms": "5.37.6-beta.1",
|
|
27
|
+
"@webiny/db-dynamodb": "5.37.6-beta.1",
|
|
28
|
+
"@webiny/error": "5.37.6-beta.1",
|
|
29
|
+
"@webiny/handler-db": "5.37.6-beta.1",
|
|
30
|
+
"@webiny/utils": "5.37.6-beta.1",
|
|
31
31
|
"aws-sdk": "2.1310.0",
|
|
32
32
|
"dataloader": "2.2.1",
|
|
33
33
|
"dot-prop": "6.0.1",
|
|
@@ -40,9 +40,9 @@
|
|
|
40
40
|
"@babel/core": "7.22.8",
|
|
41
41
|
"@babel/preset-env": "7.22.7",
|
|
42
42
|
"@types/jsonpack": "1.1.2",
|
|
43
|
-
"@webiny/cli": "5.37.
|
|
44
|
-
"@webiny/plugins": "5.37.
|
|
45
|
-
"@webiny/project-utils": "5.37.
|
|
43
|
+
"@webiny/cli": "5.37.6-beta.1",
|
|
44
|
+
"@webiny/plugins": "5.37.6-beta.1",
|
|
45
|
+
"@webiny/project-utils": "5.37.6-beta.1",
|
|
46
46
|
"jest": "29.5.0",
|
|
47
47
|
"jest-dynalite": "3.6.1",
|
|
48
48
|
"ttypescript": "1.5.15",
|
|
@@ -56,5 +56,5 @@
|
|
|
56
56
|
"build": "yarn webiny run build",
|
|
57
57
|
"watch": "yarn webiny run watch"
|
|
58
58
|
},
|
|
59
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "53e962c150c2732178d0431d7dfb0f6e9caa3381"
|
|
60
60
|
}
|