@infrab4a/connect 0.14.4-beta.0 → 0.14.5-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.
- package/bundles/infrab4a-connect.umd.js +8 -5
- package/bundles/infrab4a-connect.umd.js.map +1 -1
- package/esm2015/lib/domain/shopping/models/coupons/financial-coupon.js +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/lib/domain/shopping/models/coupons/financial-coupon.d.ts +1 -0
- package/package.json +1 -1
|
@@ -25,4 +25,4 @@ export class FinancialCoupon extends Coupon {
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmluYW5jaWFsLWNvdXBvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Nvbm5lY3Qvc3JjL2xpYi9kb21haW4vc2hvcHBpbmcvbW9kZWxzL2NvdXBvbnMvZmluYW5jaWFsLWNvdXBvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBRTVCLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQTtBQUU1RCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQ2pDLE9BQU8sRUFBRSxXQUFXLEVBQUUsY0FBYyxFQUFFLE1BQU0sU0FBUyxDQUFBO0FBRXJELE1BQU0saUJBQWlCLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFBO0FBRTNDLE1BQU0sT0FBTyxlQUFnQixTQUFRLE1BQU07SUFBM0M7O1FBQ0UsU0FBSSxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUE7SUFxQjlCLENBQUM7SUFqQkMsTUFBTSxDQUFDLGlCQUFpQixDQUFDLE1BQWdDO1FBQ3ZELE9BQU8sTUFBTSxDQUFDLElBQUksS0FBSyxXQUFXLENBQUMsU0FBUyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFBO0lBQ2xFLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFDLE1BQWM7UUFDaEMsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDO1lBQ3JCLElBQUksRUFBRSxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsTUFBTSxJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLFFBQVEsRUFBRTtZQUNyRCxRQUFRLEVBQUUsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDekIsSUFBSSxFQUFFLFdBQVcsQ0FBQyxTQUFTO1lBQzNCLE9BQU8sRUFBRSxjQUFjLENBQUMsVUFBVTtZQUNsQyxZQUFZLEVBQUUsYUFBYSxDQUFDLFNBQVM7WUFDckMsUUFBUSxFQUFFLEVBQUU7WUFDWixJQUFJLEVBQUUsTUFBTTtZQUNaLFNBQVMsRUFBRSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDL0IsU0FBUyxFQUFFLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxpQkFBaUIsQ0FBQztTQUNwRCxDQUFDLENBQUE7SUFDSixDQUFDO0NBQ0YiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBNZDUgfSBmcm9tICd0cy1tZDUnXG5cbmltcG9ydCB7IENoZWNrb3V0VHlwZXMgfSBmcm9tICcuLi9lbnVtcy9jaGVja291dC10eXBlcy5lbnVtJ1xuXG5pbXBvcnQgeyBDb3Vwb24gfSBmcm9tICcuL2NvdXBvbidcbmltcG9ydCB7IENvdXBvblR5cGVzLCBDb3Vwb25TdWJ0eXBlcyB9IGZyb20gJy4vZW51bXMnXG5cbmNvbnN0IENPVVBPTl9FWFBJUkFUSU9OID0gNjAgKiA2MCAqIDI0ICogMzBcblxuZXhwb3J0IGNsYXNzIEZpbmFuY2lhbENvdXBvbiBleHRlbmRzIENvdXBvbiB7XG4gIHR5cGUgPSBDb3Vwb25UeXBlcy5GSU5BTkNJQUxcbiAgc3VidHlwZTogQ291cG9uU3VidHlwZXNcbiAgcGxhbj86IHN0cmluZ1xuXG4gIHN0YXRpYyBpc0ZpbmFuY2lhbENvdXBvbihjb3Vwb246IFBhcnRpYWw8RmluYW5jaWFsQ291cG9uPik6IGNvdXBvbiBpcyBGaW5hbmNpYWxDb3Vwb24ge1xuICAgIHJldHVybiBjb3Vwb24udHlwZSA9PT0gQ291cG9uVHlwZXMuRklOQU5DSUFMICYmICEhY291cG9uLnN1YnR5cGVcbiAgfVxuXG4gIHN0YXRpYyBjcmVhdGVDb3Vwb24odXNlcklkOiBzdHJpbmcpOiBGaW5hbmNpYWxDb3Vwb24ge1xuICAgIHJldHVybiB0aGlzLnRvSW5zdGFuY2Uoe1xuICAgICAgbmFtZTogTWQ1Lmhhc2hTdHIoYCR7dXNlcklkfV8ke0RhdGUubm93fWApLnRvU3RyaW5nKCksXG4gICAgICBuaWNrbmFtZTogYCR7RGF0ZS5ub3coKX1gLFxuICAgICAgdHlwZTogQ291cG9uVHlwZXMuRklOQU5DSUFMLFxuICAgICAgc3VidHlwZTogQ291cG9uU3VidHlwZXMuUEVSQ0VOVEFHRSxcbiAgICAgIGNoZWNrb3V0VHlwZTogQ2hlY2tvdXRUeXBlcy5FQ09NTUVSQ0UsXG4gICAgICBkaXNjb3VudDogMzAsXG4gICAgICB1c2VyOiB1c2VySWQsXG4gICAgICBjcmVhdGVkQXQ6IG5ldyBEYXRlKERhdGUubm93KCkpLFxuICAgICAgZXhwaXJlc0luOiBuZXcgRGF0ZShEYXRlLm5vdygpICsgQ09VUE9OX0VYUElSQVRJT04pLFxuICAgIH0pXG4gIH1cbn1cbiJdfQ==
|
|
@@ -13,18 +13,20 @@ export const withFindFirestore = (MixinBase) => {
|
|
|
13
13
|
this.buildWhereSentence = (queryReference, fieldName, options) => {
|
|
14
14
|
if (this.isSubCollection(this) && fieldName === this.parentIdField)
|
|
15
15
|
return queryReference;
|
|
16
|
+
const plainInstance = new this.model({ [fieldName]: options === null || options === void 0 ? void 0 : options.value }).toPlain();
|
|
17
|
+
const firestoreFieldName = Object.keys(plainInstance).find((key) => plainInstance[key] === (options === null || options === void 0 ? void 0 : options.value));
|
|
16
18
|
if ((options === null || options === void 0 ? void 0 : options.operator) === Where.LIKE) {
|
|
17
19
|
if (Array.isArray(options === null || options === void 0 ? void 0 : options.value))
|
|
18
|
-
return queryReference.where(
|
|
19
|
-
queryReference = queryReference.where(
|
|
20
|
-
queryReference = queryReference.where(
|
|
20
|
+
return queryReference.where(firestoreFieldName, 'array-contains-any', options.value);
|
|
21
|
+
queryReference = queryReference.where(firestoreFieldName, '>=', options.value);
|
|
22
|
+
queryReference = queryReference.where(firestoreFieldName, '<=', `${options.value}~`);
|
|
21
23
|
return queryReference;
|
|
22
24
|
}
|
|
23
25
|
if ((options === null || options === void 0 ? void 0 : options.operator) === Where.IN && Array.isArray(options === null || options === void 0 ? void 0 : options.value))
|
|
24
|
-
return queryReference.where(
|
|
26
|
+
return queryReference.where(firestoreFieldName, 'array-contains', options.value);
|
|
25
27
|
if (isObject(options) && isNil(options === null || options === void 0 ? void 0 : options.operator) && isNil(options === null || options === void 0 ? void 0 : options.value))
|
|
26
28
|
return Object.keys(options).reduce((queryReferenceWithWhere, key) => this.buildWhereSentence(queryReferenceWithWhere, `${fieldName}.${key}`, options[key]), queryReference);
|
|
27
|
-
return queryReference.where(
|
|
29
|
+
return queryReference.where(firestoreFieldName, (options === null || options === void 0 ? void 0 : options.operator) || '==', (options === null || options === void 0 ? void 0 : options.value) || options);
|
|
28
30
|
};
|
|
29
31
|
}
|
|
30
32
|
find(filters, limits, orderBy) {
|
|
@@ -73,4 +75,4 @@ export const withFindFirestore = (MixinBase) => {
|
|
|
73
75
|
}
|
|
74
76
|
};
|
|
75
77
|
};
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"with-find-firestore.mixin.js","sourceRoot":"","sources":["../../../../../../../../projects/connect/src/lib/infra/firebase/firestore/mixins/with-find-firestore.mixin.ts"],"names":[],"mappings":";AAEA,OAAO,EAUL,KAAK,GACN,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAa,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAElF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,SAAgF,EAChF,EAAE;IACF,MAAM,qBAAqB,GAAG,CAAC,MAAW,EAAuD,EAAE,CACjG,CAAC,KAAK,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAA;IAC1B,MAAM,kBAAkB,GAAG,CAAC,MAAuC,EAAO,EAAE;QAC1E,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAA;IAC9D,CAAC,CAAA;IAED,OAAO,MAAM,aAAc,SAAQ,SAAS;QAArC;;YAoCL,uBAAkB,GAAG,CACnB,cAAyD,EACzD,MAAqC,EACvB,EAAE,CAChB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CACxB,CAAC,KAAmB,EAAE,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,EACxG,cAAc,CACf,CAAA;YAEH,uBAAkB,GAAG,CACnB,cAAyD,EACzD,SAAmD,EACnD,OAA8E,EAChE,EAAE;gBAChB,IAAI,IAAI,CAAC,eAAe,CAAQ,IAAI,CAAC,IAAI,SAAS,KAAK,IAAI,CAAC,aAAa;oBAAE,OAAO,cAAc,CAAA;gBAChG,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,MAAK,KAAK,CAAC,IAAI,EAAE;oBACpC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;wBAC/B,OAAO,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,oBAAoB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;oBAExF,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;oBAChF,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAA;oBAEtF,OAAO,cAAc,CAAA;iBACtB;gBACD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,MAAK,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;oBACjE,OAAO,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,gBAAgB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;gBACpF,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;oBACxE,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAChC,CAAC,uBAAuB,EAAE,GAAG,EAAE,EAAE,CAC/B,IAAI,CAAC,kBAAkB,CAAC,uBAAuB,EAAE,GAAG,SAAS,IAAI,GAAG,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EACvF,cAAc,CACf,CAAA;gBAEH,OAAO,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,KAAI,IAAI,EAAE,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,KAAI,OAAO,CAAC,CAAA;YACzG,CAAC,CAAA;QA2BH,CAAC;QAhGO,IAAI,CACR,OAAyC,EACzC,MAAsC,EACtC,OAAsC;;gBAEtC,IAAI,KAAK,GAA8C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,CAAA;gBAEhH,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;gBAElF,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC3B,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CACpG,CAAA;gBAED,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAA;gBAEvD,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,CAAA;gBAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;gBAE/C,OAAO;oBACL,IAAI;oBACJ,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,CAAC;iBACzC,CAAA;YACH,CAAC;SAAA;QAED,0BAA0B,CAAC,OAAwC;;YACjE,IAAI,CAAC,IAAI,CAAC,eAAe,CAAQ,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC,cAAc,CAAA;YAElE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;YACxC,MAAM,QAAQ,GAAG,kBAAkB,CACjC,MAAA,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,0CAAG,aAAa,CAAC,CACxG,CAAA;YAED,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,IAAI,QAAQ,IAAI,IAAI,CAAC,cAAc,EAAE,CAAA;QACrF,CAAC;QAsCK,YAAY,CAChB,KAAgD,EAChD,OAAwC,EACxC,MAAqC;;gBAErC,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;oBAClB,IAAI,MAAM,CAAC,MAAM,YAAY,IAAI,CAAC,KAAK;wBACrC,KAAK,GAAG,KAAK,CAAC,UAAU,CACtB,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;6BAC5D,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAY,CAAC,CAAC;6BACtE,GAAG,EAAE,CACT,CAAA;yBACE,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC;wBAAE,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;iBAClG;gBACD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK;oBAAE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;gBAEpD,OAAO,KAAK,CAAA;YACd,CAAC;SAAA;QAED,cAAc,CAAC,IAAa,EAAE,MAAqC;YACjE,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC;gBAAE,OAAO,CAAC,CAAA;YAC9B,IAAI,IAAI,CAAC,MAAM,IAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAA;gBAAE,OAAO,IAAI,CAAC,MAAM,CAAA;YAEnD,OAAO,QAAQ,CAAA;QACjB,CAAC;KACF,CAAA;AACH,CAAC,CAAA","sourcesContent":["import { CollectionReference, Query, WhereFilterOp } from '@firebase/firestore-types'\n\nimport {\n  BaseModelWithIdentifier,\n  FindRepository,\n  NonFunctionPropertyNames,\n  RepositoryFindField,\n  RepositoryFindFielters,\n  RepositoryFindFieltersOptions,\n  RepositoryFindResult,\n  RepositoryLimitOptions,\n  RepositoryOrderByList,\n  Where,\n} from '../../../../domain'\nimport { FirestoreHelpers, FirestoreRepository } from '../types'\nimport { MixinCtor, isNil, isNumber, isObject, isString } from '../../../../utils'\n\nexport const withFindFirestore = <TBase extends BaseModelWithIdentifier<TBase>, TMixinBase extends MixinCtor>(\n  MixinBase: MixinCtor<FirestoreRepository<TBase> & FirestoreHelpers> & TMixinBase,\n) => {\n  const checkIfIsFilterOption = (filter: any): filter is RepositoryFindFieltersOptions<TBase, any> =>\n    !isNil(filter?.operator)\n  const getValueFromFilter = (filter: RepositoryFindField<TBase, any>): any => {\n    return checkIfIsFilterOption(filter) ? filter.value : filter\n  }\n\n  return class FindFirestore extends MixinBase implements FindRepository<TBase> {\n    async find(\n      filters?: RepositoryFindFielters<TBase>[],\n      limits?: RepositoryLimitOptions<TBase>,\n      orderBy?: RepositoryOrderByList<TBase>,\n    ): Promise<RepositoryFindResult<TBase>> {\n      let query: CollectionReference<TBase> | Query<TBase> = this.collection(this.buildCollectionPathForFind(filters))\n\n      filters?.forEach((filterer) => (query = this.makeFirestoreWhere(query, filterer)))\n\n      orderBy?.forEach((orderer) =>\n        Object.keys(orderer).forEach((fieldName) => (query = query.orderBy(fieldName, orderer[fieldName]))),\n      )\n\n      query = await this.defineLimits(query, filters, limits)\n\n      const docs = await query.get()\n      const data = docs.docs.map((doc) => doc.data())\n\n      return {\n        data,\n        count: this.calculateCount(data, limits),\n      }\n    }\n\n    buildCollectionPathForFind(filters: RepositoryFindFielters<TBase>[]): string {\n      if (!this.isSubCollection<TBase>(this)) return this.collectionName\n\n      const parentIdField = this.parentIdField\n      const parentId = getValueFromFilter(\n        filters.find((groupFilter) => Boolean(getValueFromFilter(groupFilter[parentIdField])))?.[parentIdField],\n      )\n\n      return `${this.parentRepository.collectionName}/${parentId}/${this.collectionName}`\n    }\n\n    makeFirestoreWhere = (\n      queryReference: CollectionReference<TBase> | Query<TBase>,\n      filter: RepositoryFindFielters<TBase>,\n    ): Query<TBase> =>\n      Object.keys(filter).reduce(\n        (query: Query<TBase>, fieldName: string) => this.buildWhereSentence(query, fieldName, filter[fieldName]),\n        queryReference,\n      )\n\n    buildWhereSentence = (\n      queryReference: CollectionReference<TBase> | Query<TBase>,\n      fieldName: NonFunctionPropertyNames<TBase> | string,\n      options: RepositoryFindFieltersOptions<TBase, NonFunctionPropertyNames<TBase>>,\n    ): Query<TBase> => {\n      if (this.isSubCollection<TBase>(this) && fieldName === this.parentIdField) return queryReference\n      if (options?.operator === Where.LIKE) {\n        if (Array.isArray(options?.value))\n          return queryReference.where(fieldName.toString(), 'array-contains-any', options.value)\n\n        queryReference = queryReference.where(fieldName.toString(), '>=', options.value)\n        queryReference = queryReference.where(fieldName.toString(), '<=', `${options.value}~`)\n\n        return queryReference\n      }\n      if (options?.operator === Where.IN && Array.isArray(options?.value))\n        return queryReference.where(fieldName.toString(), 'array-contains', options.value)\n      if (isObject(options) && isNil(options?.operator) && isNil(options?.value))\n        return Object.keys(options).reduce(\n          (queryReferenceWithWhere, key) =>\n            this.buildWhereSentence(queryReferenceWithWhere, `${fieldName}.${key}`, options[key]),\n          queryReference,\n        )\n\n      return queryReference.where(fieldName.toString(), options?.operator || '==', options?.value || options)\n    }\n\n    async defineLimits(\n      query: CollectionReference<TBase> | Query<TBase>,\n      filters: RepositoryFindFielters<TBase>[],\n      limits: RepositoryLimitOptions<TBase>,\n    ): Promise<Query<TBase>> {\n      if (limits?.offset) {\n        if (limits.offset instanceof this.model)\n          query = query.startAfter(\n            await this.collection(this.buildCollectionPathForFind(filters))\n              .doc(limits.offset[limits.offset.identifierFields().shift() as string])\n              .get(),\n          )\n        else if (isNumber(limits.offset) || isString(limits.offset)) query = query.startAt(limits.offset)\n      }\n      if (limits?.limit) query = query.limit(limits.limit)\n\n      return query\n    }\n\n    calculateCount(data: TBase[], limits: RepositoryLimitOptions<TBase>): number {\n      if (data.length <= 0) return 0\n      if (data.length < limits?.limit) return data.length\n\n      return Infinity\n    }\n  }\n}\n"]}
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"with-find-firestore.mixin.js","sourceRoot":"","sources":["../../../../../../../../projects/connect/src/lib/infra/firebase/firestore/mixins/with-find-firestore.mixin.ts"],"names":[],"mappings":"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","sourcesContent":["import { CollectionReference, Query, WhereFilterOp } from '@firebase/firestore-types'\n\nimport {\n  BaseModelWithIdentifier,\n  FindRepository,\n  NonFunctionPropertyNames,\n  RepositoryFindField,\n  RepositoryFindFielters,\n  RepositoryFindFieltersOptions,\n  RepositoryFindResult,\n  RepositoryLimitOptions,\n  RepositoryOrderByList,\n  Where,\n} from '../../../../domain'\nimport { FirestoreHelpers, FirestoreRepository } from '../types'\nimport { MixinCtor, isNil, isNumber, isObject, isString } from '../../../../utils'\n\nexport const withFindFirestore = <TBase extends BaseModelWithIdentifier<TBase>, TMixinBase extends MixinCtor>(\n  MixinBase: MixinCtor<FirestoreRepository<TBase> & FirestoreHelpers> & TMixinBase,\n) => {\n  const checkIfIsFilterOption = (filter: any): filter is RepositoryFindFieltersOptions<TBase, any> =>\n    !isNil(filter?.operator)\n  const getValueFromFilter = (filter: RepositoryFindField<TBase, any>): any => {\n    return checkIfIsFilterOption(filter) ? filter.value : filter\n  }\n\n  return class FindFirestore extends MixinBase implements FindRepository<TBase> {\n    async find(\n      filters?: RepositoryFindFielters<TBase>[],\n      limits?: RepositoryLimitOptions<TBase>,\n      orderBy?: RepositoryOrderByList<TBase>,\n    ): Promise<RepositoryFindResult<TBase>> {\n      let query: CollectionReference<TBase> | Query<TBase> = this.collection(this.buildCollectionPathForFind(filters))\n\n      filters?.forEach((filterer) => (query = this.makeFirestoreWhere(query, filterer)))\n\n      orderBy?.forEach((orderer) =>\n        Object.keys(orderer).forEach((fieldName) => (query = query.orderBy(fieldName, orderer[fieldName]))),\n      )\n\n      query = await this.defineLimits(query, filters, limits)\n\n      const docs = await query.get()\n      const data = docs.docs.map((doc) => doc.data())\n\n      return {\n        data,\n        count: this.calculateCount(data, limits),\n      }\n    }\n\n    buildCollectionPathForFind(filters: RepositoryFindFielters<TBase>[]): string {\n      if (!this.isSubCollection<TBase>(this)) return this.collectionName\n\n      const parentIdField = this.parentIdField\n      const parentId = getValueFromFilter(\n        filters.find((groupFilter) => Boolean(getValueFromFilter(groupFilter[parentIdField])))?.[parentIdField],\n      )\n\n      return `${this.parentRepository.collectionName}/${parentId}/${this.collectionName}`\n    }\n\n    makeFirestoreWhere = (\n      queryReference: CollectionReference<TBase> | Query<TBase>,\n      filter: RepositoryFindFielters<TBase>,\n    ): Query<TBase> =>\n      Object.keys(filter).reduce(\n        (query: Query<TBase>, fieldName: string) => this.buildWhereSentence(query, fieldName, filter[fieldName]),\n        queryReference,\n      )\n\n    buildWhereSentence = (\n      queryReference: CollectionReference<TBase> | Query<TBase>,\n      fieldName: NonFunctionPropertyNames<TBase> | string,\n      options: RepositoryFindFieltersOptions<TBase, NonFunctionPropertyNames<TBase>>,\n    ): Query<TBase> => {\n      if (this.isSubCollection<TBase>(this) && fieldName === this.parentIdField) return queryReference\n\n      const plainInstance = new this.model({ [fieldName]: options?.value }).toPlain()\n      const firestoreFieldName = Object.keys(plainInstance).find((key) => plainInstance[key] === options?.value)\n\n      if (options?.operator === Where.LIKE) {\n        if (Array.isArray(options?.value))\n          return queryReference.where(firestoreFieldName, 'array-contains-any', options.value)\n\n        queryReference = queryReference.where(firestoreFieldName, '>=', options.value)\n        queryReference = queryReference.where(firestoreFieldName, '<=', `${options.value}~`)\n\n        return queryReference\n      }\n      if (options?.operator === Where.IN && Array.isArray(options?.value))\n        return queryReference.where(firestoreFieldName, 'array-contains', options.value)\n      if (isObject(options) && isNil(options?.operator) && isNil(options?.value))\n        return Object.keys(options).reduce(\n          (queryReferenceWithWhere, key) =>\n            this.buildWhereSentence(queryReferenceWithWhere, `${fieldName}.${key}`, options[key]),\n          queryReference,\n        )\n\n      return queryReference.where(firestoreFieldName, options?.operator || '==', options?.value || options)\n    }\n\n    async defineLimits(\n      query: CollectionReference<TBase> | Query<TBase>,\n      filters: RepositoryFindFielters<TBase>[],\n      limits: RepositoryLimitOptions<TBase>,\n    ): Promise<Query<TBase>> {\n      if (limits?.offset) {\n        if (limits.offset instanceof this.model)\n          query = query.startAfter(\n            await this.collection(this.buildCollectionPathForFind(filters))\n              .doc(limits.offset[limits.offset.identifierFields().shift() as string])\n              .get(),\n          )\n        else if (isNumber(limits.offset) || isString(limits.offset)) query = query.startAt(limits.offset)\n      }\n      if (limits?.limit) query = query.limit(limits.limit)\n\n      return query\n    }\n\n    calculateCount(data: TBase[], limits: RepositoryLimitOptions<TBase>): number {\n      if (data.length <= 0) return 0\n      if (data.length < limits?.limit) return data.length\n\n      return Infinity\n    }\n  }\n}\n"]}
|
|
@@ -1039,18 +1039,20 @@ const withFindFirestore = (MixinBase) => {
|
|
|
1039
1039
|
this.buildWhereSentence = (queryReference, fieldName, options) => {
|
|
1040
1040
|
if (this.isSubCollection(this) && fieldName === this.parentIdField)
|
|
1041
1041
|
return queryReference;
|
|
1042
|
+
const plainInstance = new this.model({ [fieldName]: options === null || options === void 0 ? void 0 : options.value }).toPlain();
|
|
1043
|
+
const firestoreFieldName = Object.keys(plainInstance).find((key) => plainInstance[key] === (options === null || options === void 0 ? void 0 : options.value));
|
|
1042
1044
|
if ((options === null || options === void 0 ? void 0 : options.operator) === Where.LIKE) {
|
|
1043
1045
|
if (Array.isArray(options === null || options === void 0 ? void 0 : options.value))
|
|
1044
|
-
return queryReference.where(
|
|
1045
|
-
queryReference = queryReference.where(
|
|
1046
|
-
queryReference = queryReference.where(
|
|
1046
|
+
return queryReference.where(firestoreFieldName, 'array-contains-any', options.value);
|
|
1047
|
+
queryReference = queryReference.where(firestoreFieldName, '>=', options.value);
|
|
1048
|
+
queryReference = queryReference.where(firestoreFieldName, '<=', `${options.value}~`);
|
|
1047
1049
|
return queryReference;
|
|
1048
1050
|
}
|
|
1049
1051
|
if ((options === null || options === void 0 ? void 0 : options.operator) === Where.IN && Array.isArray(options === null || options === void 0 ? void 0 : options.value))
|
|
1050
|
-
return queryReference.where(
|
|
1052
|
+
return queryReference.where(firestoreFieldName, 'array-contains', options.value);
|
|
1051
1053
|
if (isObject(options) && isNil(options === null || options === void 0 ? void 0 : options.operator) && isNil(options === null || options === void 0 ? void 0 : options.value))
|
|
1052
1054
|
return Object.keys(options).reduce((queryReferenceWithWhere, key) => this.buildWhereSentence(queryReferenceWithWhere, `${fieldName}.${key}`, options[key]), queryReference);
|
|
1053
|
-
return queryReference.where(
|
|
1055
|
+
return queryReference.where(firestoreFieldName, (options === null || options === void 0 ? void 0 : options.operator) || '==', (options === null || options === void 0 ? void 0 : options.value) || options);
|
|
1054
1056
|
};
|
|
1055
1057
|
}
|
|
1056
1058
|
find(filters, limits, orderBy) {
|