Readme changes. Small changes to last PR. Update "vite" (#1258)

* nit

* lf

* Upd vite

* lock

* es2017

* .

* es2020

* nit comment

Author: ukrbublik

CHANGELOG.md

@@ -9,8 +9,9 @@
   - Fix incorrect using of "$not" as top-level operator in output to MongoDb (PR #1254) (issue #1250)
   - Fix using incorrect date format in output to MongoDb (PR #1254)
   - Added date/datetime functions: `TODAY`, `START_OF_TODAY`, `RELATIVE_DATE`, `TRUNCATE_DATETIME` (PR #1256) (issue #1237)
-  - Fix datetime functions: fix `NOW`, `RELATIVE_DATETIME` for MongoDb (PR #1256)
+  - Fixed datetime functions `NOW`, `RELATIVE_DATETIME` for MongoDb (PR #1256)
   - Fixed comparing of dates with `==` and `!=` in JsonLogic by using new ops `date==`, `date!=`, `datetime==`, `datetime!=`. Added `fixJsonLogicDateCompareOp` to `config.setings` (false by default) (PR #1256)
+  - Now `Utils.JsonLogicUtils.addRequiredJsonLogicOperations(jl)` can be used for instance of `json-logic-js` to add custom operators (PR #1256)
 - 6.6.14
   - Fixed import from JsonLogic when like op is used inside group with some group op (PR #1225) (issue #1221)
   - Support React 19 (PR #1229) (issue #1205)

README.md

@@ -514,7 +514,14 @@ Wrapping in `div.query-builder-container` is necessary for correct drag-n-drop s
   #### `jsonLogicFormat`
   `Utils.Export.jsonLogicFormat (immutableValue, config) -> {logic, data, errors}`  
   Convert query value to [JsonLogic](http://jsonlogic.com) format.  
-  If there are no `errors`, `logic` will be rule object and `data` will contain all used fields with null values ("template" data).
+  If there are no `errors`, `logic` will be rule object and `data` will contain all used fields with null values ("template" data).  
+  **Note:** You can set `config.settings.fixJsonLogicDateCompareOp = true` to fix the comparison of dates with `==` and `!=` in JsonLogic by using custom ops `date==`, `date!=`, `datetime==`, `datetime!=`.  
+  **Note:** If you import custom version of `json-logic-js` please add [custom operators](/packages/core/modules/utils/jsonLogicUtils.js#L12) with:
+  ```js
+  import JL from "json-logic-js";
+  Utils.JsonLogicUtils.addRequiredJsonLogicOperations(JL);
+  // console.log(JL.apply({ "now": [] }));
+  ```
 
 ### Import utils
 

packages/antd/tsconfig.json

@@ -4,7 +4,7 @@
     "module": "esnext",
     "jsx": "preserve",
     "lib": [
-      "es2016",
+      "es2020",
       "dom",
       "dom.iterable"
     ],

packages/bootstrap/tsconfig.json

@@ -4,7 +4,7 @@
     "module": "esnext",
     "jsx": "preserve",
     "lib": [
-      "es2016",
+      "es2020",
       "dom",
       "dom.iterable"
     ],

packages/core/modules/export/jsonLogic.js

@@ -101,6 +101,8 @@ const formatGroup = (item, config, meta, _not = false, isRoot = false, parentFie
   let groupOperator = properties.get("operator");
   let groupOperatorDef = groupOperator && getOperatorConfig(config, groupOperator, field) || null;
   const formattedValue = formatItemValue(config, properties, meta, groupOperator, parentField);
+  // Tip: for demo app isGroup0 is true for "Results" and "Cars" with group op in "some", "all", "none"
+  // If isGroup0 is false, we should use "reduce"
   const isGroup0 = isRuleGroup && (!groupOperator || groupOperatorDef?.cardinality == 0);
   const isRuleGroupWithChildren = isRuleGroup && children?.size > 0;
   const isRuleGroupWithoutChildren = isRuleGroup && !children?.size;
@@ -171,17 +173,19 @@ const formatGroup = (item, config, meta, _not = false, isRoot = false, parentFie
     });
   }
 
-  let resultQuery = {};
+  let filterQuery = {};
   if (preserveSingleRuleGroup)
-    resultQuery[conj] = list.toList().toJS();
+    filterQuery[conj] = list.toList().toJS();
   else
-    resultQuery = list.first();
-  
+    filterQuery = list.first();
+
   // reverse filter
   if (filterNot) {
-    resultQuery = { "!": resultQuery };
+    filterQuery = { "!": filterQuery };
   }
 
+  let resultQuery = filterQuery;
+
   // rule_group (issue #246)
   if (isRuleGroupArray) {
     const formattedField = formatField(meta, config, field, parentField);
@@ -193,7 +197,7 @@ const formatGroup = (item, config, meta, _not = false, isRoot = false, parentFie
         : {
           "filter": [
             formattedField,
-            resultQuery
+            filterQuery
           ]
         };
       reduceQuery = {
@@ -206,7 +210,7 @@ const formatGroup = (item, config, meta, _not = false, isRoot = false, parentFie
     }
     const formattedLhs = reduceQuery ?? formattedField;
     const optionsMap = new Map({
-      having: resultQuery,
+      having: filterQuery,
       reduce: reduceQuery,
       groupField: field,
       groupFieldFormatted: formattedField,
@@ -222,7 +226,7 @@ const formatGroup = (item, config, meta, _not = false, isRoot = false, parentFie
         resultQuery = {
           [op]: [
             formattedField,
-            resultQuery
+            filterQuery
           ]
         };
       } else {

packages/core/modules/export/spel.js

@@ -316,10 +316,10 @@ const formatRule = (item, config, meta, parentField = null) => {
   const {value: formattedField, valueSrc: _fieldSrc, valueType: fieldType} = formatLhs(meta, config, field, fieldSrc, parentField) ?? {};
   if (formattedField === undefined)
     return undefined;
-  
+
   // format expression
   let res = formatExpression(
-    meta, config, properties, formattedField, formattedValue, realOp, valueSrc, valueType, isRev
+    meta, config, properties, formattedField, formattedValue, realOp, valueSrc, valueType ?? fieldType, isRev
   );
   return res;
 };

packages/core/modules/import/jsonLogic.js

@@ -97,6 +97,8 @@ const buildConv = (config) => {
         template = opConfig.jsonLogic(jlFieldMarker, opKey, jlArgsMarker, opConfig, new Immutable.Map({
           having: jlHavingMarker,
           groupField: jlRawFieldMarker,
+          // reduce: undefined,
+          // groupFieldFormatted: undefined,
         }));
       } catch(e) {
         console.warn(`Error while running JsonLogic template for op ${opKey}`, e);

packages/core/tsconfig.json

@@ -3,7 +3,7 @@
     "target": "es6",
     "module": "esnext",
     "lib": [
-      "es2015"
+      "es2020"
     ],
     "allowJs": true,
     "outDir": "ts_out",

packages/examples/tsconfig.json

@@ -4,7 +4,7 @@
     "module": "esnext",
     "jsx": "preserve",
     "lib": [
-      "es2016",
+      "es2020",
       "dom",
       "dom.iterable"
     ],

packages/fluent/tsconfig.json

@@ -4,7 +4,7 @@
     "module": "esnext",
     "jsx": "preserve",
     "lib": [
-      "es2016",
+      "es2020",
       "dom",
       "dom.iterable"
     ],