joist-core 2.2.0-next.5 → 2.2.0-next.50

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 (148) hide show
  1. package/build/Aliases.d.ts.map +1 -1
  2. package/build/Aliases.js.map +1 -1
  3. package/build/BaseEntity.d.ts +2 -0
  4. package/build/BaseEntity.d.ts.map +1 -1
  5. package/build/BaseEntity.js.map +1 -1
  6. package/build/Entity.d.ts +1 -0
  7. package/build/Entity.d.ts.map +1 -1
  8. package/build/EntityFilter.d.ts +27 -8
  9. package/build/EntityFilter.d.ts.map +1 -1
  10. package/build/EntityFilter.js +18 -0
  11. package/build/EntityFilter.js.map +1 -1
  12. package/build/EntityGraphQLFilter.d.ts +3 -0
  13. package/build/EntityGraphQLFilter.d.ts.map +1 -1
  14. package/build/EntityGraphQLFilter.js.map +1 -1
  15. package/build/EntityManager.d.ts +12 -10
  16. package/build/EntityManager.d.ts.map +1 -1
  17. package/build/EntityManager.js +46 -17
  18. package/build/EntityManager.js.map +1 -1
  19. package/build/EntityMetadata.d.ts +5 -0
  20. package/build/EntityMetadata.d.ts.map +1 -1
  21. package/build/EntityMetadata.js +13 -0
  22. package/build/EntityMetadata.js.map +1 -1
  23. package/build/IndexManager.d.ts +3 -3
  24. package/build/IndexManager.d.ts.map +1 -1
  25. package/build/IndexManager.js +30 -20
  26. package/build/IndexManager.js.map +1 -1
  27. package/build/InstanceData.d.ts +2 -0
  28. package/build/InstanceData.d.ts.map +1 -1
  29. package/build/InstanceData.js +2 -0
  30. package/build/InstanceData.js.map +1 -1
  31. package/build/IsLoadedCache.d.ts.map +1 -1
  32. package/build/IsLoadedCache.js +19 -10
  33. package/build/IsLoadedCache.js.map +1 -1
  34. package/build/JoinRows.d.ts +28 -4
  35. package/build/JoinRows.d.ts.map +1 -1
  36. package/build/JoinRows.js +35 -12
  37. package/build/JoinRows.js.map +1 -1
  38. package/build/QueryParser.d.ts +6 -1
  39. package/build/QueryParser.d.ts.map +1 -1
  40. package/build/QueryParser.js +270 -190
  41. package/build/QueryParser.js.map +1 -1
  42. package/build/QueryParser.test.d.ts +2 -0
  43. package/build/QueryParser.test.d.ts.map +1 -0
  44. package/build/QueryParser.test.js +27 -0
  45. package/build/QueryParser.test.js.map +1 -0
  46. package/build/batchloaders/BatchLoader.d.ts.map +1 -1
  47. package/build/batchloaders/BatchLoader.js +6 -1
  48. package/build/batchloaders/BatchLoader.js.map +1 -1
  49. package/build/batchloaders/manyToManyBatchLoader.d.ts.map +1 -1
  50. package/build/batchloaders/manyToManyBatchLoader.js +8 -2
  51. package/build/batchloaders/manyToManyBatchLoader.js.map +1 -1
  52. package/build/batchloaders/populateBatchLoader.d.ts.map +1 -1
  53. package/build/batchloaders/populateBatchLoader.js +26 -8
  54. package/build/batchloaders/populateBatchLoader.js.map +1 -1
  55. package/build/batchloaders/recursiveChildrenBatchLoader.d.ts.map +1 -1
  56. package/build/batchloaders/recursiveChildrenBatchLoader.js +2 -0
  57. package/build/batchloaders/recursiveChildrenBatchLoader.js.map +1 -1
  58. package/build/batchloaders/recursiveM2mBatchLoader.d.ts.map +1 -1
  59. package/build/batchloaders/recursiveM2mBatchLoader.js +1 -3
  60. package/build/batchloaders/recursiveM2mBatchLoader.js.map +1 -1
  61. package/build/batchloaders/recursiveParentsBatchLoader.d.ts.map +1 -1
  62. package/build/batchloaders/recursiveParentsBatchLoader.js +2 -0
  63. package/build/batchloaders/recursiveParentsBatchLoader.js.map +1 -1
  64. package/build/configure.d.ts +2 -0
  65. package/build/configure.d.ts.map +1 -1
  66. package/build/configure.js +6 -0
  67. package/build/configure.js.map +1 -1
  68. package/build/dataloaders/findCountDataLoader.d.ts +12 -2
  69. package/build/dataloaders/findCountDataLoader.d.ts.map +1 -1
  70. package/build/dataloaders/findCountDataLoader.js +42 -2
  71. package/build/dataloaders/findCountDataLoader.js.map +1 -1
  72. package/build/dataloaders/findDataLoader.d.ts +14 -1
  73. package/build/dataloaders/findDataLoader.d.ts.map +1 -1
  74. package/build/dataloaders/findDataLoader.js +38 -5
  75. package/build/dataloaders/findDataLoader.js.map +1 -1
  76. package/build/dataloaders/findIdsDataLoader.js +1 -1
  77. package/build/dataloaders/findIdsDataLoader.js.map +1 -1
  78. package/build/dataloaders/findOrCreateDataLoader.d.ts.map +1 -1
  79. package/build/dataloaders/findOrCreateDataLoader.js +2 -2
  80. package/build/dataloaders/findOrCreateDataLoader.js.map +1 -1
  81. package/build/dataloaders/findPaginatedDataLoader.d.ts.map +1 -1
  82. package/build/dataloaders/findPaginatedDataLoader.js +11 -5
  83. package/build/dataloaders/findPaginatedDataLoader.js.map +1 -1
  84. package/build/dataloaders/manyToManyFindDataLoader.js +7 -1
  85. package/build/dataloaders/manyToManyFindDataLoader.js.map +1 -1
  86. package/build/index.d.ts +2 -0
  87. package/build/index.d.ts.map +1 -1
  88. package/build/index.js +4 -1
  89. package/build/index.js.map +1 -1
  90. package/build/loadLens.d.ts +11 -0
  91. package/build/loadLens.d.ts.map +1 -1
  92. package/build/loadLens.js +43 -10
  93. package/build/loadLens.js.map +1 -1
  94. package/build/newEntity.d.ts.map +1 -1
  95. package/build/newEntity.js +16 -14
  96. package/build/newEntity.js.map +1 -1
  97. package/build/normalizeHints.d.ts +7 -0
  98. package/build/normalizeHints.d.ts.map +1 -1
  99. package/build/normalizeHints.js +40 -2
  100. package/build/normalizeHints.js.map +1 -1
  101. package/build/preloading/JsonAggregatePreloader.js +14 -9
  102. package/build/preloading/JsonAggregatePreloader.js.map +1 -1
  103. package/build/relations/ManyToManyCollection.d.ts +1 -0
  104. package/build/relations/ManyToManyCollection.d.ts.map +1 -1
  105. package/build/relations/ManyToManyCollection.js +5 -2
  106. package/build/relations/ManyToManyCollection.js.map +1 -1
  107. package/build/relations/ManyToManyLargeCollection.d.ts +3 -2
  108. package/build/relations/ManyToManyLargeCollection.d.ts.map +1 -1
  109. package/build/relations/ManyToManyLargeCollection.js +7 -4
  110. package/build/relations/ManyToManyLargeCollection.js.map +1 -1
  111. package/build/relations/OneToManyCollection.d.ts.map +1 -1
  112. package/build/relations/OneToManyCollection.js +2 -2
  113. package/build/relations/OneToManyCollection.js.map +1 -1
  114. package/build/relations/OneToManyLargeCollection.d.ts.map +1 -1
  115. package/build/relations/OneToManyLargeCollection.js +2 -1
  116. package/build/relations/OneToManyLargeCollection.js.map +1 -1
  117. package/build/relations/ReactiveManyToMany.d.ts +1 -0
  118. package/build/relations/ReactiveManyToMany.d.ts.map +1 -1
  119. package/build/relations/ReactiveManyToMany.js +4 -1
  120. package/build/relations/ReactiveManyToMany.js.map +1 -1
  121. package/build/relations/ReactiveManyToManyOtherSide.d.ts +1 -0
  122. package/build/relations/ReactiveManyToManyOtherSide.d.ts.map +1 -1
  123. package/build/relations/ReactiveManyToManyOtherSide.js +4 -1
  124. package/build/relations/ReactiveManyToManyOtherSide.js.map +1 -1
  125. package/build/relations/RecursiveCollection.d.ts +2 -6
  126. package/build/relations/RecursiveCollection.d.ts.map +1 -1
  127. package/build/relations/RecursiveCollection.js +9 -17
  128. package/build/relations/RecursiveCollection.js.map +1 -1
  129. package/build/relations/RecursiveCycleError.d.ts +13 -0
  130. package/build/relations/RecursiveCycleError.d.ts.map +1 -0
  131. package/build/relations/RecursiveCycleError.js +15 -0
  132. package/build/relations/RecursiveCycleError.js.map +1 -0
  133. package/build/relations/hasOneThrough.d.ts.map +1 -1
  134. package/build/relations/hasOneThrough.js +6 -4
  135. package/build/relations/hasOneThrough.js.map +1 -1
  136. package/build/relations/hasProperty.d.ts +2 -1
  137. package/build/relations/hasProperty.d.ts.map +1 -1
  138. package/build/relations/hasProperty.js +15 -5
  139. package/build/relations/hasProperty.js.map +1 -1
  140. package/build/scopes.d.ts +185 -0
  141. package/build/scopes.d.ts.map +1 -0
  142. package/build/scopes.js +302 -0
  143. package/build/scopes.js.map +1 -0
  144. package/build/temporal.d.ts +32 -2
  145. package/build/temporal.d.ts.map +1 -1
  146. package/build/temporal.js +18 -0
  147. package/build/temporal.js.map +1 -1
  148. package/package.json +2 -2
package/build/index.js CHANGED
@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  exports.deepNormalizeHint = exports.testIndex = exports.setFactoryLogging = exports.noValue = exports.newTestInstance = exports.maybeNewPoly = exports.maybeNew = exports.maybeBranchValue = exports.isFactoryCreation = exports.getTestIndex = exports.factories = exports.defaultValue = exports.lazyField = exports.setReactionLogging = exports.ReactionLogger = exports.setFactoryWriter = exports.unsafeLoaded = exports.maybePopulateThen = exports.isNew = exports.isLoaded = exports.ensureLoaded = exports.assertLoaded = exports.kqStar = exports.kqDot = exports.kq = exports.setField = exports.isFieldSet = exports.isChangeableField = exports.getField = exports.driverApi = exports.maybeGetConstructorFromReference = exports.getMetadataForType = exports.getMetadataForTable = exports.getConstructorFromTaggedId = exports.configureMetadata = exports.resetBootFlag = exports.ConfigApi = exports.Todo = exports.visitConditions = exports.Plugin = exports.JoinRowOperation = exports.InstanceData = exports.isEntity = exports.ConditionBuilder = exports.getInstanceData = exports.BaseEntity = exports.AliasAssigner = exports.newPgConnectionConfig = exports.internals = exports.testing = void 0;
18
- exports.NoIdError = exports.withLoaded = exports.StubbedRelation = exports.ensureWithLoaded = exports.zeroTo = exports.partition = exports.indexBy = exports.failIfAnyRejected = exports.fail = exports.cleanStringValue = exports.cleanSql = exports.assertNever = exports.asNew = exports.abbreviation = exports.upsert = exports.updatePartial = exports.ensureRectangularArraySizes = exports.buildUnnestCte = exports.runInTrustedContext = exports.isInTrustedContext = exports.setRuntimeConfig = exports.getRuntimeConfig = exports.ValidationErrors = exports.ValidationCode = exports.rangeValueRule = exports.newRequiredRule = exports.mustBeSubType = exports.minValueRule = exports.maxValueRule = exports.cannotBeUpdated = exports.cannotBeChanged = exports.reverseReactiveHint = exports.isTypeOrSubType = exports.convertToLoadHint = exports.JsonAggregatePreloader = exports.ImmutableEntitiesPlugin = exports.normalizeHint = void 0;
18
+ exports.NoIdError = exports.withLoaded = exports.StubbedRelation = exports.ensureWithLoaded = exports.zeroTo = exports.partition = exports.indexBy = exports.failIfAnyRejected = exports.fail = exports.cleanStringValue = exports.cleanSql = exports.assertNever = exports.asNew = exports.abbreviation = exports.upsert = exports.updatePartial = exports.ensureRectangularArraySizes = exports.buildUnnestCte = exports.runInTrustedContext = exports.isInTrustedContext = exports.Temporal = exports.setRuntimeConfig = exports.getRuntimeConfig = exports.ValidationErrors = exports.ValidationCode = exports.rangeValueRule = exports.newRequiredRule = exports.mustBeSubType = exports.minValueRule = exports.maxValueRule = exports.cannotBeUpdated = exports.cannotBeChanged = exports.reverseReactiveHint = exports.isTypeOrSubType = exports.convertToLoadHint = exports.JsonAggregatePreloader = exports.ImmutableEntitiesPlugin = exports.normalizeHint = void 0;
19
19
  exports.setOpts = setOpts;
20
20
  exports.setOpt = setOpt;
21
21
  exports.ensureNotDeleted = ensureNotDeleted;
@@ -150,6 +150,9 @@ var runtimeConfig_1 = require("./runtimeConfig");
150
150
  Object.defineProperty(exports, "getRuntimeConfig", { enumerable: true, get: function () { return runtimeConfig_1.getRuntimeConfig; } });
151
151
  Object.defineProperty(exports, "setRuntimeConfig", { enumerable: true, get: function () { return runtimeConfig_1.setRuntimeConfig; } });
152
152
  __exportStar(require("./serde"), exports);
153
+ __exportStar(require("./scopes"), exports);
154
+ var temporal_1 = require("./temporal");
155
+ Object.defineProperty(exports, "Temporal", { enumerable: true, get: function () { return temporal_1.Temporal; } });
153
156
  __exportStar(require("./temporalMappers"), exports);
154
157
  var trusted_1 = require("./trusted");
155
158
  Object.defineProperty(exports, "isInTrustedContext", { enumerable: true, get: function () { return trusted_1.isInTrustedContext; } });
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -48,6 +48,11 @@ export declare function loadLens<T extends Entity, U, V>(start: T | readonly T[]
48
48
  forceReload?: boolean;
49
49
  sql?: boolean;
50
50
  }): Promise<V>;
51
+ /** Loads a precomputed lens path, avoiding repeated lambda/proxy evaluation for long-lived relation declarations. */
52
+ export declare function loadLensPath<T extends Entity, V>(start: T | readonly T[], paths: string[], opts?: {
53
+ forceReload?: boolean;
54
+ sql?: boolean;
55
+ }): Promise<V>;
51
56
  export declare function isAllSqlPaths(meta: EntityMetadata, paths: string[]): boolean;
52
57
  export declare function mapPathsToTarget(source: EntityMetadata, paths: string[]): [EntityMetadata, [EntityMetadata, Field][]];
53
58
  /**
@@ -56,10 +61,16 @@ export declare function mapPathsToTarget(source: EntityMetadata, paths: string[]
56
61
  * This assumes you've first evaluated the lens with `loadLens` and now can access it synchronously.
57
62
  */
58
63
  export declare function getLens<T, U, V>(startMeta: EntityMetadata, start: T | readonly T[], fn: (lens: Lens<T>) => Lens<U, V>): V;
64
+ /** Synchronously traverses a precomputed lens path. */
65
+ export declare function getLensPath<T, V>(startMeta: EntityMetadata, start: T | readonly T[], paths: string[]): V;
59
66
  /** Returns whether a lens is loaded; primarily for deeply loaded instances in tests. */
60
67
  export declare function isLensLoaded<T, U, V>(start: T | readonly T[], fn: (lens: Lens<T>) => Lens<U, V>): boolean;
68
+ /** Returns whether a precomputed lens path is loaded; primarily for deeply loaded instances in tests. */
69
+ export declare function isLensLoadedPath<T>(start: T | readonly T[], paths: string[]): boolean;
61
70
  /** Accepts a lens like `a => a.books.reviews` and returns a hint like `{ books: { reviews: {} } }`. */
62
71
  export declare function lensToLoadHint<T extends Entity, U, V>(fn: (lens: Lens<T>) => Lens<U, V>): LoadHint<T>;
72
+ /** Accepts lens paths like `[books, reviews]` and returns a hint like `{ books: { reviews: {} } }`. */
73
+ export declare function lensPathToLoadHint<T extends Entity>(paths: string[]): LoadHint<T>;
63
74
  /** Accepts a lens like `a => a.books.reviews` and returns the paths like `[books, reviews]`. */
64
75
  export declare function lensToPath<T extends Entity, U, V>(fn: (lens: Lens<T>) => Lens<U, V>): string[];
65
76
  export {};
@@ -1 +1 @@
1
- {"version":3,"file":"loadLens.d.ts","sourceRoot":"","sources":["../src/loadLens.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loadLens.d.ts","sourceRoot":"","sources":["../src/loadLens.ts"],"names":[],"mappings":"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"}
package/build/loadLens.js CHANGED
@@ -1,11 +1,15 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.loadLens = loadLens;
4
+ exports.loadLensPath = loadLensPath;
4
5
  exports.isAllSqlPaths = isAllSqlPaths;
5
6
  exports.mapPathsToTarget = mapPathsToTarget;
6
7
  exports.getLens = getLens;
8
+ exports.getLensPath = getLensPath;
7
9
  exports.isLensLoaded = isLensLoaded;
10
+ exports.isLensLoadedPath = isLensLoadedPath;
8
11
  exports.lensToLoadHint = lensToLoadHint;
12
+ exports.lensPathToLoadHint = lensPathToLoadHint;
9
13
  exports.lensToPath = lensToPath;
10
14
  const Entity_1 = require("./Entity");
11
15
  const EntityManager_1 = require("./EntityManager");
@@ -26,6 +30,10 @@ const AbstractRelationImpl_1 = require("./relations/AbstractRelationImpl");
26
30
  // subclass itself, so we use the codegen hammer in our subclass to force the right Lens type
27
31
  // in a .load stub that just calls us for the implementation.
28
32
  async function loadLens(start, fn, opts = {}) {
33
+ return loadLensPath(start, collectPaths(fn), opts);
34
+ }
35
+ /** Loads a precomputed lens path, avoiding repeated lambda/proxy evaluation for long-lived relation declarations. */
36
+ function loadLensPath(start, paths, opts = {}) {
29
37
  // Probe for the meta, so we can track when/if it needs to flip to a collection (even after hitting undefined)
30
38
  const meta = Array.isArray(start)
31
39
  ? (0, Entity_1.isEntity)(start[0]) && (0, EntityMetadata_1.getMetadata)(start[0])
@@ -34,10 +42,18 @@ async function loadLens(start, fn, opts = {}) {
34
42
  if (!meta)
35
43
  return [];
36
44
  // If we're already loaded, just return
37
- if (!opts.forceReload && isLensLoaded(start, fn)) {
38
- return getLens(meta, start, fn);
45
+ if (!opts.forceReload && isLensLoadedPath(start, paths)) {
46
+ // Keep this synchronous to avoid adding a promise turn; this preserves nuanced hook timing in production code.
47
+ return getLensPath(meta, start, paths);
39
48
  }
40
- const paths = collectPaths(fn);
49
+ return loadLensPathAsync(meta, start, paths, opts);
50
+ }
51
+ /**
52
+ * Loads an unloaded lens path, keeping the already-loaded shortcut in `loadLensPath` synchronous.
53
+ *
54
+ * I.e. this avoids adding an extra promise turn for already-loaded paths during concurrent hooks.
55
+ */
56
+ async function loadLensPathAsync(meta, start, paths, opts) {
41
57
  // See if we can load this via SQL
42
58
  if (opts.sql) {
43
59
  // Are all paths SQL query-able?
@@ -97,7 +113,7 @@ async function loadLens(start, fn, opts = {}) {
97
113
  if (field?.kind === "o2m" || field?.kind === "m2m")
98
114
  return [];
99
115
  }
100
- currentMeta = field && "otherMetadata" in field ? field.otherMetadata() : undefined;
116
+ currentMeta = nextMeta(current, field);
101
117
  }
102
118
  return current;
103
119
  }
@@ -150,7 +166,10 @@ function maybeLoad(object, path, opts) {
150
166
  * This assumes you've first evaluated the lens with `loadLens` and now can access it synchronously.
151
167
  */
152
168
  function getLens(startMeta, start, fn) {
153
- const paths = collectPaths(fn);
169
+ return getLensPath(startMeta, start, collectPaths(fn));
170
+ }
171
+ /** Synchronously traverses a precomputed lens path. */
172
+ function getLensPath(startMeta, start, paths) {
154
173
  let currentMeta = startMeta;
155
174
  let current = start;
156
175
  let seenSoftDeleted = false;
@@ -186,19 +205,29 @@ function getLens(startMeta, start, fn) {
186
205
  if (field?.kind === "o2m" || field?.kind === "m2m")
187
206
  return [];
188
207
  }
189
- currentMeta = field && "otherMetadata" in field ? field.otherMetadata() : undefined;
208
+ currentMeta = nextMeta(current, field);
190
209
  }
191
210
  return current;
192
211
  }
212
+ /** Returns the next runtime metadata, preserving subtype-specific fields after base-typed traversals. */
213
+ function nextMeta(current, field) {
214
+ const entity = Array.isArray(current) ? current[0] : current;
215
+ if ((0, Entity_1.isEntity)(entity))
216
+ return (0, EntityMetadata_1.getMetadata)(entity);
217
+ return field && "otherMetadata" in field ? field.otherMetadata() : undefined;
218
+ }
193
219
  function maybeAdd(set, value) {
194
220
  if (value !== undefined && !value.isSoftDeletedEntity)
195
221
  set.add(value);
196
222
  }
197
223
  /** Returns whether a lens is loaded; primarily for deeply loaded instances in tests. */
198
224
  function isLensLoaded(start, fn) {
225
+ return isLensLoadedPath(start, collectPaths(fn));
226
+ }
227
+ /** Returns whether a precomputed lens path is loaded; primarily for deeply loaded instances in tests. */
228
+ function isLensLoadedPath(start, paths) {
199
229
  // This is a huge copy/paste of `getLens` but we check `isNotLoaded` and early return
200
230
  // as soon as we find any not-loaded relation
201
- const paths = collectPaths(fn);
202
231
  let current = start;
203
232
  let seenSoftDeleted = false;
204
233
  // Now evaluate each step of the path
@@ -234,16 +263,20 @@ function isLensLoaded(start, fn) {
234
263
  }
235
264
  /** Accepts a lens like `a => a.books.reviews` and returns a hint like `{ books: { reviews: {} } }`. */
236
265
  function lensToLoadHint(fn) {
237
- const paths = collectPaths(fn);
266
+ return lensPathToLoadHint(collectPaths(fn));
267
+ }
268
+ /** Accepts lens paths like `[books, reviews]` and returns a hint like `{ books: { reviews: {} } }`. */
269
+ function lensPathToLoadHint(paths) {
238
270
  let current = {};
239
- for (const path of paths.reverse()) {
271
+ for (let i = paths.length - 1; i >= 0; i--) {
272
+ const path = paths[i];
240
273
  current = { [path]: current };
241
274
  }
242
275
  return current;
243
276
  }
244
277
  /** Accepts a lens like `a => a.books.reviews` and returns the paths like `[books, reviews]`. */
245
278
  function lensToPath(fn) {
246
- return collectPaths(fn);
279
+ return [...collectPaths(fn)];
247
280
  }
248
281
  function isNotLoaded(object, path) {
249
282
  const value = object && object[path];
@@ -1 +1 @@
1
- {"version":3,"file":"loadLens.js","sourceRoot":"","sources":["../src/loadLens.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loadLens.js","sourceRoot":"","sources":["../src/loadLens.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"newEntity.d.ts","sourceRoot":"","sources":["../src/newEntity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAe,MAAM,kBAAkB,CAAC;AAO/D;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,CAa5G;AA6BD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,CAEzF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,cAAc,CAIlF;AAED,gFAAgF;AAChF,qBAAa,SAAS,CAAC,CAAC,SAAS,MAAM;;gBAEzB,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,GAAG;IAIrD,2EAA2E;IAC3E,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM;CAGpC"}
1
+ {"version":3,"file":"newEntity.d.ts","sourceRoot":"","sources":["../src/newEntity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAe,MAAM,kBAAkB,CAAC;AAO/D;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,CAa5G;AA+BD;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC,GAAG,CAAC,CAEzF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,cAAc,CAIlF;AAED,gFAAgF;AAChF,qBAAa,SAAS,CAAC,CAAC,SAAS,MAAM;;gBAEzB,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM,KAAK,GAAG;IAIrD,2EAA2E;IAC3E,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,MAAM;CAGpC"}
@@ -35,7 +35,7 @@ function newEntity(em, cstr, isNew) {
35
35
  return entity;
36
36
  }
37
37
  function moveRelationsToGetters(cstr) {
38
- // Reuse getProperties's detect
38
+ let transientFieldsValue = {};
39
39
  for (const [fieldName, value] of (0, getProperties_1.getLazyFields)((0, EntityMetadata_1.getMetadata)(cstr))) {
40
40
  if (value instanceof LazyField) {
41
41
  Object.defineProperty(cstr.prototype, fieldName, {
@@ -45,21 +45,23 @@ function moveRelationsToGetters(cstr) {
45
45
  });
46
46
  }
47
47
  else if (fieldName === "transientFields") {
48
- Object.defineProperty(cstr.prototype, fieldName, {
49
- get() {
50
- // This prototype-level `get` will only ever be called once per instance, b/c when we're
51
- // called for the first/only time, we set an instance-level `this.transientFields` that, for
52
- // all future calls, will resolve to the instance's own copy of the fields.
53
- //
54
- // This has the pleasant upshot of making the instance-level `transientFields` lazy, and
55
- // they will not be created on an instance until they're actually asked for.
56
- const copy = structuredClone(value);
57
- Object.defineProperty(this, "transientFields", { value: copy });
58
- return copy;
59
- },
60
- });
48
+ // We'll define transientFields for all entities outside the loop
49
+ transientFieldsValue = value;
61
50
  }
62
51
  }
52
+ Object.defineProperty(cstr.prototype, "transientFields", {
53
+ get() {
54
+ // This prototype-level `get` will only ever be called once per instance, b/c when we're
55
+ // called for the first/only time, we set an instance-level `this.transientFields` that, for
56
+ // all future calls, will resolve to the instance's own copy of the fields.
57
+ //
58
+ // This has the pleasant upshot of making the instance-level `transientFields` lazy, and
59
+ // they will not be created on an instance until they're actually asked for.
60
+ const copy = structuredClone(transientFieldsValue);
61
+ Object.defineProperty(this, "transientFields", { value: copy });
62
+ return copy;
63
+ },
64
+ });
63
65
  }
64
66
  /**
65
67
  * A function for `has...` methods to integrate with the `newEntity` lazy field system.
@@ -1 +1 @@
1
- {"version":3,"file":"newEntity.js","sourceRoot":"","sources":["../src/newEntity.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"newEntity.js","sourceRoot":"","sources":["../src/newEntity.ts"],"names":[],"mappings":"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"}
@@ -11,6 +11,13 @@ export type DropSuffix<K> = K extends `${infer key}${SuffixSeperator}ro` ? key :
11
11
  export declare const suffixRe: RegExp;
12
12
  /** Normalizes a `key | key[] | { key: nested }` hint into `{ key: nested }`. */
13
13
  export declare function normalizeHint<T extends Entity>(hint: LoadHint<T> | ReactiveHint<T>): object;
14
+ /**
15
+ * Returns a JSON key for batching by hint, cached to avoid repeated `JSON.stringify(hint)` calls.
16
+ *
17
+ * Benchmark TLDR, 5m repeated calls: strings are unchanged, array hints were ~8x faster,
18
+ * nested object hints were ~26-38x faster.
19
+ */
20
+ export declare function hintKey<T extends Entity>(hint: LoadHint<T> | ReactiveHint<T> | undefined): string;
14
21
  /** Normalizes a `key | key[] | { key: nested }` hint into `{ key: nested }`. */
15
22
  export declare function deepNormalizeHint<T extends Entity>(hint: LoadHint<T> | ReactiveHint<T>): object;
16
23
  //# sourceMappingURL=normalizeHints.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"normalizeHints.d.ts","sourceRoot":"","sources":["../src/normalizeHints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,gFAAgF;AAChF,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC3C,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GACzB,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC,GAC1B,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,GACjC;KAAG,CAAC,IAAI,MAAM,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAEhD,2FAA2F;AAC3F,MAAM,MAAM,eAAe,GAAG,GAAG,GAAG,GAAG,CAAC;AAExC,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,MAAM,GAAG,GAAG,eAAe,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC;AAEnF,eAAO,MAAM,QAAQ,QAAa,CAAC;AAEnC,gFAAgF;AAChF,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAQ3F;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAQ/F"}
1
+ {"version":3,"file":"normalizeHints.d.ts","sourceRoot":"","sources":["../src/normalizeHints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,gFAAgF;AAChF,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAC3C,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GACzB,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC,GAC1B,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,GACjC;KAAG,CAAC,IAAI,MAAM,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAEhD,2FAA2F;AAC3F,MAAM,MAAM,eAAe,GAAG,GAAG,GAAG,GAAG,CAAC;AAExC,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,MAAM,GAAG,GAAG,eAAe,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC;AAEnF,eAAO,MAAM,QAAQ,QAAa,CAAC;AAMnC,gFAAgF;AAChF,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAQ3F;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,MAAM,CAUjG;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,CAQ/F"}
@@ -2,20 +2,42 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.suffixRe = void 0;
4
4
  exports.normalizeHint = normalizeHint;
5
+ exports.hintKey = hintKey;
5
6
  exports.deepNormalizeHint = deepNormalizeHint;
6
7
  exports.suffixRe = /[:|_]ro$/;
8
+ const normalizedStringHints = new Map();
9
+ const normalizedArrayHints = new WeakMap();
10
+ const hintKeys = new WeakMap();
7
11
  /** Normalizes a `key | key[] | { key: nested }` hint into `{ key: nested }`. */
8
12
  function normalizeHint(hint) {
9
13
  if (typeof hint === "string") {
10
- return { [hint]: {} };
14
+ return getOrSetStringHint(hint);
11
15
  }
12
16
  else if (Array.isArray(hint)) {
13
- return Object.fromEntries(hint.map((field) => [field, {}]));
17
+ return getOrSetArrayHint(hint);
14
18
  }
15
19
  else {
16
20
  return hint;
17
21
  }
18
22
  }
23
+ /**
24
+ * Returns a JSON key for batching by hint, cached to avoid repeated `JSON.stringify(hint)` calls.
25
+ *
26
+ * Benchmark TLDR, 5m repeated calls: strings are unchanged, array hints were ~8x faster,
27
+ * nested object hints were ~26-38x faster.
28
+ */
29
+ function hintKey(hint) {
30
+ if (hint === undefined)
31
+ return "";
32
+ if (typeof hint === "string")
33
+ return hint;
34
+ let key = hintKeys.get(hint);
35
+ if (key === undefined) {
36
+ key = JSON.stringify(hint);
37
+ hintKeys.set(hint, key);
38
+ }
39
+ return key;
40
+ }
19
41
  /** Normalizes a `key | key[] | { key: nested }` hint into `{ key: nested }`. */
20
42
  function deepNormalizeHint(hint) {
21
43
  if (typeof hint === "string") {
@@ -28,4 +50,20 @@ function deepNormalizeHint(hint) {
28
50
  return Object.fromEntries(Object.entries(hint).map(([key, value]) => [key, deepNormalizeHint(value)]));
29
51
  }
30
52
  }
53
+ function getOrSetStringHint(hint) {
54
+ let normalized = normalizedStringHints.get(hint);
55
+ if (normalized === undefined) {
56
+ normalized = { [hint]: {} };
57
+ normalizedStringHints.set(hint, normalized);
58
+ }
59
+ return normalized;
60
+ }
61
+ function getOrSetArrayHint(hint) {
62
+ let normalized = normalizedArrayHints.get(hint);
63
+ if (normalized === undefined) {
64
+ normalized = Object.fromEntries(hint.map((field) => [field, {}]));
65
+ normalizedArrayHints.set(hint, normalized);
66
+ }
67
+ return normalized;
68
+ }
31
69
  //# sourceMappingURL=normalizeHints.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"normalizeHints.js","sourceRoot":"","sources":["../src/normalizeHints.ts"],"names":[],"mappings":";;;AAmBA,sCAQC;AAGD,8CAQC;AAtBY,QAAA,QAAQ,GAAG,UAAU,CAAC;AAEnC,gFAAgF;AAChF,SAAgB,aAAa,CAAmB,IAAmC;IACjF,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IACxB,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,SAAgB,iBAAiB,CAAmB,IAAmC;IACrF,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IACxB,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"normalizeHints.js","sourceRoot":"","sources":["../src/normalizeHints.ts"],"names":[],"mappings":";;;AAuBA,sCAQC;AAQD,0BAUC;AAGD,8CAQC;AA5CY,QAAA,QAAQ,GAAG,UAAU,CAAC;AAEnC,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAC;AACxD,MAAM,oBAAoB,GAAG,IAAI,OAAO,EAA6B,CAAC;AACtE,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAkB,CAAC;AAE/C,gFAAgF;AAChF,SAAgB,aAAa,CAAmB,IAAmC;IACjF,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,iBAAiB,CAAC,IAAyB,CAAC,CAAC;IACtD,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAgB,OAAO,CAAmB,IAA+C;IACvF,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAClC,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE1C,IAAI,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7B,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3B,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,gFAAgF;AAChF,SAAgB,iBAAiB,CAAmB,IAAmC;IACrF,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;IACxB,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,IAAI,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,UAAU,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC;QAC5B,qBAAqB,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAuB;IAChD,IAAI,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAClE,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
@@ -143,8 +143,9 @@ function calcLateralJoins(assigner, root, tree, parentAlias, parentMeta, pathPre
143
143
  }
144
144
  else if (otherField.kind === "m2m") {
145
145
  m2mAlias = assigner.getAlias(otherField.joinTableName);
146
- // Get the m2m row's id to track in JoinRows
147
- selects.unshift((0, keywords_1.kqDot)(m2mAlias, "id"));
146
+ // Get the m2m row's id to track in JoinRows; id-less tables have no surrogate id.
147
+ if (otherField.hasJoinTableId)
148
+ selects.unshift((0, keywords_1.kqDot)(m2mAlias, "id"));
148
149
  m2mTable = {
149
150
  join: "inner",
150
151
  table: otherField.joinTableName,
@@ -174,6 +175,13 @@ function calcLateralJoins(assigner, root, tree, parentAlias, parentMeta, pathPre
174
175
  pruneable: true,
175
176
  });
176
177
  }
178
+ // For m2m, order by the join-row's id so preloaded results match the order the lazy batch
179
+ // loader returns (which orders by join-row id). Id-less join tables have no surrogate id,
180
+ // so order by the other entity's FK column (matching the lazy loader & getOthers). Otherwise,
181
+ // order by the target entity's id.
182
+ const orderBy = otherField.kind === "m2m" && !otherField.hasJoinTableId
183
+ ? `${(0, keywords_1.kq)(m2mAlias)}.${(0, keywords_1.kq)(otherField.columnNames[0])}`
184
+ : `${(0, keywords_1.kq)(m2mAlias ?? otherAlias)}.id`;
177
185
  const join = {
178
186
  join: "lateral",
179
187
  alias: otherAlias,
@@ -182,10 +190,7 @@ function calcLateralJoins(assigner, root, tree, parentAlias, parentMeta, pathPre
182
190
  fromAlias: "unset",
183
191
  table: otherMeta.tableName,
184
192
  query: {
185
- // For m2m, order by the join-row's id so preloaded results match the
186
- // order the lazy batch loader returns (which orders by join-row id).
187
- // Otherwise, order by the target entity's id.
188
- selects: [`json_agg(json_build_array(${selects.join(", ")}) order by ${(0, keywords_1.kq)(m2mAlias ?? otherAlias)}.id) as _`],
193
+ selects: [`json_agg(json_build_array(${selects.join(", ")}) order by ${orderBy}) as _`],
189
194
  tables: [
190
195
  { join: "primary", table: otherMeta.tableName, alias: otherAlias },
191
196
  ...(m2mTable ? [m2mTable] : []),
@@ -197,8 +202,8 @@ function calcLateralJoins(assigner, root, tree, parentAlias, parentMeta, pathPre
197
202
  };
198
203
  // Pre-compute column names so we don't re-read them per entity
199
204
  const columnNames = columns.map((c) => c.columnName);
200
- // If we've snuck the m2m row id into the json array, ignore it
201
- const m2mOffset = field.kind === "m2m" ? 1 : 0;
205
+ // If we've snuck the m2m row id into the json array, ignore it (id-less tables have no id)
206
+ const m2mOffset = field.kind === "m2m" && field.hasJoinTableId ? 1 : 0;
202
207
  const hydrator = (root, parent, arrays) => {
203
208
  const { em } = root;
204
209
  // If we had overlapping load hints, i.e. `author.books` for [a1, a2] and `author.comments` for [a1], and
@@ -225,7 +230,7 @@ function calcLateralJoins(assigner, root, tree, parentAlias, parentMeta, pathPre
225
230
  const m2m = parent[key];
226
231
  (0, EntityManager_1.getEmInternalApi)(em)
227
232
  .joinRows(m2m)
228
- .addPreloadedRow(m2m, array[0], parent, entity);
233
+ .addPreloadedRow(m2m, field.hasJoinTableId ? array[0] : undefined, parent, entity);
229
234
  }
230
235
  // Within each child, look for grandchildren
231
236
  subJoins.forEach((sub, i) => {
@@ -1 +1 @@
1
- {"version":3,"file":"JsonAggregatePreloader.js","sourceRoot":"","sources":["../../src/preloading/JsonAggregatePreloader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JsonAggregatePreloader.js","sourceRoot":"","sources":["../../src/preloading/JsonAggregatePreloader.ts"],"names":[],"mappings":"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"}
@@ -43,6 +43,7 @@ export declare class ManyToManyCollection<T extends Entity, U extends Entity> ex
43
43
  get otherFieldName(): string & keyof U;
44
44
  get columnName(): string;
45
45
  get otherColumnName(): string;
46
+ get hasJoinTableId(): boolean;
46
47
  get hasBeenSet(): boolean;
47
48
  toString(): string;
48
49
  [RelationT]: T;
@@ -1 +1 @@
1
- {"version":3,"file":"ManyToManyCollection.d.ts","sourceRoot":"","sources":["../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAEV,MAAM,EACN,cAAc,EAId,IAAI,EACJ,eAAe,EAEhB,MAAM,KAAK,CAAC;AAKb,OAAO,EAAE,oBAAoB,EAAmB,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,sDAAsD;AACtD,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAKpF;AAED,qBAAa,oBAAoB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAClE,SAAQ,oBAAoB,CAAC,CAAC,EAAE,CAAC,EAAE,CACnC,YAAW,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC;;gBAWf,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,eAAe;IAU7C,gBAAgB;IAChB,YAAY,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAI5B,gBAAgB;IAChB,eAAe,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAI/B,gBAAgB;IAChB,kBAAkB,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAIlC,gBAAgB;IAChB,qBAAqB,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;IAIrC,yFAAyF;IACzF,OAAO,CAAC,aAAa;IAMf,IAAI,CAAC,IAAI,GAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAqB5F,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAezC,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAa1C,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,UAAU,UAAQ,GAAG,IAAI;IAKvC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE,UAAU,UAAQ,GAAG,IAAI;IAK1C,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,OAAO,IAAI,IAAI;IAOf,MAAM,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,SAAS,KAAK,CAAC,EAAE,GAAG,SAAS,GAAG,IAAI;IAIjH,OAAO,CAAC,KAAK;IAKb,IAAI,cAAc,IAAI,CAAC,EAAE,CAExB;IAED,IAAI,GAAG,IAAI,CAAC,EAAE,CAEb;IAED,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,GAAG,IAAI;IAK/B,SAAS,IAAI,IAAI;IAYjB,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,IAAI;IAK9B,kBAAkB;IAQZ,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAY7C,IAAI,IAAI,IAAI,cAAc,CAEzB;IAED,IAAI,SAAS,IAAI,cAAc,CAE9B;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,MAAM,CAAC,CAErC;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAMD,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,QAAQ,IAAI,MAAM;IASlB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAS;IACvB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAS;CACxB"}
1
+ {"version":3,"file":"ManyToManyCollection.d.ts","sourceRoot":"","sources":["../../src/relations/ManyToManyCollection.ts"],"names":[],"mappings":"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"}
@@ -177,10 +177,10 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
177
177
  }
178
178
  }
179
179
  get meta() {
180
- return (0, __1.getMetadata)(this.entity);
180
+ return (0, __1.getMetadataForField)((0, __1.getMetadata)(this.entity), this.fieldName);
181
181
  }
182
182
  get otherMeta() {
183
- return (0, __1.getMetadata)(this.entity).allFields[this.fieldName].otherMetadata();
183
+ return this.#field.otherMetadata();
184
184
  }
185
185
  get joinTableName() {
186
186
  return this.#field.joinTableName;
@@ -197,6 +197,9 @@ class ManyToManyCollection extends AbstractRelationImpl_1.AbstractRelationImpl {
197
197
  get otherColumnName() {
198
198
  return this.#field.columnNames[1];
199
199
  }
200
+ get hasJoinTableId() {
201
+ return this.#field.hasJoinTableId;
202
+ }
200
203
  get #isCascadeDelete() {
201
204
  return (0, AbstractRelationImpl_1.isCascadeDelete)(this, this.fieldName);
202
205
  }