@react-awesome-query-builder/core - npm Package Compare versions

Comparing version 6.6.11 to 6.6.12

cjs/utils/configMemo.js

@@ -8,2 +8,3 @@ "use strict";
 exports.getCommonMemo = exports.findExtendedConfigInAllMemos = exports.createConfigMemo = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _pick = _interopRequireDefault(require("lodash/pick"));
@@ -14,2 +15,4 @@ var _configUtils = require("./configUtils");
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var memoId = 0;
@@ -70,3 +73,6 @@ var configId = 0;
     }
-    configStore.set(config, extendedConfig);
+    // Note: because of desctructing, strict find would not be possible
+    //  (see commented line in `findExtended`)
+    //  (see issue #1187)
+    configStore.set(_objectSpread({}, config), extendedConfig);
   };
@@ -73,0 +79,0 @@ var findBasic = function findBasic(findConfig) {

cjs/utils/configUtils.js

@@ -272,3 +272,12 @@ "use strict";
   if ((0, _typeof2["default"])(field) === "object") {
-    if (!field.func && !!field.type) {
+    // should not be possible
+    // if (field._isFuncArg) {
+    //   // it's func arg
+    //   return null;
+    // }
+    // if (field._isFunc) {
+    //   // it's field func
+    //   return "func";
+    // }
+    if (!field.func && field.type) {
       // it's already a config
@@ -303,6 +312,15 @@ return "field";
   if ((0, _typeof2["default"])(field) == "object") {
-    if (!field.func && !!field.type) {
+    if (!field.func && !!field.type && !!field.widgets) {
       // it's already a config
+      // but don't mess up with obj from `getFuncSignature`, it has `type` but no `widgets` and other keys !
       return field;
     }
+    if (field._isFuncArg) {
+      // it's func arg
+      return getFuncArgConfig(config, field._funcKey, field._argKey);
+    }
+    if (field._isFunc) {
+      // it's a func
+      return getFuncConfig(config, field._funcKey);
+    }
     if (field.func) {
@@ -313,3 +331,3 @@ if (field.func && field.arg) {
       } else {
-        // it's field func
+        // it's a func
         return getFuncConfig(config, field.func);
@@ -316,0 +334,0 @@ }

esm/utils/configMemo.js

@@ -0,4 +1,7 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import pick from "lodash/pick";
@@ -61,3 +64,6 @@ import { configKeys } from "./configUtils";
     }
-    configStore.set(config, extendedConfig);
+    // Note: because of desctructing, strict find would not be possible
+    //  (see commented line in `findExtended`)
+    //  (see issue #1187)
+    configStore.set(_objectSpread({}, config), extendedConfig);
   };
@@ -64,0 +70,0 @@ var findBasic = function findBasic(findConfig) {

esm/utils/configUtils.js

@@ -260,3 +260,12 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
   if (_typeof(field) === "object") {
-    if (!field.func && !!field.type) {
+    // should not be possible
+    // if (field._isFuncArg) {
+    //   // it's func arg
+    //   return null;
+    // }
+    // if (field._isFunc) {
+    //   // it's field func
+    //   return "func";
+    // }
+    if (!field.func && field.type) {
       // it's already a config
@@ -291,6 +300,15 @@ return "field";
   if (_typeof(field) == "object") {
-    if (!field.func && !!field.type) {
+    if (!field.func && !!field.type && !!field.widgets) {
       // it's already a config
+      // but don't mess up with obj from `getFuncSignature`, it has `type` but no `widgets` and other keys !
       return field;
     }
+    if (field._isFuncArg) {
+      // it's func arg
+      return getFuncArgConfig(config, field._funcKey, field._argKey);
+    }
+    if (field._isFunc) {
+      // it's a func
+      return getFuncConfig(config, field._funcKey);
+    }
     if (field.func) {
@@ -301,3 +319,3 @@ if (field.func && field.arg) {
       } else {
-        // it's field func
+        // it's a func
         return getFuncConfig(config, field.func);
@@ -304,0 +322,0 @@ }

modules/utils/configMemo.js

@@ -63,3 +63,6 @@ import pick from "lodash/pick";
     }
-    configStore.set(config, extendedConfig);
+    // Note: because of desctructing, strict find would not be possible
+    //  (see commented line in `findExtended`)
+    //  (see issue #1187)
+    configStore.set({...config}, extendedConfig);
   };
@@ -66,0 +69,0 @@

modules/utils/configUtils.js

@@ -240,3 +240,12 @@ import pick from "lodash/pick";
   if (typeof field === "object") {
-    if (!field.func && !!field.type) {
+    // should not be possible
+    // if (field._isFuncArg) {
+    //   // it's func arg
+    //   return null;
+    // }
+    // if (field._isFunc) {
+    //   // it's field func
+    //   return "func";
+    // }
+    if (!field.func && field.type) {
       // it's already a config
@@ -271,6 +280,15 @@ return "field";
   if (typeof field == "object") {
-    if (!field.func && !!field.type) {
+    if (!field.func && !!field.type && !!field.widgets) {
       // it's already a config
+      // but don't mess up with obj from `getFuncSignature`, it has `type` but no `widgets` and other keys !
       return field;
     }
+    if (field._isFuncArg) {
+      // it's func arg
+      return getFuncArgConfig(config, field._funcKey, field._argKey);
+    }
+    if (field._isFunc) {
+      // it's a func
+      return getFuncConfig(config, field._funcKey);
+    }
     if (field.func) {
@@ -281,3 +299,3 @@ if (field.func && field.arg) {
       } else {
-        // it's field func
+        // it's a func
         return getFuncConfig(config, field.func);
@@ -284,0 +302,0 @@ }

package.json

 {
   "name": "@react-awesome-query-builder/core",
-  "version": "6.6.11",
+  "version": "6.6.12",
   "description": "User-friendly query builder for React. Core",
@@ -5,0 +5,0 @@ "keywords": [

No alert changes

Improved metrics

Total package byte prevSize

2064910

increased by0.18%

Lines of code

49579

increased by0.14%

No dependency changes