@goatlab/fluent 0.9.8 → 0.9.10

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 (131) hide show
  1. package/dist/BaseConnector.d.ts +4 -4
  2. package/dist/BaseConnector.js +47 -27
  3. package/dist/BaseConnector.js.map +1 -1
  4. package/dist/Fluent.d.ts +7 -9
  5. package/dist/Fluent.js +36 -18
  6. package/dist/Fluent.js.map +1 -1
  7. package/dist/TypeOrmConnector/TypeOrmConnector.d.ts +10 -7
  8. package/dist/TypeOrmConnector/TypeOrmConnector.js +157 -106
  9. package/dist/TypeOrmConnector/TypeOrmConnector.js.map +1 -1
  10. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoBaseAggregations.d.ts +2 -2
  11. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoBaseAggregations.js +14 -8
  12. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoBaseAggregations.js.map +1 -1
  13. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoFindAggregatedQuery.d.ts +2 -2
  14. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoFindAggregatedQuery.js.map +1 -1
  15. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoOrderBy.js.map +1 -1
  16. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoWhere.d.ts +2 -2
  17. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoWhere.js +99 -181
  18. package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoWhere.js.map +1 -1
  19. package/dist/TypeOrmConnector/queryBuilder/sql/getQueryBuilderWhere.d.ts +2 -2
  20. package/dist/TypeOrmConnector/queryBuilder/sql/getQueryBuilderWhere.js +40 -40
  21. package/dist/TypeOrmConnector/queryBuilder/sql/getQueryBuilderWhere.js.map +1 -1
  22. package/dist/TypeOrmConnector/queryBuilder/sql/getTypeOrmWhere.d.ts +2 -2
  23. package/dist/TypeOrmConnector/queryBuilder/sql/getTypeOrmWhere.js +96 -41
  24. package/dist/TypeOrmConnector/queryBuilder/sql/getTypeOrmWhere.js.map +1 -1
  25. package/dist/TypeOrmConnector/test/advanced/typeOrm.entity.js +5 -1
  26. package/dist/TypeOrmConnector/test/advanced/typeOrm.entity.js.map +1 -1
  27. package/dist/TypeOrmConnector/test/basic/goat.entity.js +19 -7
  28. package/dist/TypeOrmConnector/test/basic/goat.entity.js.map +1 -1
  29. package/dist/TypeOrmConnector/util/clearEmpties.js +53 -33
  30. package/dist/TypeOrmConnector/util/clearEmpties.js.map +1 -1
  31. package/dist/TypeOrmConnector/util/extractConditions.d.ts +4 -2
  32. package/dist/TypeOrmConnector/util/extractConditions.js +109 -73
  33. package/dist/TypeOrmConnector/util/extractConditions.js.map +1 -1
  34. package/dist/TypeOrmConnector/util/extractInclude.js.map +1 -1
  35. package/dist/TypeOrmConnector/util/extractMetadataFromKeys.js +3 -1
  36. package/dist/TypeOrmConnector/util/extractMetadataFromKeys.js.map +1 -1
  37. package/dist/TypeOrmConnector/util/nestQueryResults.js +5 -3
  38. package/dist/TypeOrmConnector/util/nestQueryResults.js.map +1 -1
  39. package/dist/core/Loopback/build-schema.d.ts +1 -1
  40. package/dist/core/Loopback/build-schema.js +33 -27
  41. package/dist/core/Loopback/build-schema.js.map +1 -1
  42. package/dist/core/Loopback/common-types.d.ts +1 -3
  43. package/dist/core/Loopback/common-types.js.map +1 -1
  44. package/dist/core/Loopback/json-to-schema.js +6 -5
  45. package/dist/core/Loopback/json-to-schema.js.map +1 -1
  46. package/dist/core/Loopback/mapValues.js +704 -584
  47. package/dist/core/Loopback/model.d.ts +2 -3
  48. package/dist/core/Loopback/model.js +26 -18
  49. package/dist/core/Loopback/model.js.map +1 -1
  50. package/dist/core/Loopback/query.js +36 -30
  51. package/dist/core/Loopback/query.js.map +1 -1
  52. package/dist/core/Loopback/relation.types.d.ts +1 -1
  53. package/dist/core/Loopback/type-resolver.js +6 -3
  54. package/dist/core/Loopback/type-resolver.js.map +1 -1
  55. package/dist/core/Nestjs/applyDecorators.d.ts +1 -1
  56. package/dist/core/Nestjs/types/common.d.ts +7 -7
  57. package/dist/core/Nestjs/types/common.js +4 -4
  58. package/dist/core/Nestjs/types/decorators/api-hide-property.decorator.js +1 -1
  59. package/dist/core/Nestjs/types/decorators/api-hide-property.decorator.js.map +1 -1
  60. package/dist/core/Nestjs/types/decorators/api-property.decorator.js +1 -1
  61. package/dist/core/Nestjs/types/decorators/api-property.decorator.js.map +1 -1
  62. package/dist/core/Nestjs/types/decorators/apply-is-optional.decorator.d.ts +1 -1
  63. package/dist/core/Nestjs/types/decorators/apply-is-optional.decorator.js +1 -1
  64. package/dist/core/Nestjs/types/decorators/apply-is-optional.decorator.js.map +1 -1
  65. package/dist/core/Nestjs/types/decorators/args-type.decorator.js +4 -4
  66. package/dist/core/Nestjs/types/decorators/args-type.decorator.js.map +1 -1
  67. package/dist/core/Nestjs/types/decorators/create-property.decorator.d.ts +1 -1
  68. package/dist/core/Nestjs/types/decorators/create-property.decorator.js.map +1 -1
  69. package/dist/core/Nestjs/types/decorators/directive.decorator.js +1 -1
  70. package/dist/core/Nestjs/types/decorators/directive.decorator.js.map +1 -1
  71. package/dist/core/Nestjs/types/decorators/extensions.decorator.js.map +1 -1
  72. package/dist/core/Nestjs/types/decorators/field.decorator.d.ts +1 -1
  73. package/dist/core/Nestjs/types/decorators/field.decorator.js +3 -3
  74. package/dist/core/Nestjs/types/decorators/field.decorator.js.map +1 -1
  75. package/dist/core/Nestjs/types/decorators/input-type.decorator.js +3 -3
  76. package/dist/core/Nestjs/types/decorators/input-type.decorator.js.map +1 -1
  77. package/dist/core/Nestjs/types/decorators/interface-type.decorator.js +3 -3
  78. package/dist/core/Nestjs/types/decorators/interface-type.decorator.js.map +1 -1
  79. package/dist/core/Nestjs/types/decorators/partial-type.helper.js +1 -1
  80. package/dist/core/Nestjs/types/decorators/partial-type.helper.js.map +1 -1
  81. package/dist/core/Nestjs/types/interfaces/add-class-type-metadata.util.js.map +1 -1
  82. package/dist/core/Nestjs/types/interfaces/complexity.interface.d.ts +1 -1
  83. package/dist/core/Nestjs/types/interfaces/field-middleware.interface.d.ts +2 -4
  84. package/dist/core/Nestjs/types/interfaces/return-type-func.interface.d.ts +1 -1
  85. package/dist/core/Nestjs/types/interfaces/schema-object-metadata.interface.d.ts +2 -2
  86. package/dist/core/Nestjs/types/lazy-metadata.storage.d.ts +4 -4
  87. package/dist/core/Nestjs/types/lazy-metadata.storage.js +2 -3
  88. package/dist/core/Nestjs/types/lazy-metadata.storage.js.map +1 -1
  89. package/dist/core/Nestjs/types/metadata/class.metadata.d.ts +1 -1
  90. package/dist/core/Nestjs/types/metadata/directive.metadata.d.ts +1 -1
  91. package/dist/core/Nestjs/types/metadata/extensions.metadata.d.ts +1 -1
  92. package/dist/core/Nestjs/types/metadata/property.metadata.d.ts +2 -2
  93. package/dist/core/Nestjs/types/metadata/resolver.metadata.d.ts +6 -6
  94. package/dist/core/Nestjs/types/object-type.decorator.js +4 -4
  95. package/dist/core/Nestjs/types/object-type.decorator.js.map +1 -1
  96. package/dist/core/Nestjs/types/omit-type.d.ts +1 -1
  97. package/dist/core/Nestjs/types/omit-type.js +1 -1
  98. package/dist/core/Nestjs/types/omit-type.js.map +1 -1
  99. package/dist/core/Nestjs/types/reflection.utils.js.map +1 -1
  100. package/dist/core/Nestjs/types/set-metadata.decorator.js +1 -1
  101. package/dist/core/Nestjs/types/set-metadata.decorator.js.map +1 -1
  102. package/dist/core/Nestjs/types/type-metadata.storage.d.ts +4 -1
  103. package/dist/core/Nestjs/types/type-metadata.storage.js +45 -33
  104. package/dist/core/Nestjs/types/type-metadata.storage.js.map +1 -1
  105. package/dist/core/Nestjs/types/utils/enum.utils.js +2 -2
  106. package/dist/core/Nestjs/types/utils/enum.utils.js.map +1 -1
  107. package/dist/core/Nestjs/types/utils/get-fields-and-decorator.util.js +6 -6
  108. package/dist/core/Nestjs/types/utils/get-fields-and-decorator.util.js.map +1 -1
  109. package/dist/core/types.d.ts +5 -5
  110. package/dist/core/types.js +5 -5
  111. package/dist/core/types.js.map +1 -1
  112. package/dist/decorators.d.ts +6 -6
  113. package/dist/decorators.js +10 -10
  114. package/dist/decorators.js.map +1 -1
  115. package/dist/index.d.ts +20 -16
  116. package/dist/index.js +29 -23
  117. package/dist/index.js.map +1 -1
  118. package/dist/loadRelations.d.ts +1 -1
  119. package/dist/loadRelations.js +129 -117
  120. package/dist/loadRelations.js.map +1 -1
  121. package/dist/outputKeys.js.map +1 -1
  122. package/dist/testing/genericUnifiedTestSuite.js +5 -6
  123. package/dist/testing/genericUnifiedTestSuite.js.map +1 -1
  124. package/dist/testing/unifiedTestFactory.d.ts +2 -2
  125. package/dist/testing/unifiedTestFactory.js +4 -7
  126. package/dist/testing/unifiedTestFactory.js.map +1 -1
  127. package/dist/tsconfig.tsbuildinfo +1 -1
  128. package/dist/types.d.ts +18 -18
  129. package/dist/types.js +16 -16
  130. package/dist/types.js.map +1 -1
  131. package/package.json +6 -6
@@ -1 +1 @@
1
- {"version":3,"file":"getMongoFindAggregatedQuery.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/mongodb/getMongoFindAggregatedQuery.ts"],"names":[],"mappings":";;;AAEA,yEAAoE;AACpE,uDAAmD;AACnD,qDAAiD;AACjD,mDAA+C;AAM/C;;;;GAIG;AACI,MAAM,2BAA2B,GAAG,CAAC,EAC1C,KAAK,EACL,IAAI,EAC6B,EAAS,EAAE;IAC5C,IAAI,CAAC,MAAM,EAAE,CAAA;IACb,MAAM,QAAQ,GAAG,IAAA,+BAAc,EAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,IAAA,iCAAe,EAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAE/C,MAAM,KAAK,GAAG,IAAA,6BAAa,EAAC;QAC1B,KAAK,EAAE,KAAK,EAAE,KAAK;KACpB,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAG,IAAA,kDAAuB,EAAC;QAC/C,OAAO,EAAE,KAAK,EAAE,OAAO;QACvB,IAAI;KACL,CAAC,CAAA;IAEF,MAAM,SAAS,GAAU,EAAE,CAAA;IAE3B,4CAA4C;IAC5C,IAAI,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC;YACb,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;QACpB,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,KAAK,EAAE,MAAM,EAAE,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,KAAK,EAAE,KAAK,EAAE,CAAC;QACjB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IACzC,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE,CAAC;QACtC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACxB,CAAC;IAED,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7C,SAAS,CAAC,IAAI,CAAC;YACb,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AArDY,QAAA,2BAA2B,+BAqDvC"}
1
+ {"version":3,"file":"getMongoFindAggregatedQuery.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/mongodb/getMongoFindAggregatedQuery.ts"],"names":[],"mappings":";;;AACA,yEAAoE;AACpE,uDAAmD;AACnD,qDAAiD;AACjD,mDAA+C;AAM/C;;;;GAIG;AACI,MAAM,2BAA2B,GAAG,CAAC,EAC1C,KAAK,EACL,IAAI,EAC6B,EAAS,EAAE;IAC5C,IAAI,CAAC,MAAM,EAAE,CAAA;IACb,MAAM,QAAQ,GAAG,IAAA,+BAAc,EAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,IAAA,iCAAe,EAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAE/C,MAAM,KAAK,GAAG,IAAA,6BAAa,EAAC;QAC1B,KAAK,EAAE,KAAK,EAAE,KAAK;KACpB,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAG,IAAA,kDAAuB,EAAC;QAC/C,OAAO,EAAE,KAAK,EAAE,OAAO;QACvB,IAAI;KACL,CAAC,CAAA;IAEF,MAAM,SAAS,GAAU,EAAE,CAAA;IAE3B,4CAA4C;IAC5C,IAAI,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC;YACb,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACzB,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;QACpB,SAAS,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;IAC/D,CAAC;IAED,IAAI,KAAK,EAAE,MAAM,EAAE,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,IAAI,KAAK,EAAE,KAAK,EAAE,CAAC;QACjB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAA;IACzC,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE,CAAC;QACtC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACxB,CAAC;IAED,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7C,SAAS,CAAC,IAAI,CAAC;YACb,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AArDY,QAAA,2BAA2B,+BAqDvC"}
@@ -1 +1 @@
1
- {"version":3,"file":"getMongoOrderBy.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/mongodb/getMongoOrderBy.ts"],"names":[],"mappings":";;;AAAA,8DAA0D;AAGnD,MAAM,eAAe,GAAG,CAAC,OAAqC,EAAE,EAAE;IACvE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,OAAc,CAAC,CAAA;IAE5C,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,EAAE;KACV,CAAA;IAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACzD,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAhBY,QAAA,eAAe,mBAgB3B"}
1
+ {"version":3,"file":"getMongoOrderBy.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/mongodb/getMongoOrderBy.ts"],"names":[],"mappings":";;;AACA,8DAA0D;AAEnD,MAAM,eAAe,GAAG,CAAC,OAAqC,EAAE,EAAE;IACvE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,IAAA,+BAAc,EAAC,OAAc,CAAC,CAAA;IAE5C,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,EAAE;KACV,CAAA;IAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,GAAG,EAAE,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACzD,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAhBY,QAAA,eAAe,mBAgB3B"}
@@ -1,6 +1,6 @@
1
1
  import { FindManyOptions } from 'typeorm';
2
2
  import { AnyObject, FluentQuery } from '../../../types';
3
- export interface getTypeOrmMongoWhereParams {
3
+ export interface GetTypeOrmMongoWhereParams {
4
4
  where?: FluentQuery<AnyObject>['where'];
5
5
  }
6
6
  /**
@@ -8,4 +8,4 @@ export interface getTypeOrmMongoWhereParams {
8
8
  * @param where
9
9
  * @returns
10
10
  */
11
- export declare const getMongoWhere: ({ where }: getTypeOrmMongoWhereParams) => FindManyOptions["where"];
11
+ export declare const getMongoWhere: ({ where }: GetTypeOrmMongoWhereParams) => FindManyOptions["where"];
@@ -3,9 +3,88 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getMongoWhere = void 0;
4
4
  const js_utils_1 = require("@goatlab/js-utils");
5
5
  const bson_1 = require("bson");
6
- const clearEmpties_1 = require("../../util/clearEmpties");
7
6
  const types_1 = require("../../../types");
7
+ const clearEmpties_1 = require("../../util/clearEmpties");
8
8
  const extractConditions_1 = require("../../util/extractConditions");
9
+ // Helper function to normalize MongoDB condition
10
+ const normalizeCondition = (condition) => {
11
+ let { element, operator, value } = condition;
12
+ // For MongoDB, we need to convert string IDs to ObjectID instances
13
+ // AND convert the field name from 'id' to '_id'
14
+ if (element === 'id') {
15
+ element = '_id';
16
+ value = (Array.isArray(value)
17
+ ? value.map(v => new bson_1.ObjectId(v))
18
+ : new bson_1.ObjectId(value));
19
+ }
20
+ return { element, operator, value };
21
+ };
22
+ // Helper function to build MongoDB filter object
23
+ const buildMongoFilter = (operator, value) => {
24
+ switch (operator) {
25
+ case types_1.LogicOperator.Equals:
26
+ return value;
27
+ case types_1.LogicOperator.IsNot:
28
+ return { $ne: value };
29
+ case types_1.LogicOperator.GreaterThan:
30
+ return { $gt: value };
31
+ case types_1.LogicOperator.GreaterOrEqualThan:
32
+ return { $gte: value };
33
+ case types_1.LogicOperator.LessThan:
34
+ return { $lt: value };
35
+ case types_1.LogicOperator.LessOrEqualThan:
36
+ return { $lte: value };
37
+ case types_1.LogicOperator.In:
38
+ return { $in: value };
39
+ case types_1.LogicOperator.NotIn:
40
+ return { $nin: value };
41
+ case types_1.LogicOperator.Exists:
42
+ return { $exists: true };
43
+ case types_1.LogicOperator.NotExists:
44
+ return { $exists: false };
45
+ case types_1.LogicOperator.Regexp:
46
+ return { $regex: value };
47
+ default:
48
+ return value;
49
+ }
50
+ };
51
+ // Helper function to add condition to filter
52
+ const addConditionToFilter = (filter, condition, isOr = false) => {
53
+ const { element, operator, value } = normalizeCondition(condition);
54
+ const mongoFilter = buildMongoFilter(operator, value);
55
+ if (operator === types_1.LogicOperator.Equals) {
56
+ if (isOr) {
57
+ filter.$or.push({ [element]: { $eq: value } });
58
+ }
59
+ else {
60
+ filter.$or[0].$and.push({ [element]: { $eq: value } });
61
+ }
62
+ }
63
+ else if (operator === types_1.LogicOperator.IsNot) {
64
+ if (isOr) {
65
+ filter.$or.push({ [element]: { $neq: value } });
66
+ }
67
+ else {
68
+ filter.$or[0].$and.push({ [element]: { $neq: value } });
69
+ }
70
+ }
71
+ else if (operator === types_1.LogicOperator.NotIn) {
72
+ if (isOr) {
73
+ filter.$or.push({ [element]: { $not: { $in: value } } });
74
+ }
75
+ else {
76
+ filter.$or[0].$and.push({ [element]: { $not: { $in: value } } });
77
+ }
78
+ }
79
+ else {
80
+ if (isOr) {
81
+ filter.$or.push({ [element]: mongoFilter });
82
+ }
83
+ else {
84
+ filter.$or[0].$and.push({ [element]: mongoFilter });
85
+ }
86
+ }
87
+ };
9
88
  /**
10
89
  *
11
90
  * @param where
@@ -16,54 +95,19 @@ const getMongoWhere = ({ where }) => {
16
95
  return {};
17
96
  }
18
97
  // For simple queries without OR/AND, we can use a simpler structure
19
- const hasLogicalOperators = where['OR'] || where['AND'];
98
+ const hasLogicalOperators = where.OR || where.AND;
20
99
  if (!hasLogicalOperators) {
21
100
  // Simple query without logical operators
22
101
  const conditions = (0, extractConditions_1.extractConditions)([where]);
23
102
  const simpleFilter = {};
24
103
  for (const condition of conditions) {
25
- let { element, operator, value } = condition;
26
- if (element === 'id') {
27
- element = '_id';
28
- value = (Array.isArray(value)
29
- ? value.map(v => new bson_1.ObjectId(v))
30
- : new bson_1.ObjectId(value));
104
+ const { element, operator, value } = normalizeCondition(condition);
105
+ const filter = buildMongoFilter(operator, value);
106
+ if (operator === types_1.LogicOperator.Equals) {
107
+ simpleFilter[element] = value;
31
108
  }
32
- // Build the MongoDB query
33
- switch (operator) {
34
- case types_1.LogicOperator.equals:
35
- simpleFilter[element] = value;
36
- break;
37
- case types_1.LogicOperator.isNot:
38
- simpleFilter[element] = { $ne: value };
39
- break;
40
- case types_1.LogicOperator.greaterThan:
41
- simpleFilter[element] = { $gt: value };
42
- break;
43
- case types_1.LogicOperator.greaterOrEqualThan:
44
- simpleFilter[element] = { $gte: value };
45
- break;
46
- case types_1.LogicOperator.lessThan:
47
- simpleFilter[element] = { $lt: value };
48
- break;
49
- case types_1.LogicOperator.lessOrEqualThan:
50
- simpleFilter[element] = { $lte: value };
51
- break;
52
- case types_1.LogicOperator.in:
53
- simpleFilter[element] = { $in: value };
54
- break;
55
- case types_1.LogicOperator.notIn:
56
- simpleFilter[element] = { $nin: value };
57
- break;
58
- case types_1.LogicOperator.exists:
59
- simpleFilter[element] = { $exists: true };
60
- break;
61
- case types_1.LogicOperator.notExists:
62
- simpleFilter[element] = { $exists: false };
63
- break;
64
- case types_1.LogicOperator.regexp:
65
- simpleFilter[element] = { $regex: value };
66
- break;
109
+ else {
110
+ simpleFilter[element] = filter;
67
111
  }
68
112
  }
69
113
  return simpleFilter;
@@ -72,153 +116,27 @@ const getMongoWhere = ({ where }) => {
72
116
  const Filters = {
73
117
  filter: { $or: [{ $and: [] }] }
74
118
  };
75
- const orConditions = (0, extractConditions_1.extractConditions)(where['OR']);
76
- const andConditions = (0, extractConditions_1.extractConditions)(where['AND']);
119
+ const orConditions = (0, extractConditions_1.extractConditions)(where.OR);
120
+ const andConditions = (0, extractConditions_1.extractConditions)(where.AND);
77
121
  const copy = js_utils_1.Objects.clone(where);
78
- if (!!copy['AND']) {
79
- delete copy['AND'];
122
+ if (copy.AND) {
123
+ copy.AND = undefined;
80
124
  }
81
- if (!!copy['OR']) {
82
- delete copy['OR'];
125
+ if (copy.OR) {
126
+ copy.OR = undefined;
83
127
  }
84
128
  const rootLevelConditions = (0, extractConditions_1.extractConditions)([copy]);
129
+ // Process AND conditions
85
130
  for (const condition of andConditions) {
86
- let { element, operator, value } = condition;
87
- if (element === 'id') {
88
- element = '_id';
89
- value = (Array.isArray(value)
90
- ? value.map(v => new bson_1.ObjectId(v))
91
- : new bson_1.ObjectId(value));
92
- }
93
- switch (operator) {
94
- case types_1.LogicOperator.equals:
95
- Filters.filter.$or[0].$and.push({ [element]: { $eq: value } });
96
- break;
97
- case types_1.LogicOperator.isNot:
98
- Filters.filter.$or[0].$and.push({ [element]: { $neq: value } });
99
- break;
100
- case types_1.LogicOperator.greaterThan:
101
- Filters.filter.$or[0].$and.push({ [element]: { $gt: value } });
102
- break;
103
- case types_1.LogicOperator.greaterOrEqualThan:
104
- Filters.filter.$or[0].$and.push({ [element]: { $gte: value } });
105
- break;
106
- case types_1.LogicOperator.lessThan:
107
- Filters.filter.$or[0].$and.push({ [element]: { $lt: value } });
108
- break;
109
- case types_1.LogicOperator.lessOrEqualThan:
110
- Filters.filter.$or[0].$and.push({ [element]: { $lte: value } });
111
- break;
112
- case types_1.LogicOperator.in:
113
- Filters.filter.$or[0].$and.push({ [element]: { $in: value } });
114
- break;
115
- case types_1.LogicOperator.notIn:
116
- Filters.filter.$or[0].$and.push({
117
- [element]: { $not: { $in: value } }
118
- });
119
- break;
120
- case types_1.LogicOperator.exists:
121
- Filters.filter.$or[0].$and.push({ [element]: { $exists: true } });
122
- break;
123
- case types_1.LogicOperator.notExists:
124
- Filters.filter.$or[0].$and.push({ [element]: { $exists: false } });
125
- break;
126
- case types_1.LogicOperator.regexp:
127
- Filters.filter.$or[0].$and.push({ [element]: { $regex: value } });
128
- break;
129
- }
131
+ addConditionToFilter(Filters.filter, condition, false);
130
132
  }
133
+ // Process root level conditions (treated as AND)
131
134
  for (const condition of rootLevelConditions) {
132
- let { element, operator, value } = condition;
133
- if (element === 'id') {
134
- element = '_id';
135
- value = (Array.isArray(value)
136
- ? value.map(v => new bson_1.ObjectId(v))
137
- : new bson_1.ObjectId(value));
138
- }
139
- switch (operator) {
140
- case types_1.LogicOperator.equals:
141
- Filters.filter.$or[0].$and.push({ [element]: { $eq: value } });
142
- break;
143
- case types_1.LogicOperator.isNot:
144
- Filters.filter.$or[0].$and.push({ [element]: { $neq: value } });
145
- break;
146
- case types_1.LogicOperator.greaterThan:
147
- Filters.filter.$or[0].$and.push({ [element]: { $gt: value } });
148
- break;
149
- case types_1.LogicOperator.greaterOrEqualThan:
150
- Filters.filter.$or[0].$and.push({ [element]: { $gte: value } });
151
- break;
152
- case types_1.LogicOperator.lessThan:
153
- Filters.filter.$or[0].$and.push({ [element]: { $lt: value } });
154
- break;
155
- case types_1.LogicOperator.lessOrEqualThan:
156
- Filters.filter.$or[0].$and.push({ [element]: { $lte: value } });
157
- break;
158
- case types_1.LogicOperator.in:
159
- Filters.filter.$or[0].$and.push({ [element]: { $in: value } });
160
- break;
161
- case types_1.LogicOperator.notIn:
162
- Filters.filter.$or[0].$and.push({
163
- [element]: { $not: { $in: value } }
164
- });
165
- break;
166
- case types_1.LogicOperator.exists:
167
- Filters.filter.$or[0].$and.push({ [element]: { $exists: true } });
168
- break;
169
- case types_1.LogicOperator.notExists:
170
- Filters.filter.$or[0].$and.push({ [element]: { $exists: false } });
171
- break;
172
- case types_1.LogicOperator.regexp:
173
- Filters.filter.$or[0].$and.push({ [element]: { $regex: value } });
174
- break;
175
- }
135
+ addConditionToFilter(Filters.filter, condition, false);
176
136
  }
137
+ // Process OR conditions
177
138
  for (const condition of orConditions) {
178
- let { element, operator, value } = condition;
179
- if (element === 'id') {
180
- element = '_id';
181
- value = (Array.isArray(value)
182
- ? value.map(v => new bson_1.ObjectId(v))
183
- : new bson_1.ObjectId(value));
184
- }
185
- switch (operator) {
186
- case types_1.LogicOperator.equals:
187
- Filters.filter.$or.push({ [element]: { $eq: value } });
188
- break;
189
- case types_1.LogicOperator.isNot:
190
- Filters.filter.$or.push({ [element]: { $neq: value } });
191
- break;
192
- case types_1.LogicOperator.greaterThan:
193
- Filters.filter.$or.push({ [element]: { $gt: value } });
194
- break;
195
- case types_1.LogicOperator.greaterOrEqualThan:
196
- Filters.filter.$or.push({ [element]: { $gte: value } });
197
- break;
198
- case types_1.LogicOperator.lessThan:
199
- Filters.filter.$or.push({ [element]: { $lt: value } });
200
- break;
201
- case types_1.LogicOperator.lessOrEqualThan:
202
- Filters.filter.$or.push({ [element]: { $lte: value } });
203
- break;
204
- case types_1.LogicOperator.in:
205
- Filters.filter.$or.push({ [element]: { $in: value } });
206
- break;
207
- case types_1.LogicOperator.notIn:
208
- Filters.filter.$or.push({
209
- [element]: { $not: { $in: value } }
210
- });
211
- break;
212
- case types_1.LogicOperator.exists:
213
- Filters.filter.$or.push({ [element]: { $exists: true } });
214
- break;
215
- case types_1.LogicOperator.notExists:
216
- Filters.filter.$or.push({ [element]: { $exists: false } });
217
- break;
218
- case types_1.LogicOperator.regexp:
219
- Filters.filter.$or.push({ [element]: { $regex: value } });
220
- break;
221
- }
139
+ addConditionToFilter(Filters.filter, condition, true);
222
140
  }
223
141
  const filtered = (0, clearEmpties_1.clearEmpties)(Filters.filter);
224
142
  return filtered;
@@ -1 +1 @@
1
- {"version":3,"file":"getMongoWhere.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/mongodb/getMongoWhere.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getMongoWhere.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/mongodb/getMongoWhere.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { SelectQueryBuilder } from 'typeorm';
2
2
  import { AnyObject, FluentQuery } from '../../../types';
3
- export interface getQueryBuilderWhereParams {
3
+ export interface GetQueryBuilderWhereParams {
4
4
  where?: FluentQuery<AnyObject>['where'];
5
5
  queryBuilder: SelectQueryBuilder<any>;
6
6
  queryAlias: string;
@@ -10,4 +10,4 @@ export interface getQueryBuilderWhereParams {
10
10
  * @param where
11
11
  * @returns
12
12
  */
13
- export declare const getQueryBuilderWhere: ({ where, queryAlias, queryBuilder }: getQueryBuilderWhereParams) => SelectQueryBuilder<any>;
13
+ export declare const getQueryBuilderWhere: ({ where, queryAlias, queryBuilder }: GetQueryBuilderWhereParams) => SelectQueryBuilder<any>;
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getQueryBuilderWhere = void 0;
4
4
  const js_utils_1 = require("@goatlab/js-utils");
5
5
  const typeorm_1 = require("typeorm");
6
- const extractConditions_1 = require("../../util/extractConditions");
7
6
  const types_1 = require("../../../types");
7
+ const extractConditions_1 = require("../../util/extractConditions");
8
8
  const queryId = js_utils_1.Ids.customId('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
9
9
  /**
10
10
  *
@@ -15,14 +15,14 @@ const getQueryBuilderWhere = ({ where, queryAlias, queryBuilder }) => {
15
15
  if (!where || Object.keys(where).length === 0) {
16
16
  return queryBuilder;
17
17
  }
18
- const orConditions = (0, extractConditions_1.extractConditions)(where['OR']);
19
- const andConditions = (0, extractConditions_1.extractConditions)(where['AND']);
18
+ const orConditions = (0, extractConditions_1.extractConditions)(where.OR);
19
+ const andConditions = (0, extractConditions_1.extractConditions)(where.AND);
20
20
  const copy = js_utils_1.Objects.clone(where);
21
- if (!!copy['AND']) {
22
- delete copy['AND'];
21
+ if (copy.AND) {
22
+ copy.AND = undefined;
23
23
  }
24
- if (!!copy['OR']) {
25
- delete copy['OR'];
24
+ if (copy.OR) {
25
+ copy.OR = undefined;
26
26
  }
27
27
  const rootLevelConditions = (0, extractConditions_1.extractConditions)([copy]);
28
28
  queryBuilder.andWhere(new typeorm_1.Brackets(qbAnd => {
@@ -31,53 +31,53 @@ const getQueryBuilderWhere = ({ where, queryAlias, queryBuilder }) => {
31
31
  const { element, operator, value } = condition;
32
32
  const customId = queryId(4);
33
33
  switch (operator) {
34
- case types_1.LogicOperator.equals:
34
+ case types_1.LogicOperator.Equals:
35
35
  qbAnd.andWhere(`${queryAlias}.${element} = :${element}_${customId}`, {
36
36
  [`${element}_${customId}`]: value
37
37
  });
38
38
  break;
39
- case types_1.LogicOperator.isNot:
39
+ case types_1.LogicOperator.IsNot:
40
40
  qbAnd.andWhere(`${queryAlias}.${element} != :${element}_${customId}`, {
41
41
  [`${element}_${customId}`]: value
42
42
  });
43
43
  break;
44
- case types_1.LogicOperator.greaterThan:
44
+ case types_1.LogicOperator.GreaterThan:
45
45
  qbAnd.andWhere(`${queryAlias}.${element} > :${element}_${customId}`, {
46
46
  [`${element}_${customId}`]: value
47
47
  });
48
48
  break;
49
- case types_1.LogicOperator.greaterOrEqualThan:
49
+ case types_1.LogicOperator.GreaterOrEqualThan:
50
50
  qbAnd.andWhere(`${queryAlias}.${element} >= :${element}_${customId}`, {
51
51
  [`${element}_${customId}`]: value
52
52
  });
53
53
  break;
54
- case types_1.LogicOperator.lessThan:
54
+ case types_1.LogicOperator.LessThan:
55
55
  qbAnd.andWhere(`${queryAlias}.${element} < :${element}_${customId}`, {
56
56
  [`${element}_${customId}`]: value
57
57
  });
58
58
  break;
59
- case types_1.LogicOperator.lessOrEqualThan:
59
+ case types_1.LogicOperator.LessOrEqualThan:
60
60
  qbAnd.andWhere(`${queryAlias}.${element} <= :${element}_${customId}`, {
61
61
  [`${element}_${customId}`]: value
62
62
  });
63
63
  break;
64
- case types_1.LogicOperator.in:
64
+ case types_1.LogicOperator.In:
65
65
  qbAnd.andWhere(`${queryAlias}.${element} IN :${element}_${customId}`, {
66
66
  [`${element}_${customId}`]: value
67
67
  });
68
68
  break;
69
- case types_1.LogicOperator.notIn:
69
+ case types_1.LogicOperator.NotIn:
70
70
  qbAnd.andWhere(`${queryAlias}.${element} NOT IN :${element}_${customId}`, {
71
71
  [`${element}_${customId}`]: value
72
72
  });
73
73
  break;
74
- case types_1.LogicOperator.exists:
74
+ case types_1.LogicOperator.Exists:
75
75
  qbAnd.andWhere(`${queryAlias}.${element} IS NOT NULL`);
76
76
  break;
77
- case types_1.LogicOperator.notExists:
77
+ case types_1.LogicOperator.NotExists:
78
78
  qbAnd.andWhere(`${queryAlias}.${element} IS NULL`);
79
79
  break;
80
- case types_1.LogicOperator.regexp:
80
+ case types_1.LogicOperator.Regexp:
81
81
  qbAnd.andWhere(`${queryAlias}.${element} LIKE :${element}_${customId}`, {
82
82
  [`${element}_${customId}`]: value
83
83
  });
@@ -88,53 +88,53 @@ const getQueryBuilderWhere = ({ where, queryAlias, queryBuilder }) => {
88
88
  const { element, operator, value } = condition;
89
89
  const customId = queryId(4);
90
90
  switch (operator) {
91
- case types_1.LogicOperator.equals:
91
+ case types_1.LogicOperator.Equals:
92
92
  qbAnd.andWhere(`${queryAlias}.${element} = :${element}_${customId}`, {
93
93
  [`${element}_${customId}`]: value
94
94
  });
95
95
  break;
96
- case types_1.LogicOperator.isNot:
96
+ case types_1.LogicOperator.IsNot:
97
97
  qbAnd.andWhere(`${queryAlias}.${element} != :${element}_${customId}`, {
98
98
  [`${element}_${customId}`]: value
99
99
  });
100
100
  break;
101
- case types_1.LogicOperator.greaterThan:
101
+ case types_1.LogicOperator.GreaterThan:
102
102
  qbAnd.andWhere(`${queryAlias}.${element} > :${element}_${customId}`, {
103
103
  [`${element}_${customId}`]: value
104
104
  });
105
105
  break;
106
- case types_1.LogicOperator.greaterOrEqualThan:
106
+ case types_1.LogicOperator.GreaterOrEqualThan:
107
107
  qbAnd.andWhere(`${queryAlias}.${element} >= :${element}_${customId}`, {
108
108
  [`${element}_${customId}`]: value
109
109
  });
110
110
  break;
111
- case types_1.LogicOperator.lessThan:
111
+ case types_1.LogicOperator.LessThan:
112
112
  qbAnd.andWhere(`${queryAlias}.${element} < :${element}_${customId}`, {
113
113
  [`${element}_${customId}`]: value
114
114
  });
115
115
  break;
116
- case types_1.LogicOperator.lessOrEqualThan:
116
+ case types_1.LogicOperator.LessOrEqualThan:
117
117
  qbAnd.andWhere(`${queryAlias}.${element} <= :${element}_${customId}`, {
118
118
  [`${element}_${customId}`]: value
119
119
  });
120
120
  break;
121
- case types_1.LogicOperator.in:
121
+ case types_1.LogicOperator.In:
122
122
  qbAnd.andWhere(`${queryAlias}.${element} IN :${element}_${customId}`, {
123
123
  [`${element}_${customId}`]: value
124
124
  });
125
125
  break;
126
- case types_1.LogicOperator.notIn:
126
+ case types_1.LogicOperator.NotIn:
127
127
  qbAnd.andWhere(`${queryAlias}.${element} NOT IN :${element}_${customId}`, {
128
128
  [`${element}_${customId}`]: value
129
129
  });
130
130
  break;
131
- case types_1.LogicOperator.exists:
131
+ case types_1.LogicOperator.Exists:
132
132
  qbAnd.andWhere(`${queryAlias}.${element} IS NOT NULL`);
133
133
  break;
134
- case types_1.LogicOperator.notExists:
134
+ case types_1.LogicOperator.NotExists:
135
135
  qbAnd.andWhere(`${queryAlias}.${element} IS NULL`);
136
136
  break;
137
- case types_1.LogicOperator.regexp:
137
+ case types_1.LogicOperator.Regexp:
138
138
  qbAnd.andWhere(`${queryAlias}.${element} LIKE :${element}_${customId}`, {
139
139
  [`${element}_${customId}`]: value
140
140
  });
@@ -146,53 +146,53 @@ const getQueryBuilderWhere = ({ where, queryAlias, queryBuilder }) => {
146
146
  const { element, operator, value } = condition;
147
147
  const customId = queryId(4);
148
148
  switch (operator) {
149
- case types_1.LogicOperator.equals:
149
+ case types_1.LogicOperator.Equals:
150
150
  qbOr.andWhere(`${queryAlias}.${element} = :${element}_${customId}`, {
151
151
  [`${element}_${customId}`]: value
152
152
  });
153
153
  break;
154
- case types_1.LogicOperator.isNot:
154
+ case types_1.LogicOperator.IsNot:
155
155
  qbOr.andWhere(`${queryAlias}.${element} != :${element}_${customId}`, {
156
156
  [`${element}_${customId}`]: value
157
157
  });
158
158
  break;
159
- case types_1.LogicOperator.greaterThan:
159
+ case types_1.LogicOperator.GreaterThan:
160
160
  qbOr.andWhere(`${queryAlias}.${element} > :${element}_${customId}`, {
161
161
  [`${element}_${customId}`]: value
162
162
  });
163
163
  break;
164
- case types_1.LogicOperator.greaterOrEqualThan:
164
+ case types_1.LogicOperator.GreaterOrEqualThan:
165
165
  qbOr.andWhere(`${queryAlias}.${element} >= :${element}_${customId}`, {
166
166
  [`${element}_${customId}`]: value
167
167
  });
168
168
  break;
169
- case types_1.LogicOperator.lessThan:
169
+ case types_1.LogicOperator.LessThan:
170
170
  qbOr.andWhere(`${queryAlias}.${element} < :${element}_${customId}`, {
171
171
  [`${element}_${customId}`]: value
172
172
  });
173
173
  break;
174
- case types_1.LogicOperator.lessOrEqualThan:
174
+ case types_1.LogicOperator.LessOrEqualThan:
175
175
  qbOr.andWhere(`${queryAlias}.${element} <= :${element}_${customId}`, {
176
176
  [`${element}_${customId}`]: value
177
177
  });
178
178
  break;
179
- case types_1.LogicOperator.in:
179
+ case types_1.LogicOperator.In:
180
180
  qbOr.andWhere(`${queryAlias}.${element} IN :${element}_${customId}`, {
181
181
  [`${element}_${customId}`]: value
182
182
  });
183
183
  break;
184
- case types_1.LogicOperator.notIn:
184
+ case types_1.LogicOperator.NotIn:
185
185
  qbOr.andWhere(`${queryAlias}.${element} NOT IN :${element}_${customId}`, {
186
186
  [`${element}_${customId}`]: value
187
187
  });
188
188
  break;
189
- case types_1.LogicOperator.exists:
189
+ case types_1.LogicOperator.Exists:
190
190
  qbOr.andWhere(`${queryAlias}.${element} IS NOT NULL`);
191
191
  break;
192
- case types_1.LogicOperator.notExists:
192
+ case types_1.LogicOperator.NotExists:
193
193
  qbOr.andWhere(`${queryAlias}.${element} IS NULL`);
194
194
  break;
195
- case types_1.LogicOperator.regexp:
195
+ case types_1.LogicOperator.Regexp:
196
196
  qbOr.andWhere(`${queryAlias}.${element} LIKE :${element}_${customId}`, {
197
197
  [`${element}_${customId}`]: value
198
198
  });