@goatlab/fluent 0.9.9 → 0.9.11

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":"getQueryBuilderWhere.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/sql/getQueryBuilderWhere.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getQueryBuilderWhere.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/sql/getQueryBuilderWhere.ts"],"names":[],"mappings":";;;AAAA,gDAAgD;AAChD,qCAAsD;AACtD,0CAAsE;AACtE,oEAAgE;AAEhE,MAAM,OAAO,GAAG,cAAG,CAAC,QAAQ,CAC1B,sDAAsD,CACvD,CAAA;AAOD;;;;GAIG;AACI,MAAM,oBAAoB,GAAG,CAAC,EACnC,KAAK,EACL,UAAU,EACV,YAAY,EACe,EAA2B,EAAE;IACxD,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9C,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,qCAAiB,EAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAChD,MAAM,aAAa,GAAG,IAAA,qCAAiB,EAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAElD,MAAM,IAAI,GAAG,kBAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IACjC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,GAAG,SAAS,CAAA;IACtB,CAAC;IAED,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;QACZ,IAAI,CAAC,EAAE,GAAG,SAAS,CAAA;IACrB,CAAC;IAED,MAAM,mBAAmB,GAAG,IAAA,qCAAiB,EAAC,CAAC,IAAI,CAAC,CAAC,CAAA;IAErD,YAAY,CAAC,QAAQ,CACnB,IAAI,kBAAQ,CAAC,KAAK,CAAC,EAAE;QACnB,0CAA0C;QAC1C,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;YACtC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,SAAS,CAAA;YAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAE3B,QAAQ,QAAQ,EAAE,CAAC;gBACjB,KAAK,qBAAa,CAAC,MAAM;oBACvB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,KAAK;oBACtB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,WAAW;oBAC5B,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,kBAAkB;oBACnC,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,QAAQ;oBACzB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,eAAe;oBAChC,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,EAAE;oBACnB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,KAAK;oBACtB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,YAAY,OAAO,IAAI,QAAQ,EAAE,EACzD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,MAAM;oBACvB,KAAK,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,OAAO,cAAc,CAAC,CAAA;oBACtD,MAAK;gBACP,KAAK,qBAAa,CAAC,SAAS;oBAC1B,KAAK,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,OAAO,UAAU,CAAC,CAAA;oBAClD,MAAK;gBACP,KAAK,qBAAa,CAAC,MAAM;oBACvB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,UAAU,OAAO,IAAI,QAAQ,EAAE,EACvD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;YACT,CAAC;QACH,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,mBAAmB,EAAE,CAAC;YAC5C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,SAAS,CAAA;YAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAE3B,QAAQ,QAAQ,EAAE,CAAC;gBACjB,KAAK,qBAAa,CAAC,MAAM;oBACvB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,KAAK;oBACtB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,WAAW;oBAC5B,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,kBAAkB;oBACnC,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,QAAQ;oBACzB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,eAAe;oBAChC,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,EAAE;oBACnB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,KAAK;oBACtB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,YAAY,OAAO,IAAI,QAAQ,EAAE,EACzD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;gBACP,KAAK,qBAAa,CAAC,MAAM;oBACvB,KAAK,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,OAAO,cAAc,CAAC,CAAA;oBACtD,MAAK;gBACP,KAAK,qBAAa,CAAC,SAAS;oBAC1B,KAAK,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,OAAO,UAAU,CAAC,CAAA;oBAClD,MAAK;gBACP,KAAK,qBAAa,CAAC,MAAM;oBACvB,KAAK,CAAC,QAAQ,CACZ,GAAG,UAAU,IAAI,OAAO,UAAU,OAAO,IAAI,QAAQ,EAAE,EACvD;wBACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;qBAClC,CACF,CAAA;oBACD,MAAK;YACT,CAAC;QACH,CAAC;QAED,KAAK,CAAC,QAAQ,CACZ,IAAI,kBAAQ,CAAC,IAAI,CAAC,EAAE;YAClB,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE,CAAC;gBACrC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,SAAS,CAAA;gBAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;gBAE3B,QAAQ,QAAQ,EAAE,CAAC;oBACjB,KAAK,qBAAa,CAAC,MAAM;wBACvB,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;oBACP,KAAK,qBAAa,CAAC,KAAK;wBACtB,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;oBACP,KAAK,qBAAa,CAAC,WAAW;wBAC5B,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;oBACP,KAAK,qBAAa,CAAC,kBAAkB;wBACnC,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;oBACP,KAAK,qBAAa,CAAC,QAAQ;wBACzB,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,OAAO,OAAO,IAAI,QAAQ,EAAE,EACpD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;oBACP,KAAK,qBAAa,CAAC,eAAe;wBAChC,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;oBACP,KAAK,qBAAa,CAAC,EAAE;wBACnB,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,QAAQ,OAAO,IAAI,QAAQ,EAAE,EACrD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;oBACP,KAAK,qBAAa,CAAC,KAAK;wBACtB,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,YAAY,OAAO,IAAI,QAAQ,EAAE,EACzD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;oBACP,KAAK,qBAAa,CAAC,MAAM;wBACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,OAAO,cAAc,CAAC,CAAA;wBACrD,MAAK;oBACP,KAAK,qBAAa,CAAC,SAAS;wBAC1B,IAAI,CAAC,QAAQ,CAAC,GAAG,UAAU,IAAI,OAAO,UAAU,CAAC,CAAA;wBACjD,MAAK;oBACP,KAAK,qBAAa,CAAC,MAAM;wBACvB,IAAI,CAAC,QAAQ,CACX,GAAG,UAAU,IAAI,OAAO,UAAU,OAAO,IAAI,QAAQ,EAAE,EACvD;4BACE,CAAC,GAAG,OAAO,IAAI,QAAQ,EAAE,CAAC,EAAE,KAAK;yBAClC,CACF,CAAA;wBACD,MAAK;gBACT,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CACH,CAAA;IAED,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAnSY,QAAA,oBAAoB,wBAmShC"}
@@ -1,6 +1,6 @@
1
1
  import { FindManyOptions } from 'typeorm';
2
2
  import { AnyObject, FluentQuery } from '../../../types';
3
- export interface getTypeOrmWhereParams {
3
+ export interface GetTypeOrmWhereParams {
4
4
  where?: FluentQuery<AnyObject>['where'];
5
5
  }
6
6
  /**
@@ -8,4 +8,4 @@ export interface getTypeOrmWhereParams {
8
8
  * @param where
9
9
  * @returns
10
10
  */
11
- export declare const getTypeOrmWhere: ({ where }: getTypeOrmWhereParams) => FindManyOptions["where"];
11
+ export declare const getTypeOrmWhere: ({ where }: GetTypeOrmWhereParams) => FindManyOptions["where"];
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getTypeOrmWhere = void 0;
4
4
  const js_utils_1 = require("@goatlab/js-utils");
5
5
  const typeorm_1 = require("typeorm");
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
9
  /**
10
10
  *
@@ -15,82 +15,130 @@ const getTypeOrmWhere = ({ where }) => {
15
15
  if (!where || Object.keys(where).length === 0) {
16
16
  return {};
17
17
  }
18
- // Every element of the array is an OR
18
+ // Check if this is a simple query without AND/OR operators
19
+ const hasLogicalOperators = where.OR || where.AND;
20
+ if (!hasLogicalOperators) {
21
+ // Simple query - just process the conditions directly
22
+ const conditions = (0, extractConditions_1.extractConditions)([where]);
23
+ const simpleFilter = {};
24
+ for (const condition of conditions) {
25
+ const { element, operator, value } = condition;
26
+ switch (operator) {
27
+ case types_1.LogicOperator.Equals:
28
+ simpleFilter[element] = (0, typeorm_1.Equal)(value);
29
+ break;
30
+ case types_1.LogicOperator.IsNot:
31
+ simpleFilter[element] = (0, typeorm_1.Not)((0, typeorm_1.Equal)(value));
32
+ break;
33
+ case types_1.LogicOperator.GreaterThan:
34
+ simpleFilter[element] = (0, typeorm_1.MoreThan)(value);
35
+ break;
36
+ case types_1.LogicOperator.GreaterOrEqualThan:
37
+ simpleFilter[element] = (0, typeorm_1.MoreThanOrEqual)(value);
38
+ break;
39
+ case types_1.LogicOperator.LessThan:
40
+ simpleFilter[element] = (0, typeorm_1.LessThan)(value);
41
+ break;
42
+ case types_1.LogicOperator.LessOrEqualThan:
43
+ simpleFilter[element] = (0, typeorm_1.LessThanOrEqual)(value);
44
+ break;
45
+ case types_1.LogicOperator.In:
46
+ simpleFilter[element] = (0, typeorm_1.In)(value);
47
+ break;
48
+ case types_1.LogicOperator.NotIn:
49
+ simpleFilter[element] = (0, typeorm_1.Not)((0, typeorm_1.In)(value));
50
+ break;
51
+ case types_1.LogicOperator.Exists:
52
+ simpleFilter[element] = (0, typeorm_1.Not)((0, typeorm_1.IsNull)());
53
+ break;
54
+ case types_1.LogicOperator.NotExists:
55
+ simpleFilter[element] = (0, typeorm_1.IsNull)();
56
+ break;
57
+ case types_1.LogicOperator.Regexp:
58
+ case types_1.LogicOperator.Like:
59
+ simpleFilter[element] = (0, typeorm_1.Like)(value);
60
+ break;
61
+ }
62
+ }
63
+ return js_utils_1.Objects.nest(simpleFilter);
64
+ }
65
+ // Complex query with OR/AND operators
19
66
  const Filters = { where: [{}] };
20
- const orConditions = (0, extractConditions_1.extractConditions)(where['OR']);
21
- const andConditions = (0, extractConditions_1.extractConditions)(where['AND']);
67
+ const orConditions = (0, extractConditions_1.extractConditions)(where.OR);
68
+ const andConditions = (0, extractConditions_1.extractConditions)(where.AND);
22
69
  const copy = js_utils_1.Objects.clone(where);
23
- if (!!copy['AND']) {
24
- delete copy['AND'];
70
+ if (copy.AND) {
71
+ delete copy.AND;
25
72
  }
26
- if (!!copy['OR']) {
27
- delete copy['OR'];
73
+ if (copy.OR) {
74
+ delete copy.OR;
28
75
  }
29
76
  const rootLevelConditions = (0, extractConditions_1.extractConditions)([copy]);
30
77
  for (const condition of andConditions) {
31
78
  const { element, operator, value } = condition;
32
79
  switch (operator) {
33
- case types_1.LogicOperator.equals:
80
+ case types_1.LogicOperator.Equals:
34
81
  Filters.where[0] = js_utils_1.Objects.nest({
35
82
  ...Filters.where[0],
36
83
  ...{ [element]: (0, typeorm_1.Equal)(value) }
37
84
  });
38
85
  break;
39
- case types_1.LogicOperator.isNot:
86
+ case types_1.LogicOperator.IsNot:
40
87
  Filters.where[0] = js_utils_1.Objects.nest({
41
88
  ...Filters.where[0],
42
89
  ...{ [element]: (0, typeorm_1.Not)((0, typeorm_1.Equal)(value)) }
43
90
  });
44
91
  break;
45
- case types_1.LogicOperator.greaterThan:
92
+ case types_1.LogicOperator.GreaterThan:
46
93
  Filters.where[0] = js_utils_1.Objects.nest({
47
94
  ...Filters.where[0],
48
95
  ...{ [element]: (0, typeorm_1.MoreThan)(value) }
49
96
  });
50
97
  break;
51
- case types_1.LogicOperator.greaterOrEqualThan:
98
+ case types_1.LogicOperator.GreaterOrEqualThan:
52
99
  Filters.where[0] = js_utils_1.Objects.nest({
53
100
  ...Filters.where[0],
54
101
  ...{ [element]: (0, typeorm_1.MoreThanOrEqual)(value) }
55
102
  });
56
103
  break;
57
- case types_1.LogicOperator.lessThan:
104
+ case types_1.LogicOperator.LessThan:
58
105
  Filters.where[0] = js_utils_1.Objects.nest({
59
106
  ...Filters.where[0],
60
107
  ...{ [element]: (0, typeorm_1.LessThan)(value) }
61
108
  });
62
109
  break;
63
- case types_1.LogicOperator.lessOrEqualThan:
110
+ case types_1.LogicOperator.LessOrEqualThan:
64
111
  Filters.where[0] = js_utils_1.Objects.nest({
65
112
  ...Filters.where[0],
66
113
  ...{ [element]: (0, typeorm_1.LessThanOrEqual)(value) }
67
114
  });
68
115
  break;
69
- case types_1.LogicOperator.in:
116
+ case types_1.LogicOperator.In:
70
117
  Filters.where[0] = js_utils_1.Objects.nest({
71
118
  ...Filters.where[0],
72
119
  ...{ [element]: (0, typeorm_1.In)(value) }
73
120
  });
74
121
  break;
75
- case types_1.LogicOperator.notIn:
122
+ case types_1.LogicOperator.NotIn:
76
123
  Filters.where[0] = js_utils_1.Objects.nest({
77
124
  ...Filters.where[0],
78
125
  ...{ [element]: (0, typeorm_1.Not)((0, typeorm_1.In)(value)) }
79
126
  });
80
127
  break;
81
- case types_1.LogicOperator.exists:
128
+ case types_1.LogicOperator.Exists:
82
129
  Filters.where[0] = js_utils_1.Objects.nest({
83
130
  ...Filters.where[0],
84
131
  ...{ [element]: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) }
85
132
  });
86
133
  break;
87
- case types_1.LogicOperator.notExists:
134
+ case types_1.LogicOperator.NotExists:
88
135
  Filters.where[0] = js_utils_1.Objects.nest({
89
136
  ...Filters.where[0],
90
137
  ...{ [element]: (0, typeorm_1.IsNull)() }
91
138
  });
92
139
  break;
93
- case types_1.LogicOperator.regexp:
140
+ case types_1.LogicOperator.Regexp:
141
+ case types_1.LogicOperator.Like:
94
142
  Filters.where[0] = js_utils_1.Objects.nest({
95
143
  ...Filters.where[0],
96
144
  ...{ [element]: (0, typeorm_1.Like)(value) }
@@ -101,67 +149,68 @@ const getTypeOrmWhere = ({ where }) => {
101
149
  for (const condition of rootLevelConditions) {
102
150
  const { element, operator, value } = condition;
103
151
  switch (operator) {
104
- case types_1.LogicOperator.equals:
152
+ case types_1.LogicOperator.Equals:
105
153
  Filters.where[0] = js_utils_1.Objects.nest({
106
154
  ...Filters.where[0],
107
155
  ...{ [element]: (0, typeorm_1.Equal)(value) }
108
156
  });
109
157
  break;
110
- case types_1.LogicOperator.isNot:
158
+ case types_1.LogicOperator.IsNot:
111
159
  Filters.where[0] = js_utils_1.Objects.nest({
112
160
  ...Filters.where[0],
113
161
  ...{ [element]: (0, typeorm_1.Not)((0, typeorm_1.Equal)(value)) }
114
162
  });
115
163
  break;
116
- case types_1.LogicOperator.greaterThan:
164
+ case types_1.LogicOperator.GreaterThan:
117
165
  Filters.where[0] = js_utils_1.Objects.nest({
118
166
  ...Filters.where[0],
119
167
  ...{ [element]: (0, typeorm_1.MoreThan)(value) }
120
168
  });
121
169
  break;
122
- case types_1.LogicOperator.greaterOrEqualThan:
170
+ case types_1.LogicOperator.GreaterOrEqualThan:
123
171
  Filters.where[0] = js_utils_1.Objects.nest({
124
172
  ...Filters.where[0],
125
173
  ...{ [element]: (0, typeorm_1.MoreThanOrEqual)(value) }
126
174
  });
127
175
  break;
128
- case types_1.LogicOperator.lessThan:
176
+ case types_1.LogicOperator.LessThan:
129
177
  Filters.where[0] = js_utils_1.Objects.nest({
130
178
  ...Filters.where[0],
131
179
  ...{ [element]: (0, typeorm_1.LessThan)(value) }
132
180
  });
133
181
  break;
134
- case types_1.LogicOperator.lessOrEqualThan:
182
+ case types_1.LogicOperator.LessOrEqualThan:
135
183
  Filters.where[0] = js_utils_1.Objects.nest({
136
184
  ...Filters.where[0],
137
185
  ...{ [element]: (0, typeorm_1.LessThanOrEqual)(value) }
138
186
  });
139
187
  break;
140
- case types_1.LogicOperator.in:
188
+ case types_1.LogicOperator.In:
141
189
  Filters.where[0] = js_utils_1.Objects.nest({
142
190
  ...Filters.where[0],
143
191
  ...{ [element]: (0, typeorm_1.In)(value) }
144
192
  });
145
193
  break;
146
- case types_1.LogicOperator.notIn:
194
+ case types_1.LogicOperator.NotIn:
147
195
  Filters.where[0] = js_utils_1.Objects.nest({
148
196
  ...Filters.where[0],
149
197
  ...{ [element]: (0, typeorm_1.Not)((0, typeorm_1.In)(value)) }
150
198
  });
151
199
  break;
152
- case types_1.LogicOperator.exists:
200
+ case types_1.LogicOperator.Exists:
153
201
  Filters.where[0] = js_utils_1.Objects.nest({
154
202
  ...Filters.where[0],
155
203
  ...{ [element]: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) }
156
204
  });
157
205
  break;
158
- case types_1.LogicOperator.notExists:
206
+ case types_1.LogicOperator.NotExists:
159
207
  Filters.where[0] = js_utils_1.Objects.nest({
160
208
  ...Filters.where[0],
161
209
  ...{ [element]: (0, typeorm_1.IsNull)() }
162
210
  });
163
211
  break;
164
- case types_1.LogicOperator.regexp:
212
+ case types_1.LogicOperator.Regexp:
213
+ case types_1.LogicOperator.Like:
165
214
  Filters.where[0] = js_utils_1.Objects.nest({
166
215
  ...Filters.where[0],
167
216
  ...{ [element]: (0, typeorm_1.Like)(value) }
@@ -172,42 +221,48 @@ const getTypeOrmWhere = ({ where }) => {
172
221
  for (const condition of orConditions) {
173
222
  const { element, operator, value } = condition;
174
223
  switch (operator) {
175
- case types_1.LogicOperator.equals:
224
+ case types_1.LogicOperator.Equals:
176
225
  Filters.where.push({ [element]: (0, typeorm_1.Equal)(value) });
177
226
  break;
178
- case types_1.LogicOperator.isNot:
227
+ case types_1.LogicOperator.IsNot:
179
228
  Filters.where.push({ [element]: (0, typeorm_1.Not)((0, typeorm_1.Equal)(value)) });
180
229
  break;
181
- case types_1.LogicOperator.greaterThan:
230
+ case types_1.LogicOperator.GreaterThan:
182
231
  Filters.where.push({ [element]: (0, typeorm_1.MoreThan)(value) });
183
232
  break;
184
- case types_1.LogicOperator.greaterOrEqualThan:
233
+ case types_1.LogicOperator.GreaterOrEqualThan:
185
234
  Filters.where.push({ [element]: (0, typeorm_1.MoreThanOrEqual)(value) });
186
235
  break;
187
- case types_1.LogicOperator.lessThan:
236
+ case types_1.LogicOperator.LessThan:
188
237
  Filters.where.push({ [element]: (0, typeorm_1.LessThan)(value) });
189
238
  break;
190
- case types_1.LogicOperator.lessOrEqualThan:
239
+ case types_1.LogicOperator.LessOrEqualThan:
191
240
  Filters.where.push({ [element]: (0, typeorm_1.LessThanOrEqual)(value) });
192
241
  break;
193
- case types_1.LogicOperator.in:
242
+ case types_1.LogicOperator.In:
194
243
  Filters.where.push({ [element]: (0, typeorm_1.In)(value) });
195
244
  break;
196
- case types_1.LogicOperator.notIn:
245
+ case types_1.LogicOperator.NotIn:
197
246
  Filters.where.push({ [element]: (0, typeorm_1.Not)((0, typeorm_1.In)(value)) });
198
247
  break;
199
- case types_1.LogicOperator.exists:
248
+ case types_1.LogicOperator.Exists:
200
249
  Filters.where.push({ [element]: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) });
201
250
  break;
202
- case types_1.LogicOperator.notExists:
251
+ case types_1.LogicOperator.NotExists:
203
252
  Filters.where.push({ [element]: (0, typeorm_1.IsNull)() });
204
253
  break;
205
- case types_1.LogicOperator.regexp:
254
+ case types_1.LogicOperator.Regexp:
255
+ case types_1.LogicOperator.Like:
206
256
  Filters.where.push({ [element]: (0, typeorm_1.Like)(value) });
207
257
  break;
208
258
  }
209
259
  }
210
260
  const filtered = (0, clearEmpties_1.clearEmpties)(Filters.where);
261
+ // If there's only one element in the array and no OR conditions were added,
262
+ // return the object directly instead of an array
263
+ if (filtered.length === 1 && orConditions.length === 0) {
264
+ return filtered[0];
265
+ }
211
266
  return filtered;
212
267
  };
213
268
  exports.getTypeOrmWhere = getTypeOrmWhere;
@@ -1 +1 @@
1
- {"version":3,"file":"getTypeOrmWhere.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/sql/getTypeOrmWhere.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getTypeOrmWhere.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/queryBuilder/sql/getTypeOrmWhere.ts"],"names":[],"mappings":"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"}
@@ -79,7 +79,11 @@ exports.NestedSchema = zod_1.z.object({
79
79
  });
80
80
  exports.TypeORMDataModelSchema = zod_1.z.object({
81
81
  id: zod_1.z.string().optional(),
82
- created: zod_1.z.union([zod_1.z.date(), zod_1.z.string()]).nullable().optional().transform((val) => {
82
+ created: zod_1.z
83
+ .union([zod_1.z.date(), zod_1.z.string()])
84
+ .nullable()
85
+ .optional()
86
+ .transform(val => {
83
87
  if (val === null || val === undefined) {
84
88
  return val;
85
89
  }
@@ -1 +1 @@
1
- {"version":3,"file":"typeOrm.entity.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/test/advanced/typeOrm.entity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typeOrm.entity.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/test/advanced/typeOrm.entity.ts"],"names":[],"mappings":"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"}
@@ -2,8 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.GoatSchema = exports.GoatEntity = void 0;
4
4
  const tslib_1 = require("tslib");
5
- const decorators_1 = require("../../../decorators");
6
5
  const zod_1 = require("zod");
6
+ const decorators_1 = require("../../../decorators");
7
7
  // tslint:disable-next-line: max-classes-per-file
8
8
  let GoatEntity = class GoatEntity {
9
9
  id;
@@ -68,15 +68,23 @@ exports.GoatSchema = zod_1.z.object({
68
68
  type: zod_1.z.string().optional(),
69
69
  active: zod_1.z.boolean().optional(),
70
70
  weight: zod_1.z.number().optional(),
71
- balance: zod_1.z.object({
71
+ balance: zod_1.z
72
+ .object({
72
73
  id: zod_1.z.number(),
73
74
  value: zod_1.z.number()
74
- }).optional(),
75
- breed: zod_1.z.object({
75
+ })
76
+ .optional(),
77
+ breed: zod_1.z
78
+ .object({
76
79
  type: zod_1.z.string(),
77
80
  family: zod_1.z.string()
78
- }).optional(),
79
- created: zod_1.z.union([zod_1.z.date(), zod_1.z.string()]).nullable().optional().transform((val) => {
81
+ })
82
+ .optional(),
83
+ created: zod_1.z
84
+ .union([zod_1.z.date(), zod_1.z.string()])
85
+ .nullable()
86
+ .optional()
87
+ .transform(val => {
80
88
  if (val === null || val === undefined) {
81
89
  return val;
82
90
  }
@@ -85,7 +93,11 @@ exports.GoatSchema = zod_1.z.object({
85
93
  }
86
94
  return val;
87
95
  }),
88
- updated: zod_1.z.union([zod_1.z.date(), zod_1.z.string()]).nullable().optional().transform((val) => {
96
+ updated: zod_1.z
97
+ .union([zod_1.z.date(), zod_1.z.string()])
98
+ .nullable()
99
+ .optional()
100
+ .transform(val => {
89
101
  if (val === null || val === undefined) {
90
102
  return val;
91
103
  }
@@ -1 +1 @@
1
- {"version":3,"file":"goat.entity.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/test/basic/goat.entity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"goat.entity.js","sourceRoot":"","sources":["../../../../src/TypeOrmConnector/test/basic/goat.entity.ts"],"names":[],"mappings":"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"}
@@ -8,43 +8,63 @@ const bson_1 = require("bson");
8
8
  * @param object
9
9
  * @returns
10
10
  */
11
- const clearEmpties = object => {
12
- const isArr = Array.isArray(object);
13
- const keys = isArr ? object.length : Object.keys(object).length;
14
- if (!keys)
15
- return object;
16
- if (isArr) {
17
- // Process arrays backwards to handle splicing correctly
18
- for (let i = object.length - 1; i >= 0; i--) {
19
- const v = object[i];
20
- if (v && typeof v === 'object' && !(v instanceof Date) && !(v instanceof bson_1.ObjectId)) {
21
- (0, exports.clearEmpties)(v);
22
- if (!Object.keys(v).length) {
23
- object.splice(i, 1);
24
- }
25
- }
26
- else if (v === null || v === undefined || (Array.isArray(v) && v.length === 0)) {
27
- object.splice(i, 1);
11
+ const clearEmpties = (object) => {
12
+ if (Array.isArray(object)) {
13
+ return clearEmptiesFromArray(object);
14
+ }
15
+ if (typeof object === 'object' && object !== null) {
16
+ return clearEmptiesFromObject(object);
17
+ }
18
+ return object;
19
+ };
20
+ exports.clearEmpties = clearEmpties;
21
+ function isEmptyValue(value) {
22
+ return (value === null ||
23
+ value === undefined ||
24
+ (Array.isArray(value) && value.length === 0));
25
+ }
26
+ function isProcessableObject(value) {
27
+ return (value &&
28
+ typeof value === 'object' &&
29
+ !(value instanceof Date) &&
30
+ !(value instanceof bson_1.ObjectId));
31
+ }
32
+ function clearEmptiesFromArray(arr) {
33
+ // Process arrays backwards to handle splicing correctly
34
+ for (let i = arr.length - 1; i >= 0; i--) {
35
+ const value = arr[i];
36
+ if (isProcessableObject(value)) {
37
+ (0, exports.clearEmpties)(value);
38
+ if (Array.isArray(value)
39
+ ? value.length === 0
40
+ : Object.keys(value).length === 0) {
41
+ arr.splice(i, 1);
28
42
  }
29
43
  }
44
+ else if (isEmptyValue(value)) {
45
+ arr.splice(i, 1);
46
+ }
30
47
  }
31
- else {
32
- for (const k in object) {
33
- if (!Object.prototype.hasOwnProperty.call(object, k))
34
- continue;
35
- const v = object[k];
36
- if (v === null || v === undefined || (Array.isArray(v) && v.length === 0)) {
37
- delete object[k];
38
- }
39
- else if (v && typeof v === 'object' && !(v instanceof Date) && !(v instanceof bson_1.ObjectId)) {
40
- (0, exports.clearEmpties)(v);
41
- if (!Object.keys(v).length) {
42
- delete object[k];
43
- }
48
+ return arr;
49
+ }
50
+ function clearEmptiesFromObject(obj) {
51
+ for (const key in obj) {
52
+ if (!Object.hasOwn(obj, key)) {
53
+ continue;
54
+ }
55
+ const value = obj[key];
56
+ if (isEmptyValue(value)) {
57
+ delete obj[key];
58
+ }
59
+ else if (isProcessableObject(value)) {
60
+ (0, exports.clearEmpties)(value);
61
+ if (Array.isArray(value)
62
+ ? value.length === 0
63
+ : Object.keys(value).length === 0) {
64
+ delete obj[key];
44
65
  }
45
66
  }
46
67
  }
47
- return object;
48
- };
49
- exports.clearEmpties = clearEmpties;
68
+ return obj;
69
+ }
50
70
  //# sourceMappingURL=clearEmpties.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"clearEmpties.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/clearEmpties.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAE/B;;;;;GAKG;AACI,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE;IACnC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAA;IAE/D,IAAI,CAAC,IAAI;QAAE,OAAO,MAAM,CAAA;IAExB,IAAI,KAAK,EAAE,CAAC;QACV,wDAAwD;QACxD,KAAK,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5C,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YACnB,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,eAAQ,CAAC,EAAE,CAAC;gBACnF,IAAA,oBAAY,EAAC,CAAC,CAAC,CAAA;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;oBAC3B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;gBACrB,CAAC;YACH,CAAC;iBAAM,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;gBACjF,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YACrB,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBAAE,SAAQ;YAE9D,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;YACnB,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC1E,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;YAClB,CAAC;iBAAM,IAAI,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,eAAQ,CAAC,EAAE,CAAC;gBAC1F,IAAA,oBAAY,EAAC,CAAC,CAAC,CAAA;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;oBAC3B,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;gBAClB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAnCY,QAAA,YAAY,gBAmCxB"}
1
+ {"version":3,"file":"clearEmpties.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/clearEmpties.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAE/B;;;;;GAKG;AACI,MAAM,YAAY,GAAG,CAAC,MAAW,EAAO,EAAE;IAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAA;IACtC,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,sBAAsB,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AATY,QAAA,YAAY,gBASxB;AAED,SAAS,YAAY,CAAC,KAAU;IAC9B,OAAO,CACL,KAAK,KAAK,IAAI;QACd,KAAK,KAAK,SAAS;QACnB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAC7C,CAAA;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAU;IACrC,OAAO,CACL,KAAK;QACL,OAAO,KAAK,KAAK,QAAQ;QACzB,CAAC,CAAC,KAAK,YAAY,IAAI,CAAC;QACxB,CAAC,CAAC,KAAK,YAAY,eAAQ,CAAC,CAC7B,CAAA;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAU;IACvC,wDAAwD;IACxD,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;QAEpB,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAA;YACnB,IACE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAClB,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;gBACpB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EACnC,CAAC;gBACD,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAClB,CAAC;QACH,CAAC;aAAM,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAClB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAwB;IACtD,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;YAC7B,SAAQ;QACV,CAAC;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;QAEtB,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAA;QACjB,CAAC;aAAM,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,IAAA,oBAAY,EAAC,KAAK,CAAC,CAAA;YACnB,IACE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAClB,CAAC,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;gBACpB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EACnC,CAAC;gBACD,OAAO,GAAG,CAAC,GAAG,CAAC,CAAA;YACjB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC"}
@@ -5,8 +5,10 @@ import { FluentQuery, LogicOperator, Primitives, PrimitivesArray } from '../../t
5
5
  * @param conditions
6
6
  * @returns
7
7
  */
8
- export declare const extractConditions: (conditions: FluentQuery<any>["where"][]) => {
8
+ type Condition = {
9
9
  operator: LogicOperator;
10
10
  element: string;
11
11
  value: Primitives | PrimitivesArray;
12
- }[];
12
+ };
13
+ export declare const extractConditions: (conditions: FluentQuery<any>["where"][]) => Condition[];
14
+ export {};