@loomcore/api 0.1.103 → 0.1.105

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.
@@ -8,13 +8,20 @@ function convertFieldToSnakeCase(field) {
8
8
  }
9
9
  return toSnakeCase(field);
10
10
  }
11
- function resolveLocalRef(localField, mainTableName) {
11
+ function resolveLocalRef(localField, mainTableName, operations, currentIndex) {
12
12
  if (!localField.includes('.')) {
13
13
  const snake = convertFieldToSnakeCase(localField);
14
14
  return `"${mainTableName}"."${snake}"`;
15
15
  }
16
16
  const [alias, field] = localField.split('.');
17
17
  const snake = convertFieldToSnakeCase(field);
18
+ const priorOps = operations.slice(0, currentIndex);
19
+ const leftJoinMany = priorOps.find((op) => op instanceof LeftJoinMany && op.as === alias);
20
+ if (leftJoinMany) {
21
+ const castType = field === '_id' || snake === '_id' ? '::int' : '::text';
22
+ const elemAlias = `_elem_${alias}`;
23
+ return `(SELECT (${elemAlias}->>'${snake}')${castType} FROM jsonb_array_elements("${alias}") AS ${elemAlias})`;
24
+ }
18
25
  return `${alias}."${snake}"`;
19
26
  }
20
27
  async function getTableColumns(client, tableName) {
@@ -51,17 +58,30 @@ export async function buildSelectClause(client, mainTableName, mainTableAlias, o
51
58
  joinSelects.push(`${join.as}."${col}" AS "${join.as}__${col}"`);
52
59
  }
53
60
  }
54
- for (const joinMany of leftJoinManyOperations) {
55
- const enrichment = findEnrichmentTarget(joinMany, operations);
56
- if (enrichment) {
57
- continue;
58
- }
61
+ for (let i = 0; i < leftJoinManyOperations.length; i++) {
62
+ const joinMany = leftJoinManyOperations[i];
59
63
  const manyColumns = await getTableColumns(client, joinMany.from);
60
64
  const foreignSnake = convertFieldToSnakeCase(joinMany.foreignField);
61
- const localRef = resolveLocalRef(joinMany.localField, mainTableName);
65
+ const currentOpIndex = operations.indexOf(joinMany);
66
+ const localRef = resolveLocalRef(joinMany.localField, mainTableName, operations, currentOpIndex);
62
67
  const subAlias = `_sub_${joinMany.as}`;
63
68
  const objParts = manyColumns.map(c => `'${c.replace(/'/g, "''")}', ${subAlias}."${c}"`).join(', ');
64
- const subquery = `(SELECT COALESCE(jsonb_agg(jsonb_build_object(${objParts})), '[]'::jsonb) FROM "${joinMany.from}" AS ${subAlias} WHERE ${subAlias}."${foreignSnake}" = ${localRef})`;
69
+ const priorOps = operations.slice(0, currentOpIndex);
70
+ const referencedLeftJoinMany = joinMany.localField.includes('.')
71
+ ? priorOps.find((op) => op instanceof LeftJoinMany && op.as === joinMany.localField.split('.')[0])
72
+ : null;
73
+ let whereClause;
74
+ if (referencedLeftJoinMany) {
75
+ const [prevAlias, fieldName] = joinMany.localField.split('.');
76
+ const prevFieldSnake = convertFieldToSnakeCase(fieldName);
77
+ const prevLocalRef = resolveLocalRef(referencedLeftJoinMany.localField, mainTableName, operations, operations.indexOf(referencedLeftJoinMany));
78
+ const prevForeignSnake = convertFieldToSnakeCase(referencedLeftJoinMany.foreignField);
79
+ whereClause = `${subAlias}."${foreignSnake}" IN (SELECT "${prevFieldSnake}" FROM "${referencedLeftJoinMany.from}" WHERE "${referencedLeftJoinMany.from}"."${prevForeignSnake}" = ${prevLocalRef})`;
80
+ }
81
+ else {
82
+ whereClause = `${subAlias}."${foreignSnake}" = ${localRef}`;
83
+ }
84
+ const subquery = `(SELECT COALESCE(jsonb_agg(jsonb_build_object(${objParts})), '[]'::jsonb) FROM "${joinMany.from}" AS ${subAlias} WHERE ${whereClause})`;
65
85
  joinSelects.push(`${subquery} AS "${joinMany.as}"`);
66
86
  }
67
87
  const allSelects = [...mainSelects, ...joinSelects];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loomcore/api",
3
- "version": "0.1.103",
3
+ "version": "0.1.105",
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": {