@loomcore/api 0.1.91 → 0.1.92

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.
@@ -20,13 +20,6 @@ export function convertOperationsToPipeline(operations) {
20
20
  const joinAliases = operations
21
21
  .filter(op => op instanceof Join || op instanceof JoinMany || op instanceof JoinThrough || op instanceof JoinThroughMany)
22
22
  .map(op => op.as);
23
- if (joinAliases.length > 0) {
24
- pipeline.push({
25
- $set: {
26
- _joinData: {}
27
- }
28
- });
29
- }
30
23
  operations.forEach(operation => {
31
24
  if (operation instanceof Join) {
32
25
  const needsObjectIdConversion = operation.foreignField === '_id';
@@ -63,7 +56,12 @@ export function convertOperationsToPipeline(operations) {
63
56
  }
64
57
  }, {
65
58
  $addFields: {
66
- [`_joinData.${operation.as}`]: `$${operation.as}Arr`
59
+ _joinData: {
60
+ $mergeObjects: [
61
+ { $ifNull: ['$_joinData', {}] },
62
+ { [operation.as]: `$${operation.as}Arr` }
63
+ ]
64
+ }
67
65
  }
68
66
  }, {
69
67
  $project: {
@@ -86,7 +84,12 @@ export function convertOperationsToPipeline(operations) {
86
84
  }
87
85
  }, {
88
86
  $addFields: {
89
- [`_joinData.${operation.as}`]: `$${operation.as}Arr`
87
+ _joinData: {
88
+ $mergeObjects: [
89
+ { $ifNull: ['$_joinData', {}] },
90
+ { [operation.as]: `$${operation.as}Arr` }
91
+ ]
92
+ }
90
93
  }
91
94
  }, {
92
95
  $project: {
@@ -99,11 +102,35 @@ export function convertOperationsToPipeline(operations) {
99
102
  const parentJoin = processedOperations.find(op => (op instanceof Join || op instanceof JoinMany || op instanceof JoinThrough || op instanceof JoinThroughMany) && op.as === parentAlias);
100
103
  if (parentJoin) {
101
104
  pipeline.push({
102
- $set: {
103
- [`_joinData.${parentAlias}`]: {
105
+ $addFields: {
106
+ _joinData: {
104
107
  $mergeObjects: [
105
- { $ifNull: [`$_joinData.${parentAlias}`, {}] },
106
- { [operation.as]: `$_joinData.${operation.as}` }
108
+ { $ifNull: ['$_joinData', {}] },
109
+ {
110
+ [parentAlias]: {
111
+ $mergeObjects: [
112
+ {
113
+ $ifNull: [
114
+ {
115
+ $getField: {
116
+ field: parentAlias,
117
+ input: { $ifNull: ['$_joinData', {}] }
118
+ }
119
+ },
120
+ {}
121
+ ]
122
+ },
123
+ {
124
+ [operation.as]: {
125
+ $getField: {
126
+ field: operation.as,
127
+ input: { $ifNull: ['$_joinData', {}] }
128
+ }
129
+ }
130
+ }
131
+ ]
132
+ }
133
+ }
107
134
  ]
108
135
  }
109
136
  }
@@ -144,7 +171,12 @@ export function convertOperationsToPipeline(operations) {
144
171
  }
145
172
  }, {
146
173
  $addFields: {
147
- [`_joinData.${operation.as}`]: `$${operation.as}_temp`
174
+ _joinData: {
175
+ $mergeObjects: [
176
+ { $ifNull: ['$_joinData', {}] },
177
+ { [operation.as]: `$${operation.as}_temp` }
178
+ ]
179
+ }
148
180
  }
149
181
  }, {
150
182
  $project: {
@@ -156,11 +188,18 @@ export function convertOperationsToPipeline(operations) {
156
188
  const parentJoin = processedOperations.find(op => (op instanceof Join || op instanceof JoinMany || op instanceof JoinThrough || op instanceof JoinThroughMany) && op.as === parentAlias);
157
189
  if (parentJoin) {
158
190
  pipeline.push({
159
- $set: {
160
- [`_joinData.${parentAlias}`]: {
191
+ $addFields: {
192
+ _joinData: {
161
193
  $mergeObjects: [
162
- { $ifNull: [`$_joinData.${parentAlias}`, {}] },
163
- { [operation.as]: `$_joinData.${operation.as}` }
194
+ { $ifNull: ['$_joinData', {}] },
195
+ {
196
+ [parentAlias]: {
197
+ $mergeObjects: [
198
+ { $ifNull: [`$_joinData.${parentAlias}`, {}] },
199
+ { [operation.as]: `$_joinData.${operation.as}` }
200
+ ]
201
+ }
202
+ }
164
203
  ]
165
204
  }
166
205
  }
@@ -181,7 +220,12 @@ export function convertOperationsToPipeline(operations) {
181
220
  }
182
221
  }, {
183
222
  $addFields: {
184
- [`_joinData.${operation.as}`]: `$${operation.as}_temp`
223
+ _joinData: {
224
+ $mergeObjects: [
225
+ { $ifNull: ['$_joinData', {}] },
226
+ { [operation.as]: `$${operation.as}_temp` }
227
+ ]
228
+ }
185
229
  }
186
230
  }, {
187
231
  $project: {
@@ -272,7 +316,12 @@ export function convertOperationsToPipeline(operations) {
272
316
  }
273
317
  }, {
274
318
  $addFields: {
275
- [`_joinData.${operation.as}`]: `$${operation.as}_temp`
319
+ _joinData: {
320
+ $mergeObjects: [
321
+ { $ifNull: ['$_joinData', {}] },
322
+ { [operation.as]: `$${operation.as}_temp` }
323
+ ]
324
+ }
276
325
  }
277
326
  }, {
278
327
  $project: {
@@ -285,11 +334,18 @@ export function convertOperationsToPipeline(operations) {
285
334
  const parentJoin = processedOperations.find(op => (op instanceof Join || op instanceof JoinThrough) && op.as === parentAlias);
286
335
  if (parentJoin) {
287
336
  pipeline.push({
288
- $set: {
289
- [`_joinData.${parentAlias}`]: {
337
+ $addFields: {
338
+ _joinData: {
290
339
  $mergeObjects: [
291
- { $ifNull: [`$_joinData.${parentAlias}`, {}] },
292
- { [operation.as]: `$_joinData.${operation.as}` }
340
+ { $ifNull: ['$_joinData', {}] },
341
+ {
342
+ [parentAlias]: {
343
+ $mergeObjects: [
344
+ { $ifNull: [`$_joinData.${parentAlias}`, {}] },
345
+ { [operation.as]: `$_joinData.${operation.as}` }
346
+ ]
347
+ }
348
+ }
293
349
  ]
294
350
  }
295
351
  }
@@ -356,7 +412,12 @@ export function convertOperationsToPipeline(operations) {
356
412
  }
357
413
  }, {
358
414
  $addFields: {
359
- [`_joinData.${operation.as}`]: `$${operation.as}_temp`
415
+ _joinData: {
416
+ $mergeObjects: [
417
+ { $ifNull: ['$_joinData', {}] },
418
+ { [operation.as]: `$${operation.as}_temp` }
419
+ ]
420
+ }
360
421
  }
361
422
  }, {
362
423
  $project: {
@@ -369,11 +430,18 @@ export function convertOperationsToPipeline(operations) {
369
430
  const parentJoin = processedOperations.find(op => (op instanceof Join || op instanceof JoinThrough) && op.as === parentAlias);
370
431
  if (parentJoin) {
371
432
  pipeline.push({
372
- $set: {
373
- [`_joinData.${parentAlias}`]: {
433
+ $addFields: {
434
+ _joinData: {
374
435
  $mergeObjects: [
375
- { $ifNull: [`$_joinData.${parentAlias}`, {}] },
376
- { [operation.as]: `$_joinData.${operation.as}` }
436
+ { $ifNull: ['$_joinData', {}] },
437
+ {
438
+ [parentAlias]: {
439
+ $mergeObjects: [
440
+ { $ifNull: [`$_joinData.${parentAlias}`, {}] },
441
+ { [operation.as]: `$_joinData.${operation.as}` }
442
+ ]
443
+ }
444
+ }
377
445
  ]
378
446
  }
379
447
  }
@@ -468,7 +536,17 @@ export function convertOperationsToPipeline(operations) {
468
536
  }, {
469
537
  $replaceRoot: {
470
538
  newRoot: {
471
- $mergeObjects: ['$root', { [`_joinData.${operation.as}`]: `$${operation.as}_temp_grouped` }]
539
+ $mergeObjects: [
540
+ '$root',
541
+ {
542
+ _joinData: {
543
+ $mergeObjects: [
544
+ { $ifNull: ['$root._joinData', {}] },
545
+ { [operation.as]: `$${operation.as}_temp_grouped` }
546
+ ]
547
+ }
548
+ }
549
+ ]
472
550
  }
473
551
  }
474
552
  }, {
@@ -483,11 +561,18 @@ export function convertOperationsToPipeline(operations) {
483
561
  const parentJoin = processedOperations.find(op => (op instanceof Join || op instanceof JoinThrough) && op.as === parentAlias);
484
562
  if (parentJoin) {
485
563
  pipeline.push({
486
- $set: {
487
- [`_joinData.${parentAlias}`]: {
564
+ $addFields: {
565
+ _joinData: {
488
566
  $mergeObjects: [
489
- { $ifNull: [`$_joinData.${parentAlias}`, {}] },
490
- { [operation.as]: `$_joinData.${operation.as}` }
567
+ { $ifNull: ['$_joinData', {}] },
568
+ {
569
+ [parentAlias]: {
570
+ $mergeObjects: [
571
+ { $ifNull: [`$_joinData.${parentAlias}`, {}] },
572
+ { [operation.as]: `$_joinData.${operation.as}` }
573
+ ]
574
+ }
575
+ }
491
576
  ]
492
577
  }
493
578
  }
@@ -555,7 +640,17 @@ export function convertOperationsToPipeline(operations) {
555
640
  }, {
556
641
  $replaceRoot: {
557
642
  newRoot: {
558
- $mergeObjects: ['$root', { [`_joinData.${operation.as}`]: `$${operation.as}_temp_grouped` }]
643
+ $mergeObjects: [
644
+ '$root',
645
+ {
646
+ _joinData: {
647
+ $mergeObjects: [
648
+ { $ifNull: ['$root._joinData', {}] },
649
+ { [operation.as]: `$${operation.as}_temp_grouped` }
650
+ ]
651
+ }
652
+ }
653
+ ]
559
654
  }
560
655
  }
561
656
  }, {
@@ -570,11 +665,18 @@ export function convertOperationsToPipeline(operations) {
570
665
  const parentJoin = processedOperations.find(op => (op instanceof Join || op instanceof JoinThrough) && op.as === parentAlias);
571
666
  if (parentJoin) {
572
667
  pipeline.push({
573
- $set: {
574
- [`_joinData.${parentAlias}`]: {
668
+ $addFields: {
669
+ _joinData: {
575
670
  $mergeObjects: [
576
- { $ifNull: [`$_joinData.${parentAlias}`, {}] },
577
- { [operation.as]: `$_joinData.${operation.as}` }
671
+ { $ifNull: ['$_joinData', {}] },
672
+ {
673
+ [parentAlias]: {
674
+ $mergeObjects: [
675
+ { $ifNull: [`$_joinData.${parentAlias}`, {}] },
676
+ { [operation.as]: `$_joinData.${operation.as}` }
677
+ ]
678
+ }
679
+ }
578
680
  ]
579
681
  }
580
682
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loomcore/api",
3
- "version": "0.1.91",
3
+ "version": "0.1.92",
4
4
  "private": false,
5
5
  "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
6
6
  "scripts": {