npm - @infrab4a/connect - Versions diffs - 0.14.0 → 0.14.1-beta.0 - Mend

@infrab4a/connect 0.14.0 → 0.14.1-beta.0

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.

Files changed (6) hide show

package/bundles/infrab4a-connect.umd.js +8 -5
package/bundles/infrab4a-connect.umd.js.map +1 -1
package/esm2015/lib/infra/firebase/firestore/mixins/with-find-firestore.mixin.js +8 -6
package/fesm2015/infrab4a-connect.js +7 -5
package/fesm2015/infrab4a-connect.js.map +1 -1
package/package.json +1 -1

package/bundles/infrab4a-connect.umd.js CHANGED Viewed

@@ -1578,20 +1578,23 @@
                 var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
                 _this.makeFirestoreWhere = function (queryReference, filter) { return Object.keys(filter).reduce(function (query, fieldName) { return _this.buildWhereSentence(query, fieldName, filter[fieldName]); }, queryReference); };
                 _this.buildWhereSentence = function (queryReference, fieldName, options) {
+                    var _b;
                     if (_this.isSubCollection(_this) && fieldName === _this.parentIdField)
                         return queryReference;
+                    var plainInstance = new _this.model((_b = {}, _b[fieldName] = options === null || options === void 0 ? void 0 : options.value, _b)).toPlain();
+                    var firestoreFieldName = Object.keys(plainInstance).find(function (key) { return plainInstance[key] === (options === null || options === void 0 ? void 0 : options.value); });
                     if ((options === null || options === void 0 ? void 0 : options.operator) === exports.Where.LIKE) {
                         if (Array.isArray(options === null || options === void 0 ? void 0 : options.value))
-                            return queryReference.where(fieldName.toString(), 'array-contains-any', options.value);
-                        queryReference = queryReference.where(fieldName.toString(), '>=', options.value);
-                        queryReference = queryReference.where(fieldName.toString(), '<=', options.value + "~");
+                            return queryReference.where(firestoreFieldName, 'array-contains-any', options.value);
+                        queryReference = queryReference.where(firestoreFieldName, '>=', options.value);
+                        queryReference = queryReference.where(firestoreFieldName, '<=', options.value + "~");
                         return queryReference;
                     }
                     if ((options === null || options === void 0 ? void 0 : options.operator) === exports.Where.IN && Array.isArray(options === null || options === void 0 ? void 0 : options.value))
-                        return queryReference.where(fieldName.toString(), 'array-contains', options.value);
+                        return queryReference.where(firestoreFieldName, 'array-contains', options.value);
                     if (lodash.isObject(options) && lodash.isNil(options === null || options === void 0 ? void 0 : options.operator) && lodash.isNil(options === null || options === void 0 ? void 0 : options.value))
                         return Object.keys(options).reduce(function (queryReferenceWithWhere, key) { return _this.buildWhereSentence(queryReferenceWithWhere, fieldName + "." + key, options[key]); }, queryReference);
-                    return queryReference.where(fieldName.toString(), (options === null || options === void 0 ? void 0 : options.operator) || '==', (options === null || options === void 0 ? void 0 : options.value) || options);
+                    return queryReference.where(firestoreFieldName, (options === null || options === void 0 ? void 0 : options.operator) || '==', (options === null || options === void 0 ? void 0 : options.value) || options);
                 };
                 return _this;
             }