@casekit/orm 0.0.1-alpha.2 → 0.0.1-alpha.21

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 (343) hide show
  1. package/lib/migrate/commands/implode.js +1 -1
  2. package/lib/migrate/commands/implode.js.map +1 -1
  3. package/lib/migrate/sql/createTableSql.test.js +1 -0
  4. package/lib/migrate/sql/createTableSql.test.js.map +1 -1
  5. package/lib/orm.d.ts +2 -2
  6. package/lib/orm.d.ts.map +1 -1
  7. package/lib/orm.js +8 -0
  8. package/lib/orm.js.map +1 -1
  9. package/lib/queries/clauses/IncludeClause.d.ts +3 -3
  10. package/lib/queries/clauses/IncludeClause.d.ts.map +1 -1
  11. package/lib/queries/clauses/ReturningClause.d.ts +2 -3
  12. package/lib/queries/clauses/ReturningClause.d.ts.map +1 -1
  13. package/lib/queries/clauses/SelectClause.d.ts +2 -3
  14. package/lib/queries/clauses/SelectClause.d.ts.map +1 -1
  15. package/lib/queries/clauses/WhereClause.d.ts +1 -1
  16. package/lib/queries/clauses/WhereClause.d.ts.map +1 -1
  17. package/lib/queries/clauses/helpers/OptionalColumn.d.ts +5 -5
  18. package/lib/queries/clauses/helpers/OptionalColumn.d.ts.map +1 -1
  19. package/lib/queries/clauses/helpers/OptionalParams.d.ts +2 -2
  20. package/lib/queries/clauses/helpers/OptionalParams.d.ts.map +1 -1
  21. package/lib/queries/clauses/helpers/RequiredColumn.d.ts +2 -3
  22. package/lib/queries/clauses/helpers/RequiredColumn.d.ts.map +1 -1
  23. package/lib/queries/clauses/helpers/RequiredParams.d.ts +2 -2
  24. package/lib/queries/clauses/helpers/RequiredParams.d.ts.map +1 -1
  25. package/lib/queries/clauses/where/buildWhereClause.js +1 -1
  26. package/lib/queries/clauses/where/buildWhereClause.js.map +1 -1
  27. package/lib/queries/clauses/where/buildWhereClauses.d.ts +1 -1
  28. package/lib/queries/clauses/where/buildWhereClauses.d.ts.map +1 -1
  29. package/lib/queries/clauses/where/buildWhereClauses.js.map +1 -1
  30. package/lib/queries/clauses/where/buildWhereClauses.test.js +1 -1
  31. package/lib/queries/clauses/where/buildWhereClauses.test.js.map +1 -1
  32. package/lib/queries/clauses/where/types/WhereClauseValue.d.ts +1 -1
  33. package/lib/queries/clauses/where/types/WhereClauseValue.d.ts.map +1 -1
  34. package/lib/queries/count/buildCount.d.ts.map +1 -1
  35. package/lib/queries/count/buildCount.js +33 -29
  36. package/lib/queries/count/buildCount.js.map +1 -1
  37. package/lib/queries/count/countToSql.d.ts.map +1 -1
  38. package/lib/queries/count/countToSql.js +12 -17
  39. package/lib/queries/count/countToSql.js.map +1 -1
  40. package/lib/queries/count/types/CountBuilder.d.ts +12 -4
  41. package/lib/queries/count/types/CountBuilder.d.ts.map +1 -1
  42. package/lib/queries/count.d.ts.map +1 -1
  43. package/lib/queries/count.js +3 -1
  44. package/lib/queries/count.js.map +1 -1
  45. package/lib/queries/create/buildCreate.d.ts +4 -1
  46. package/lib/queries/create/buildCreate.d.ts.map +1 -1
  47. package/lib/queries/create/buildCreate.js +5 -2
  48. package/lib/queries/create/buildCreate.js.map +1 -1
  49. package/lib/queries/create/createResultSchema.d.ts.map +1 -1
  50. package/lib/queries/create/createResultSchema.js +3 -1
  51. package/lib/queries/create/createResultSchema.js.map +1 -1
  52. package/lib/queries/create/createToSql.d.ts.map +1 -1
  53. package/lib/queries/create/createToSql.js +5 -2
  54. package/lib/queries/create/createToSql.js.map +1 -1
  55. package/lib/queries/create/tests/createMany.varied-keys.test.d.ts +2 -0
  56. package/lib/queries/create/tests/createMany.varied-keys.test.d.ts.map +1 -0
  57. package/lib/queries/create/tests/createMany.varied-keys.test.js +24 -0
  58. package/lib/queries/create/tests/createMany.varied-keys.test.js.map +1 -0
  59. package/lib/queries/create/tests/createOne.test.js +53 -0
  60. package/lib/queries/create/tests/createOne.test.js.map +1 -1
  61. package/lib/queries/create/types/BaseCreateManyParams.d.ts +3 -0
  62. package/lib/queries/create/types/BaseCreateManyParams.d.ts.map +1 -1
  63. package/lib/queries/create/types/BaseCreateOneParams.d.ts +3 -0
  64. package/lib/queries/create/types/BaseCreateOneParams.d.ts.map +1 -1
  65. package/lib/queries/create/types/CreateManyParams.d.ts +4 -1
  66. package/lib/queries/create/types/CreateManyParams.d.ts.map +1 -1
  67. package/lib/queries/create/types/CreateManyResult.d.ts +1 -1
  68. package/lib/queries/create/types/CreateManyResult.d.ts.map +1 -1
  69. package/lib/queries/create/types/CreateOneParams.d.ts +4 -1
  70. package/lib/queries/create/types/CreateOneParams.d.ts.map +1 -1
  71. package/lib/queries/create/types/CreateOneResult.d.ts +1 -1
  72. package/lib/queries/create/types/CreateOneResult.d.ts.map +1 -1
  73. package/lib/queries/createMany.d.ts.map +1 -1
  74. package/lib/queries/createMany.js +3 -1
  75. package/lib/queries/createMany.js.map +1 -1
  76. package/lib/queries/createOne.d.ts.map +1 -1
  77. package/lib/queries/createOne.js +6 -0
  78. package/lib/queries/createOne.js.map +1 -1
  79. package/lib/queries/delete/buildDelete.d.ts +1 -1
  80. package/lib/queries/delete/buildDelete.d.ts.map +1 -1
  81. package/lib/queries/delete/buildDelete.js +1 -1
  82. package/lib/queries/delete/buildDelete.js.map +1 -1
  83. package/lib/queries/delete/deleteResultSchema.d.ts.map +1 -1
  84. package/lib/queries/delete/deleteResultSchema.js +3 -1
  85. package/lib/queries/delete/deleteResultSchema.js.map +1 -1
  86. package/lib/queries/delete/deleteToSql.js +1 -1
  87. package/lib/queries/delete/deleteToSql.js.map +1 -1
  88. package/lib/queries/delete/types/DeleteManyResult.d.ts +1 -1
  89. package/lib/queries/delete/types/DeleteManyResult.d.ts.map +1 -1
  90. package/lib/queries/delete/types/DeleteOneResult.d.ts +1 -1
  91. package/lib/queries/delete/types/DeleteOneResult.d.ts.map +1 -1
  92. package/lib/queries/delete/types/DeleteParams.d.ts +1 -1
  93. package/lib/queries/delete/types/DeleteParams.d.ts.map +1 -1
  94. package/lib/queries/deleteMany.d.ts.map +1 -1
  95. package/lib/queries/deleteMany.js +3 -1
  96. package/lib/queries/deleteMany.js.map +1 -1
  97. package/lib/queries/find/buildFind.d.ts.map +1 -1
  98. package/lib/queries/find/buildFind.js +39 -31
  99. package/lib/queries/find/buildFind.js.map +1 -1
  100. package/lib/queries/find/findResultSchema.d.ts.map +1 -1
  101. package/lib/queries/find/findResultSchema.js +9 -2
  102. package/lib/queries/find/findResultSchema.js.map +1 -1
  103. package/lib/queries/find/findToSql.d.ts.map +1 -1
  104. package/lib/queries/find/findToSql.js +15 -17
  105. package/lib/queries/find/findToSql.js.map +1 -1
  106. package/lib/queries/find/getIncludedManyToManyRelations.d.ts +17 -0
  107. package/lib/queries/find/getIncludedManyToManyRelations.d.ts.map +1 -0
  108. package/lib/queries/find/getIncludedManyToManyRelations.js +20 -0
  109. package/lib/queries/find/getIncludedManyToManyRelations.js.map +1 -0
  110. package/lib/queries/find/getIncludedOneToManyRelations.d.ts +12 -0
  111. package/lib/queries/find/getIncludedOneToManyRelations.d.ts.map +1 -0
  112. package/lib/queries/find/getIncludedOneToManyRelations.js +20 -0
  113. package/lib/queries/find/getIncludedOneToManyRelations.js.map +1 -0
  114. package/lib/queries/find/tests/findMany.include.test.d.ts +2 -0
  115. package/lib/queries/find/tests/findMany.include.test.d.ts.map +1 -0
  116. package/lib/queries/find/tests/findMany.include.test.js +93 -0
  117. package/lib/queries/find/tests/findMany.include.test.js.map +1 -0
  118. package/lib/queries/find/tests/findMany.lateral.test.d.ts +2 -0
  119. package/lib/queries/find/tests/findMany.lateral.test.d.ts.map +1 -0
  120. package/lib/queries/find/tests/findMany.lateral.test.js +86 -0
  121. package/lib/queries/find/tests/findMany.lateral.test.js.map +1 -0
  122. package/lib/queries/find/tests/findMany.nullable-relations.test.d.ts +2 -0
  123. package/lib/queries/find/tests/findMany.nullable-relations.test.d.ts.map +1 -0
  124. package/lib/queries/find/tests/findMany.nullable-relations.test.js +118 -0
  125. package/lib/queries/find/tests/findMany.nullable-relations.test.js.map +1 -0
  126. package/lib/queries/find/tests/middleware.find.where.test.js +12 -12
  127. package/lib/queries/find/tests/middleware.find.where.test.js.map +1 -1
  128. package/lib/queries/find/types/BaseFindParams.d.ts +2 -1
  129. package/lib/queries/find/types/BaseFindParams.d.ts.map +1 -1
  130. package/lib/queries/find/types/FindBuilder.d.ts +13 -4
  131. package/lib/queries/find/types/FindBuilder.d.ts.map +1 -1
  132. package/lib/queries/find/types/FindManyParams.d.ts +3 -2
  133. package/lib/queries/find/types/FindManyParams.d.ts.map +1 -1
  134. package/lib/queries/find/types/FindManyResult.d.ts +2 -1
  135. package/lib/queries/find/types/FindManyResult.d.ts.map +1 -1
  136. package/lib/queries/find/types/FindOneParams.d.ts +2 -1
  137. package/lib/queries/find/types/FindOneParams.d.ts.map +1 -1
  138. package/lib/queries/find/types/FindOneResult.d.ts +6 -0
  139. package/lib/queries/find/types/FindOneResult.d.ts.map +1 -1
  140. package/lib/queries/findMany.d.ts.map +1 -1
  141. package/lib/queries/findMany.js +71 -36
  142. package/lib/queries/findMany.js.map +1 -1
  143. package/lib/queries/middleware/Middleware.d.ts +1 -1
  144. package/lib/queries/middleware/Middleware.d.ts.map +1 -1
  145. package/lib/queries/update/buildUpdate.d.ts +2 -2
  146. package/lib/queries/update/buildUpdate.d.ts.map +1 -1
  147. package/lib/queries/update/buildUpdate.js +8 -8
  148. package/lib/queries/update/buildUpdate.js.map +1 -1
  149. package/lib/queries/update/tests/updateOne.test.js +3 -3
  150. package/lib/queries/update/tests/updateOne.test.js.map +1 -1
  151. package/lib/queries/update/types/BaseUpdateParams.d.ts +1 -1
  152. package/lib/queries/update/types/BaseUpdateParams.d.ts.map +1 -1
  153. package/lib/queries/update/types/UpdateManyResult.d.ts +1 -1
  154. package/lib/queries/update/types/UpdateManyResult.d.ts.map +1 -1
  155. package/lib/queries/update/types/UpdateOneResult.d.ts +1 -1
  156. package/lib/queries/update/types/UpdateOneResult.d.ts.map +1 -1
  157. package/lib/queries/update/types/UpdateParams.d.ts +2 -2
  158. package/lib/queries/update/types/UpdateParams.d.ts.map +1 -1
  159. package/lib/queries/update/types/UpdateValues.d.ts +1 -1
  160. package/lib/queries/update/types/UpdateValues.d.ts.map +1 -1
  161. package/lib/queries/update/updateResultSchema.d.ts.map +1 -1
  162. package/lib/queries/update/updateResultSchema.js +3 -1
  163. package/lib/queries/update/updateResultSchema.js.map +1 -1
  164. package/lib/queries/update/updateToSql.js +3 -3
  165. package/lib/queries/update/updateToSql.js.map +1 -1
  166. package/lib/queries/updateMany.d.ts.map +1 -1
  167. package/lib/queries/updateMany.js +3 -1
  168. package/lib/queries/updateMany.js.map +1 -1
  169. package/lib/queries/util/rowToObject.d.ts.map +1 -1
  170. package/lib/queries/util/rowToObject.js +1 -1
  171. package/lib/queries/util/rowToObject.js.map +1 -1
  172. package/lib/schema/populate/composeMiddleware.js +1 -1
  173. package/lib/schema/populate/composeMiddleware.js.map +1 -1
  174. package/lib/schema/populate/populateModel.d.ts.map +1 -1
  175. package/lib/schema/populate/populateModel.js +1 -0
  176. package/lib/schema/populate/populateModel.js.map +1 -1
  177. package/lib/schema/types/base/BaseColumn.d.ts +1 -0
  178. package/lib/schema/types/base/BaseColumn.d.ts.map +1 -1
  179. package/lib/schema/types/base/BaseRelation.d.ts +1 -0
  180. package/lib/schema/types/base/BaseRelation.d.ts.map +1 -1
  181. package/lib/schema/types/helpers/ColumnName.d.ts +2 -3
  182. package/lib/schema/types/helpers/ColumnName.d.ts.map +1 -1
  183. package/lib/schema/types/helpers/ColumnType.d.ts +2 -2
  184. package/lib/schema/types/helpers/ColumnType.d.ts.map +1 -1
  185. package/lib/schema/types/helpers/Columns.d.ts +2 -3
  186. package/lib/schema/types/helpers/Columns.d.ts.map +1 -1
  187. package/lib/schema/types/helpers/HasDefault.d.ts +2 -3
  188. package/lib/schema/types/helpers/HasDefault.d.ts.map +1 -1
  189. package/lib/schema/types/helpers/IsNullable.d.ts +2 -3
  190. package/lib/schema/types/helpers/IsNullable.d.ts.map +1 -1
  191. package/lib/schema/types/helpers/IsProvided.d.ts +5 -0
  192. package/lib/schema/types/helpers/IsProvided.d.ts.map +1 -0
  193. package/lib/schema/types/helpers/IsProvided.js +2 -0
  194. package/lib/schema/types/helpers/IsProvided.js.map +1 -0
  195. package/lib/schema/types/helpers/IsSerial.d.ts +2 -3
  196. package/lib/schema/types/helpers/IsSerial.d.ts.map +1 -1
  197. package/lib/schema/types/loose/LooseColumnDefinition.d.ts +5 -0
  198. package/lib/schema/types/loose/LooseColumnDefinition.d.ts.map +1 -1
  199. package/lib/schema/types/loose/LooseRelationDefinition.d.ts +1 -0
  200. package/lib/schema/types/loose/LooseRelationDefinition.d.ts.map +1 -1
  201. package/lib/schema/types/relations/ManyToManyRelation.d.ts +2 -2
  202. package/lib/schema/types/relations/ManyToManyRelation.d.ts.map +1 -1
  203. package/lib/schema/types/relations/ManyToOneRelation.d.ts +1 -1
  204. package/lib/schema/types/relations/ManyToOneRelation.d.ts.map +1 -1
  205. package/lib/schema/types/relations/OneToManyRelation.d.ts +2 -1
  206. package/lib/schema/types/relations/OneToManyRelation.d.ts.map +1 -1
  207. package/lib/schema/types/strict/ColumnDefinition.d.ts +5 -0
  208. package/lib/schema/types/strict/ColumnDefinition.d.ts.map +1 -1
  209. package/lib/test/db/index.d.ts +40 -0
  210. package/lib/test/db/index.d.ts.map +1 -1
  211. package/lib/test/db/models/post.model.d.ts +9 -0
  212. package/lib/test/db/models/post.model.d.ts.map +1 -1
  213. package/lib/test/db/models/post.model.js +6 -0
  214. package/lib/test/db/models/post.model.js.map +1 -1
  215. package/lib/test/db/models/post.relations.d.ts +6 -0
  216. package/lib/test/db/models/post.relations.d.ts.map +1 -1
  217. package/lib/test/db/models/post.relations.js +6 -0
  218. package/lib/test/db/models/post.relations.js.map +1 -1
  219. package/lib/test/db/models/user.model.d.ts +9 -0
  220. package/lib/test/db/models/user.model.d.ts.map +1 -1
  221. package/lib/test/db/models/user.model.js +6 -0
  222. package/lib/test/db/models/user.model.js.map +1 -1
  223. package/lib/test/db/models/user.relations.d.ts +16 -0
  224. package/lib/test/db/models/user.relations.d.ts.map +1 -1
  225. package/lib/test/db/models/user.relations.js +16 -0
  226. package/lib/test/db/models/user.relations.js.map +1 -1
  227. package/lib/test/db/models.d.ts +18 -0
  228. package/lib/test/db/models.d.ts.map +1 -1
  229. package/lib/test/db/relations.d.ts +22 -0
  230. package/lib/test/db/relations.d.ts.map +1 -1
  231. package/lib/test/gen/column.d.ts +1 -0
  232. package/lib/test/gen/column.d.ts.map +1 -1
  233. package/lib/test/seed/index.d.ts +40 -0
  234. package/lib/test/seed/index.d.ts.map +1 -1
  235. package/lib/types/ModelType.d.ts +10 -3
  236. package/lib/types/ModelType.d.ts.map +1 -1
  237. package/package.json +11 -4
  238. package/src/migrate/commands/implode.ts +1 -1
  239. package/src/migrate/sql/createTableSql.test.ts +1 -0
  240. package/src/orm.ts +10 -2
  241. package/src/queries/clauses/IncludeClause.ts +19 -3
  242. package/src/queries/clauses/ReturningClause.ts +4 -6
  243. package/src/queries/clauses/SelectClause.ts +4 -6
  244. package/src/queries/clauses/WhereClause.ts +1 -1
  245. package/src/queries/clauses/helpers/OptionalColumn.ts +10 -11
  246. package/src/queries/clauses/helpers/OptionalParams.ts +2 -2
  247. package/src/queries/clauses/helpers/RequiredColumn.ts +5 -6
  248. package/src/queries/clauses/helpers/RequiredParams.ts +2 -2
  249. package/src/queries/clauses/where/buildWhereClause.ts +1 -1
  250. package/src/queries/clauses/where/buildWhereClauses.test.ts +1 -1
  251. package/src/queries/clauses/where/buildWhereClauses.ts +1 -1
  252. package/src/queries/clauses/where/types/WhereClauseValue.ts +1 -1
  253. package/src/queries/count/buildCount.ts +39 -33
  254. package/src/queries/count/countToSql.ts +27 -32
  255. package/src/queries/count/types/CountBuilder.ts +23 -6
  256. package/src/queries/count.ts +3 -1
  257. package/src/queries/create/buildCreate.ts +8 -3
  258. package/src/queries/create/createResultSchema.ts +3 -1
  259. package/src/queries/create/createToSql.ts +10 -2
  260. package/src/queries/create/tests/createMany.varied-keys.test.ts +28 -0
  261. package/src/queries/create/tests/createOne.test.ts +70 -0
  262. package/src/queries/create/types/BaseCreateManyParams.ts +1 -0
  263. package/src/queries/create/types/BaseCreateOneParams.ts +1 -0
  264. package/src/queries/create/types/CreateManyParams.ts +4 -1
  265. package/src/queries/create/types/CreateManyResult.ts +1 -1
  266. package/src/queries/create/types/CreateOneParams.ts +4 -1
  267. package/src/queries/create/types/CreateOneResult.ts +1 -1
  268. package/src/queries/createMany.ts +3 -1
  269. package/src/queries/createOne.ts +9 -0
  270. package/src/queries/delete/buildDelete.ts +2 -2
  271. package/src/queries/delete/deleteResultSchema.ts +3 -1
  272. package/src/queries/delete/deleteToSql.ts +1 -1
  273. package/src/queries/delete/types/DeleteManyResult.ts +1 -1
  274. package/src/queries/delete/types/DeleteOneResult.ts +1 -1
  275. package/src/queries/delete/types/DeleteParams.ts +1 -1
  276. package/src/queries/deleteMany.ts +3 -1
  277. package/src/queries/find/buildFind.ts +46 -35
  278. package/src/queries/find/findResultSchema.ts +9 -2
  279. package/src/queries/find/findToSql.ts +31 -32
  280. package/src/queries/find/getIncludedManyToManyRelations.ts +49 -0
  281. package/src/queries/find/getIncludedOneToManyRelations.ts +44 -0
  282. package/src/queries/find/tests/findMany.include.test.ts +107 -0
  283. package/src/queries/find/tests/findMany.lateral.test.ts +90 -0
  284. package/src/queries/find/tests/findMany.nullable-relations.test.ts +127 -0
  285. package/src/queries/find/tests/middleware.find.where.test.ts +12 -12
  286. package/src/queries/find/types/BaseFindParams.ts +2 -1
  287. package/src/queries/find/types/FindBuilder.ts +25 -6
  288. package/src/queries/find/types/FindManyParams.ts +3 -2
  289. package/src/queries/find/types/FindManyResult.ts +2 -1
  290. package/src/queries/find/types/FindOneParams.ts +2 -1
  291. package/src/queries/find/types/FindOneResult.ts +48 -13
  292. package/src/queries/findMany.ts +127 -67
  293. package/src/queries/middleware/Middleware.ts +1 -1
  294. package/src/queries/update/buildUpdate.ts +10 -10
  295. package/src/queries/update/tests/updateOne.test.ts +3 -3
  296. package/src/queries/update/types/BaseUpdateParams.ts +1 -1
  297. package/src/queries/update/types/UpdateManyResult.ts +1 -1
  298. package/src/queries/update/types/UpdateOneResult.ts +1 -1
  299. package/src/queries/update/types/UpdateParams.ts +2 -2
  300. package/src/queries/update/types/UpdateValues.ts +1 -1
  301. package/src/queries/update/updateResultSchema.ts +3 -1
  302. package/src/queries/update/updateToSql.ts +3 -3
  303. package/src/queries/updateMany.ts +3 -1
  304. package/src/queries/util/rowToObject.ts +5 -1
  305. package/src/schema/populate/composeMiddleware.ts +1 -1
  306. package/src/schema/populate/populateModel.ts +1 -0
  307. package/src/schema/types/base/BaseColumn.ts +1 -0
  308. package/src/schema/types/base/BaseRelation.ts +1 -0
  309. package/src/schema/types/helpers/ColumnName.ts +5 -6
  310. package/src/schema/types/helpers/ColumnType.ts +2 -2
  311. package/src/schema/types/helpers/Columns.ts +2 -6
  312. package/src/schema/types/helpers/HasDefault.ts +5 -7
  313. package/src/schema/types/helpers/IsNullable.ts +4 -6
  314. package/src/schema/types/helpers/IsProvided.ts +8 -0
  315. package/src/schema/types/helpers/IsSerial.ts +4 -6
  316. package/src/schema/types/loose/LooseColumnDefinition.ts +6 -0
  317. package/src/schema/types/loose/LooseRelationDefinition.ts +1 -1
  318. package/src/schema/types/relations/ManyToManyRelation.ts +2 -2
  319. package/src/schema/types/relations/ManyToOneRelation.ts +1 -1
  320. package/src/schema/types/relations/OneToManyRelation.ts +2 -1
  321. package/src/schema/types/strict/ColumnDefinition.ts +6 -0
  322. package/src/test/db/models/post.model.ts +6 -0
  323. package/src/test/db/models/post.relations.ts +6 -0
  324. package/src/test/db/models/user.model.ts +6 -0
  325. package/src/test/db/models/user.relations.ts +16 -0
  326. package/src/types/ModelType.ts +16 -3
  327. package/.env +0 -2
  328. package/.eslintrc.cjs +0 -69
  329. package/.github/actions/ci-setup/action.yml +0 -19
  330. package/.github/dependabot.yml +0 -12
  331. package/.github/workflows/ci.yml +0 -119
  332. package/.github/workflows/dependabot.yml +0 -26
  333. package/.github/workflows/semgrep.yml +0 -24
  334. package/.prettierrc.cjs +0 -11
  335. package/.vscode/tasks.json +0 -28
  336. package/codecov.yml +0 -7
  337. package/lib/queries/clauses/helpers/ModelValues.d.ts +0 -8
  338. package/lib/queries/clauses/helpers/ModelValues.d.ts.map +0 -1
  339. package/lib/queries/clauses/helpers/ModelValues.js +0 -2
  340. package/lib/queries/clauses/helpers/ModelValues.js.map +0 -1
  341. package/src/queries/clauses/helpers/ModelValues.ts +0 -9
  342. package/tsconfig.json +0 -18
  343. package/vitest.config.ts +0 -15
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=findMany.nullable-relations.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"findMany.nullable-relations.test.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.nullable-relations.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,118 @@
1
+ import { describe, expect, test } from "vitest";
2
+ import { db } from "../../../test/db";
3
+ import { seed } from "../../../test/seed";
4
+ describe("findMany", () => {
5
+ test("optional N:1 relations don't prevent records being returned", async () => {
6
+ await db.transact(async (db) => {
7
+ await seed(db, {
8
+ users: [
9
+ {
10
+ username: "Russell",
11
+ tenants: [
12
+ { name: "WFMA", posts: 1 },
13
+ { name: "Popova Park", posts: 0 },
14
+ ],
15
+ },
16
+ {
17
+ username: "Dan",
18
+ tenants: [{ name: "WFMA", posts: 2 }],
19
+ },
20
+ {
21
+ username: "Fairooz",
22
+ tenants: [{ name: "WFMA", posts: 0 }],
23
+ },
24
+ ],
25
+ });
26
+ const results = await db.findMany("post", {
27
+ select: ["id", "title"],
28
+ include: {
29
+ reviewedBy: {
30
+ select: ["id", "username"],
31
+ include: {
32
+ posts: { select: ["id", "title"] },
33
+ invitedBy: { select: ["id", "username"] },
34
+ },
35
+ },
36
+ },
37
+ orderBy: ["title"],
38
+ limit: 2,
39
+ });
40
+ expect(results.map((p) => [p.title, p.reviewedBy])).toEqual([
41
+ ["Post a", null],
42
+ ["Post b", null],
43
+ ]);
44
+ }, { rollback: true });
45
+ });
46
+ test("optional N:1 relations are returned if they exist", async () => {
47
+ await db.transact(async (db) => {
48
+ const { users } = await seed(db, {
49
+ users: [
50
+ {
51
+ username: "Russell",
52
+ tenants: [
53
+ { name: "WFMA", posts: 1 },
54
+ { name: "Popova Park", posts: 0 },
55
+ ],
56
+ },
57
+ {
58
+ username: "Dan",
59
+ tenants: [{ name: "WFMA", posts: 2 }],
60
+ },
61
+ {
62
+ username: "Fairooz",
63
+ tenants: [{ name: "WFMA", posts: 0 }],
64
+ },
65
+ ],
66
+ });
67
+ await db.updateOne("user", {
68
+ where: { id: users["Dan"].id },
69
+ set: {
70
+ invitedById: users["Russell"].id,
71
+ },
72
+ });
73
+ const results = await db.findMany("user", {
74
+ select: ["username"],
75
+ include: {
76
+ invitedBy: {
77
+ select: ["username"],
78
+ },
79
+ tenants: {
80
+ select: ["name"],
81
+ orderBy: ["name"],
82
+ },
83
+ reviewedPosts: {
84
+ select: ["title"],
85
+ },
86
+ invitedUsers: {
87
+ select: ["username"],
88
+ },
89
+ },
90
+ orderBy: ["username"],
91
+ });
92
+ expect(results).toEqual([
93
+ {
94
+ username: "Dan",
95
+ invitedBy: { username: "Russell" },
96
+ tenants: [{ name: "WFMA" }],
97
+ reviewedPosts: [],
98
+ invitedUsers: [],
99
+ },
100
+ {
101
+ username: "Fairooz",
102
+ invitedBy: null,
103
+ tenants: [{ name: "WFMA" }],
104
+ reviewedPosts: [],
105
+ invitedUsers: [],
106
+ },
107
+ {
108
+ username: "Russell",
109
+ invitedBy: null,
110
+ tenants: [{ name: "Popova Park" }, { name: "WFMA" }],
111
+ reviewedPosts: [],
112
+ invitedUsers: [{ username: "Dan" }],
113
+ },
114
+ ]);
115
+ }, { rollback: true });
116
+ });
117
+ });
118
+ //# sourceMappingURL=findMany.nullable-relations.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"findMany.nullable-relations.test.js","sourceRoot":"","sources":["../../../../src/queries/find/tests/findMany.nullable-relations.test.ts"],"names":[],"mappings":"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"}
@@ -18,15 +18,15 @@ export const timestamps = {
18
18
  },
19
19
  },
20
20
  update: {
21
- values: (values, { model, config }) => {
21
+ set: (set, { model, config }) => {
22
22
  if ("updatedAt" in config.models[model].columns) {
23
23
  return {
24
24
  updatedAt: new Date(),
25
- ...values,
25
+ ...set,
26
26
  };
27
27
  }
28
28
  else {
29
- return values;
29
+ return set;
30
30
  }
31
31
  },
32
32
  },
@@ -48,7 +48,7 @@ export const softdelete = {
48
48
  if ("deletedAt" in config.models[model].columns) {
49
49
  return updateOne({
50
50
  ...params,
51
- values: {
51
+ set: {
52
52
  deletedAt: new Date(),
53
53
  },
54
54
  });
@@ -60,7 +60,7 @@ export const softdelete = {
60
60
  if ("deletedAt" in config.models[model].columns) {
61
61
  return updateMany({
62
62
  ...params,
63
- values: {
63
+ set: {
64
64
  deletedAt: new Date(),
65
65
  },
66
66
  });
@@ -103,7 +103,7 @@ describe("middleware.find.where", () => {
103
103
  orderBy: ["title"],
104
104
  })).toEqual([{ title: "Post a" }, { title: "Post b" }]);
105
105
  await db.updateMany("post", {
106
- values: { deletedAt: new Date() },
106
+ set: { deletedAt: new Date() },
107
107
  where: { authorId: lynne.id },
108
108
  });
109
109
  expect(await db.findMany("post", {
@@ -139,7 +139,7 @@ describe("middleware.find.where", () => {
139
139
  orderBy: ["title"],
140
140
  })).toEqual([{ title: "Post a" }, { title: "Post b" }]);
141
141
  await db.updateOne("user", {
142
- values: { deletedAt: new Date() },
142
+ set: { deletedAt: new Date() },
143
143
  where: { id: lynne.id },
144
144
  });
145
145
  expect(await db.findMany("post", {
@@ -175,7 +175,7 @@ describe("middleware.find.where", () => {
175
175
  orderBy: ["title"],
176
176
  })).toEqual([{ title: "Post a" }, { title: "Post b" }]);
177
177
  await db.updateOne("post", {
178
- values: { deletedAt: new Date() },
178
+ set: { deletedAt: new Date() },
179
179
  where: { title: "Post a" },
180
180
  });
181
181
  expect(await db.findOne("user", {
@@ -218,7 +218,7 @@ describe("middleware.find.where", () => {
218
218
  },
219
219
  ]);
220
220
  await db.updateOne("user", {
221
- values: { deletedAt: new Date() },
221
+ set: { deletedAt: new Date() },
222
222
  where: { username: "Lynne Tillman" },
223
223
  });
224
224
  expect(await db.findOne("tenant", {
@@ -257,7 +257,7 @@ describe("middleware.find.where", () => {
257
257
  orderBy: ["title"],
258
258
  })).toEqual([{ title: "Post a" }, { title: "Post b" }]);
259
259
  await db.updateMany("post", {
260
- values: { deletedAt: new Date() },
260
+ set: { deletedAt: new Date() },
261
261
  where: { authorId: lynne.id },
262
262
  });
263
263
  expect(await db.findMany("post", { select: ["title"] })).toEqual([]);
@@ -293,11 +293,11 @@ describe("middleware.find.where", () => {
293
293
  { title: "Post b", updatedAt: null },
294
294
  ]);
295
295
  await db.updateMany("post", {
296
- values: { title: "Post AAAAAA" },
296
+ set: { title: "Post AAAAAA" },
297
297
  where: { authorId: lynne.id, title: "Post a" },
298
298
  });
299
299
  await db.updateMany("post", {
300
- values: { deletedAt: new Date() },
300
+ set: { deletedAt: new Date() },
301
301
  where: { authorId: lynne.id, title: "Post b" },
302
302
  });
303
303
  // updatedAt field has been set by the timestamps middleware
@@ -1 +1 @@
1
- {"version":3,"file":"middleware.find.where.test.js","sourceRoot":"","sources":["../../../../src/queries/find/tests/middleware.find.where.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"middleware.find.where.test.js","sourceRoot":"","sources":["../../../../src/queries/find/tests/middleware.find.where.test.ts"],"names":[],"mappings":"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"}
@@ -4,11 +4,12 @@ import { LateralByClause } from "../../clauses/LateralByClause";
4
4
  import { WhereClause } from "../../clauses/WhereClause";
5
5
  export type BaseFindParams = {
6
6
  select: string[];
7
- include?: Partial<Record<string, BaseFindParams>>;
7
+ include?: Partial<Record<string, Omit<BaseFindParams, "for">>>;
8
8
  where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
9
9
  limit?: number;
10
10
  offset?: number;
11
11
  lateralBy?: LateralByClause;
12
+ for?: "update" | "no key update" | "share" | "key share";
12
13
  orderBy?: (string | [string, "asc" | "desc"])[];
13
14
  };
14
15
  //# sourceMappingURL=BaseFindParams.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"BaseFindParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/BaseFindParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAClD,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC;CACnD,CAAC"}
1
+ {"version":3,"file":"BaseFindParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/BaseFindParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IACzB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/D,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;IACF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,GAAG,CAAC,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,GAAG,WAAW,CAAC;IACzD,OAAO,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC;CACnD,CAAC"}
@@ -9,15 +9,15 @@ export type FindBuilder = {
9
9
  alias: string;
10
10
  path: string[];
11
11
  }[];
12
- tables: {
13
- name: string;
12
+ table: {
13
+ table: string;
14
14
  model: string;
15
15
  schema: string;
16
16
  alias: string;
17
- joins?: Join[];
17
+ joins: Join[];
18
18
  conditions?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
19
19
  where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
20
- }[];
20
+ };
21
21
  lateralBy?: {
22
22
  groupTable: string;
23
23
  itemTable: string;
@@ -27,6 +27,7 @@ export type FindBuilder = {
27
27
  values: unknown[];
28
28
  }[];
29
29
  };
30
+ for?: "update" | "no key update" | "share" | "key share";
30
31
  orderBy: {
31
32
  table: string;
32
33
  column: string;
@@ -37,12 +38,20 @@ export type FindBuilder = {
37
38
  };
38
39
  export type Join = {
39
40
  from: {
41
+ schema: string;
40
42
  table: string;
43
+ alias: string;
44
+ model: string;
41
45
  columns: string[];
42
46
  };
43
47
  to: {
48
+ schema: string;
44
49
  table: string;
50
+ alias: string;
51
+ model: string;
45
52
  columns: string[];
46
53
  };
54
+ where?: WhereClause<LooseModelDefinitions, ModelName<LooseModelDefinitions>>;
55
+ type?: "inner" | "left";
47
56
  };
48
57
  //# sourceMappingURL=FindBuilder.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FindBuilder.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,EAAE,CAAC;KAClB,EAAE,CAAC;IAEJ,MAAM,EAAE;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;QACf,UAAU,CAAC,EAAE,WAAW,CACpB,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;QACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;KACL,EAAE,CAAC;IAEJ,SAAS,CAAC,EAAE;QACR,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE;YACL,MAAM,EAAE,MAAM,CAAC;YACf,IAAI,EAAE,MAAM,CAAC;YACb,MAAM,EAAE,OAAO,EAAE,CAAC;SACrB,EAAE,CAAC;KACP,CAAC;IAEF,OAAO,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;KAC7B,EAAE,CAAC;IAEJ,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,IAAI,GAAG;IACf,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IAC3C,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC5C,CAAC"}
1
+ {"version":3,"file":"FindBuilder.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,IAAI,EAAE,MAAM,EAAE,CAAC;KAClB,EAAE,CAAC;IAEJ,KAAK,EAAE;QACH,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,IAAI,EAAE,CAAC;QACd,UAAU,CAAC,EAAE,WAAW,CACpB,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;QACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;KACL,CAAC;IAEF,SAAS,CAAC,EAAE;QACR,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE;YACL,MAAM,EAAE,MAAM,CAAC;YACf,IAAI,EAAE,MAAM,CAAC;YACb,MAAM,EAAE,OAAO,EAAE,CAAC;SACrB,EAAE,CAAC;KACP,CAAC;IAEF,GAAG,CAAC,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,GAAG,WAAW,CAAC;IAEzD,OAAO,EAAE;QACL,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;KAC7B,EAAE,CAAC;IAEJ,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AACF,MAAM,MAAM,IAAI,GAAG;IACf,IAAI,EAAE;QACF,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,EAAE,EAAE;QACA,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,KAAK,CAAC,EAAE,WAAW,CACf,qBAAqB,EACrB,SAAS,CAAC,qBAAqB,CAAC,CACnC,CAAC;IACF,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAC3B,CAAC"}
@@ -7,11 +7,12 @@ import { IncludeClause } from "../../clauses/IncludeClause";
7
7
  import { SelectClause } from "../../clauses/SelectClause";
8
8
  import { WhereClause } from "../../clauses/WhereClause";
9
9
  export type FindManyParams<Models extends LooseModelDefinitions, Relations extends LooseRelationsDefinitions<Models>, M extends ModelName<Models>> = {
10
- select: SelectClause<Models, M>;
10
+ select: SelectClause<Models[M]>;
11
11
  include?: IncludeClause<Models, Relations, M>;
12
12
  where?: WhereClause<Models, M>;
13
13
  limit?: number;
14
14
  offset?: number;
15
- orderBy?: NonEmptyArray<ColumnName<Models, M> | [ColumnName<Models, M>, "asc" | "desc"]>;
15
+ orderBy?: NonEmptyArray<ColumnName<Models[M]> | [ColumnName<Models[M]>, "asc" | "desc"]>;
16
+ for?: "update" | "no key update" | "share" | "key share";
16
17
  };
17
18
  //# sourceMappingURL=FindManyParams.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FindManyParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindManyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,SAAS,SAAS,yBAAyB,CAAC,MAAM,CAAC,EACnD,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,aAAa,CACnB,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,CAClE,CAAC;CACL,CAAC"}
1
+ {"version":3,"file":"FindManyParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindManyParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,SAAS,SAAS,yBAAyB,CAAC,MAAM,CAAC,EACnD,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC9C,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,aAAa,CACnB,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,CAClE,CAAC;IACF,GAAG,CAAC,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,GAAG,WAAW,CAAC;CAC5D,CAAC"}
@@ -1,7 +1,8 @@
1
1
  import { ModelName } from "../../../schema/types/helpers/ModelName";
2
2
  import { LooseModelDefinitions } from "../../../schema/types/loose/LooseModelDefinitions";
3
3
  import { LooseRelationsDefinitions } from "../../../schema/types/loose/LooseRelationsDefinitions";
4
+ import { Simplify } from "../../../types/util/Simplify";
4
5
  import { FindManyParams } from "./FindManyParams";
5
6
  import { FindOneResult } from "./FindOneResult";
6
- export type FindManyResult<Models extends LooseModelDefinitions, Relations extends LooseRelationsDefinitions<Models>, M extends ModelName<Models>, Q extends FindManyParams<Models, Relations, M>> = FindOneResult<Models, Relations, M, Q>[];
7
+ export type FindManyResult<Models extends LooseModelDefinitions, Relations extends LooseRelationsDefinitions<Models>, M extends ModelName<Models>, Q extends FindManyParams<Models, Relations, M>> = Simplify<FindOneResult<Models, Relations, M, Q>[]>;
7
8
  //# sourceMappingURL=FindManyResult.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FindManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,SAAS,SAAS,yBAAyB,CAAC,MAAM,CAAC,EACnD,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,IAC9C,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC"}
1
+ {"version":3,"file":"FindManyResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindManyResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,cAAc,CACtB,MAAM,SAAS,qBAAqB,EACpC,SAAS,SAAS,yBAAyB,CAAC,MAAM,CAAC,EACnD,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SAAS,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,IAC9C,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC"}
@@ -5,8 +5,9 @@ import { IncludeClause } from "../../clauses/IncludeClause";
5
5
  import { SelectClause } from "../../clauses/SelectClause";
6
6
  import { WhereClause } from "../../clauses/WhereClause";
7
7
  export type FindOneParams<Models extends LooseModelDefinitions, Relations extends LooseRelationsDefinitions<Models>, M extends ModelName<Models>> = {
8
- select: SelectClause<Models, M>;
8
+ select: SelectClause<Models[M]>;
9
9
  where?: WhereClause<Models, M>;
10
10
  include?: IncludeClause<Models, Relations, M>;
11
+ for?: "update" | "no key update" | "share" | "key share";
11
12
  };
12
13
  //# sourceMappingURL=FindOneParams.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FindOneParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindOneParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,aAAa,CACrB,MAAM,SAAS,qBAAqB,EACpC,SAAS,SAAS,yBAAyB,CAAC,MAAM,CAAC,EACnD,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;CACjD,CAAC"}
1
+ {"version":3,"file":"FindOneParams.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindOneParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,MAAM,MAAM,aAAa,CACrB,MAAM,SAAS,qBAAqB,EACpC,SAAS,SAAS,yBAAyB,CAAC,MAAM,CAAC,EACnD,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,IAC3B;IACA,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/B,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAC9C,GAAG,CAAC,EAAE,QAAQ,GAAG,eAAe,GAAG,OAAO,GAAG,WAAW,CAAC;CAC5D,CAAC"}
@@ -8,11 +8,17 @@ import { IncludedRelationName } from "../../clauses/include/IncludedRelationName
8
8
  import { IncludedRelationQuery } from "../../clauses/include/IncludedRelationQuery";
9
9
  import { FindManyParams } from "./FindManyParams";
10
10
  import { FindOneParams } from "./FindOneParams";
11
+ /**
12
+ * this is a mess and needs refactoring
13
+ */
11
14
  export type FindOneResult<Models extends LooseModelDefinitions, Relations extends LooseRelationsDefinitions<Models>, M extends ModelName<Models>, Q extends FindManyParams<Models, Relations, M> | FindOneParams<Models, Relations, M>> = Readonly<Simplify<{
12
15
  [C in Extract<Q["select"][number], string>]: ColumnType<Models, M, C>;
13
16
  } & (undefined extends Q["include"] ? unknown : {
14
17
  [R in IncludedRelationName<Models, Relations, M, Q>]: Relations[M][R] extends {
15
18
  type: "N:1";
19
+ optional: true;
20
+ } ? FindOneResult<Models, Relations, IncludedRelationModel<Models, Relations, M, R>, IncludedRelationQuery<Models, Relations, M, R, Q>> | undefined : Relations[M][R] extends {
21
+ type: "N:1";
16
22
  } ? FindOneResult<Models, Relations, IncludedRelationModel<Models, Relations, M, R>, IncludedRelationQuery<Models, Relations, M, R, Q>> : FindOneResult<Models, Relations, IncludedRelationModel<Models, Relations, M, R>, IncludedRelationQuery<Models, Relations, M, R, Q>>[];
17
23
  })>>;
18
24
  //# sourceMappingURL=FindOneResult.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FindOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,aAAa,CACrB,MAAM,SAAS,qBAAqB,EACpC,SAAS,SAAS,yBAAyB,CAAC,MAAM,CAAC,EACnD,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SACK,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,GACpC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,IACzC,QAAQ,CACR,QAAQ,CACJ;KACK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,UAAU,CACnD,MAAM,EACN,CAAC,EACD,CAAC,CACJ;CACJ,GAAG,CAAC,SAAS,SAAS,CAAC,CAAC,SAAS,CAAC,GAC7B,OAAO,GACP;KACK,CAAC,IAAI,oBAAoB,CACtB,MAAM,EACN,SAAS,EACT,CAAC,EACD,CAAC,CACJ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,KAAK,CAAA;KAAE,GACrC,aAAa,CACT,MAAM,EACN,SAAS,EACT,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9C,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACpD,GACD,aAAa,CACT,MAAM,EACN,SAAS,EACT,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9C,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACpD,EAAE;CACZ,CAAC,CACX,CACJ,CAAC"}
1
+ {"version":3,"file":"FindOneResult.d.ts","sourceRoot":"","sources":["../../../../src/queries/find/types/FindOneResult.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAC1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,uDAAuD,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;GAEG;AACH,MAAM,MAAM,aAAa,CACrB,MAAM,SAAS,qBAAqB,EACpC,SAAS,SAAS,yBAAyB,CAAC,MAAM,CAAC,EACnD,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAC3B,CAAC,SACK,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,GACpC,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,IACzC,QAAQ,CACR,QAAQ,CACJ;KACK,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,UAAU,CACnD,MAAM,EACN,CAAC,EACD,CAAC,CACJ;CACJ,GAAG,CAAC,SAAS,SAAS,CAAC,CAAC,SAAS,CAAC,GAC7B,OAAO,GACP;KACK,CAAC,IAAI,oBAAoB,CACtB,MAAM,EACN,SAAS,EACT,CAAC,EACD,CAAC,CAEJ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACxB,IAAI,EAAE,KAAK,CAAC;QACZ,QAAQ,EAAE,IAAI,CAAC;KAClB,GAMO,aAAa,CACL,MAAM,EACN,SAAS,EACT,qBAAqB,CACjB,MAAM,EACN,SAAS,EACT,CAAC,EACD,CAAC,CACJ,EACD,qBAAqB,CACjB,MAAM,EACN,SAAS,EACT,CAAC,EACD,CAAC,EACD,CAAC,CACJ,CACJ,GACD,SAAS,GACf,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAClB,IAAI,EAAE,KAAK,CAAC;KACf,GAED,aAAa,CACT,MAAM,EACN,SAAS,EACT,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9C,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACpD,GAED,aAAa,CACT,MAAM,EACN,SAAS,EACT,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9C,qBAAqB,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACpD,EAAE;CACd,CAAC,CACX,CACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,eAAO,MAAM,QAAQ,SACX,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,cAAc,uCA+FxB,CAAC"}
1
+ {"version":3,"file":"findMany.d.ts","sourceRoot":"","sources":["../../src/queries/findMany.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAE5E,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAQ3C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,eAAO,MAAM,QAAQ,SACX,UAAU,UACR,iBAAiB,KACtB,MAAM,SACF,cAAc,uCAiJxB,CAAC"}
@@ -1,10 +1,12 @@
1
- import { groupBy } from "lodash-es";
1
+ import { dropRight, get, groupBy, isEqual, mergeWith, set, uniqWith, } from "lodash-es";
2
2
  import hash from "object-hash";
3
3
  import { OrmError } from "../errors";
4
4
  import { logger } from "../logger";
5
5
  import { ensureArray } from "../util/ensureArray";
6
6
  import { buildFind } from "./find/buildFind";
7
7
  import { findToSql } from "./find/findToSql";
8
+ import { getIncludedManyToManyRelations } from "./find/getIncludedManyToManyRelations";
9
+ import { getIncludedOneToManyRelations } from "./find/getIncludedOneToManyRelations";
8
10
  import { rowToObject } from "./util/rowToObject";
9
11
  export const findMany = async (conn, config, m, query) => {
10
12
  const builder = buildFind(config, m, query);
@@ -14,56 +16,89 @@ export const findMany = async (conn, config, m, query) => {
14
16
  sql: statement.text,
15
17
  values: statement.values,
16
18
  });
17
- if (process.env.NODE_ENV === "test" && !process.env.CI)
19
+ if (process.env.ORM_VERBOSE_LOGGING) {
18
20
  console.log(statement.text);
21
+ console.log(statement.values);
22
+ }
19
23
  const results = await conn
20
24
  .query(statement)
21
25
  .then((result) => result.rows.map(rowToObject(builder.columns)));
22
- for (const [r, subquery] of Object.entries(query.include ?? {})) {
23
- const relation = config.relations[m][r];
24
- if (relation.type === "1:N") {
25
- const relation = config.relations[m][r];
26
- const pk = config.models[m].primaryKey;
27
- const fk = ensureArray(relation.foreignKey);
28
- const lateralBy = fk.map((c, index) => ({
29
- column: c,
30
- values: results.map((result) => result[pk[index]]),
31
- }));
32
- const subqueryResults = await findMany(conn, config, relation.model, { ...subquery, lateralBy });
26
+ const fetchIncludedOneToManyRelations = getIncludedOneToManyRelations(config, m, query).map(({ model, relation, query, path }) => {
27
+ const pk = config.models[model].primaryKey;
28
+ const fk = ensureArray(relation.foreignKey);
29
+ const lateralValues = mergeWith(Object.fromEntries(fk.map((c) => [c, []])), ...uniqWith(results.map((result) => {
30
+ return Object.fromEntries(fk.map((c, index) => [
31
+ c,
32
+ [get(result, [...dropRight(path, 1), pk[index]])],
33
+ ]));
34
+ }), isEqual), (a, b) => a.concat(b));
35
+ const lateralBy = fk.map((c) => ({
36
+ column: c,
37
+ values: lateralValues[c],
38
+ }));
39
+ return findMany(conn, config, relation.model, {
40
+ ...query,
41
+ for: builder.for,
42
+ lateralBy,
43
+ }).then((subqueryResults) => {
33
44
  const lookup = groupBy(subqueryResults, (result) => {
34
45
  return hash(fk.map((c) => result[c]));
35
46
  });
36
47
  for (const result of results) {
37
- const key = hash(pk.map((c) => result[c]));
38
- result[r] = lookup[key] ?? [];
39
- }
40
- }
41
- else if (relation.type === "N:N") {
42
- const joinFrom = Object.entries(config.relations[m]).find(([, rel]) => rel.type === "1:N" && rel.model === relation.through)?.[0];
43
- const joinTo = Object.entries(config.relations[relation.through]).find(([, rel]) => rel.type === "N:1" && rel.model === relation.model)?.[0];
44
- if (joinFrom === undefined || joinTo === undefined) {
45
- throw new OrmError("Both sides of a N:N relation must be defined", { data: { joinFrom, joinTo, query } });
48
+ const parent = path.length === 1
49
+ ? result
50
+ : get(result, dropRight(path, 1));
51
+ if (parent !== undefined) {
52
+ const key = hash(pk.map((c) => get(parent, c)));
53
+ set(result, path, lookup[key] ?? []);
54
+ }
46
55
  }
47
- const pk = config.models[m].primaryKey;
48
- const fk = ensureArray(relation.foreignKey);
49
- const lateralBy = fk.map((c, index) => ({
50
- column: c,
51
- values: results.map((result) => result[pk[index]]),
52
- }));
53
- const subqueryResults = await findMany(conn, config, relation.through, {
54
- select: ensureArray(relation.foreignKey),
55
- include: { [joinTo]: subquery },
56
- lateralBy,
56
+ });
57
+ });
58
+ const fetchIncludedManyToManyRelations = getIncludedManyToManyRelations(config, m, query).map(({ model, relation, query, path }) => {
59
+ const joinFrom = Object.entries(config.relations[model]).find(([, rel]) => rel.type === "1:N" && rel.model === relation.through)?.[0];
60
+ const joinTo = Object.entries(config.relations[relation.through]).find(([, rel]) => rel.type === "N:1" && rel.model === relation.model)?.[0];
61
+ if (joinFrom === undefined || joinTo === undefined) {
62
+ throw new OrmError("Both sides of a N:N relation must be defined", {
63
+ data: { joinFrom, joinTo, query },
57
64
  });
65
+ }
66
+ const pk = config.models[model].primaryKey;
67
+ const fk = ensureArray(relation.foreignKey);
68
+ const lateralValues = mergeWith(Object.fromEntries(fk.map((c) => [c, []])), ...uniqWith(results.map((result) => {
69
+ return Object.fromEntries(fk.map((c, index) => [
70
+ c,
71
+ [get(result, [...dropRight(path, 1), pk[index]])],
72
+ ]));
73
+ }), isEqual), (a, b) => a.concat(b));
74
+ const lateralBy = fk.map((c) => ({
75
+ column: c,
76
+ values: lateralValues[c],
77
+ }));
78
+ return findMany(conn, config, relation.through, {
79
+ select: ensureArray(relation.foreignKey),
80
+ include: { [joinTo]: query },
81
+ for: builder.for,
82
+ lateralBy,
83
+ }).then((subqueryResults) => {
58
84
  const lookup = groupBy(subqueryResults, (result) => {
59
85
  return hash(fk.map((c) => result[c]));
60
86
  });
61
87
  for (const result of results) {
62
- const key = hash(pk.map((c) => result[c]));
63
- result[r] = (lookup[key] ?? []).map((relation) => relation[joinTo] ?? []);
88
+ const parent = path.length === 1
89
+ ? result
90
+ : get(result, dropRight(path, 1));
91
+ if (parent !== undefined) {
92
+ const key = hash(pk.map((c) => get(parent, c)));
93
+ set(result, path, (lookup[key] ?? []).map((r) => r[joinTo] ?? []));
94
+ }
64
95
  }
65
- }
66
- }
96
+ });
97
+ });
98
+ await Promise.all([
99
+ ...fetchIncludedOneToManyRelations,
100
+ ...fetchIncludedManyToManyRelations,
101
+ ]);
67
102
  return results;
68
103
  };
69
104
  //# sourceMappingURL=findMany.js.map