@ronin/compiler 0.11.4-leo-ron-1083-2-experimental-238 → 0.11.4-leo-ron-1083-2-experimental-240

package/dist/index.js

@@ -1209,6 +1209,7 @@ var handleOrderedBy = (model, instruction) => {
 // src/instructions/selecting.ts
 var handleSelecting = (models, model, statementParams, instructions, options) => {
   let loadedFields = [];
+  let expandColumns = false;
   let statement = "*";
   let isJoining = false;
   if (instructions.including) {
@@ -1217,9 +1218,10 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
     for (const [key, value] of Object.entries(flatObject)) {
       const symbol = getSymbol(value);
       if (symbol?.type === "query") {
-        isJoining = true;
         const { queryModel, queryInstructions } = splitQuery(symbol.value);
         const subQueryModel = getModelBySlug(models, queryModel);
+        isJoining = true;
+        expandColumns = Boolean(options?.expandColumns || queryInstructions?.selecting);
         const tableAlias = composeIncludedTableAlias(key);
         const single = queryModel !== subQueryModel.pluralSlug;
         if (!single) {
@@ -1227,10 +1229,15 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
         }
         const queryModelFields = queryInstructions?.selecting ? subQueryModel.fields.filter((field) => {
           return queryInstructions.selecting?.includes(field.slug);
-        }) : subQueryModel.fields;
+        }) : (
+          // Exclude link fields with cardinality "many", since those don't exist as columns.
+          subQueryModel.fields.filter((field) => {
+            return !(field.type === "link" && field.kind === "many");
+          })
+        );
         for (const field of queryModelFields) {
           loadedFields.push({ ...field, parentField: key });
-          if (options?.expandColumns) {
+          if (expandColumns) {
             const newValue2 = parseFieldExpression(
               { ...subQueryModel, tableAlias },
               "including",
@@ -1254,7 +1261,6 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
       });
     }
   }
-  const expandColumns = isJoining && options?.expandColumns;
   if (expandColumns) {
     instructions.selecting = model.fields.filter((field) => !(field.type === "link" && field.kind === "many")).map((field) => field.slug);
   }
@@ -1272,7 +1278,12 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
     }).join(", ");
     loadedFields = [...selectedFields, ...loadedFields];
   } else {
-    loadedFields = [...model.fields, ...loadedFields];
+    loadedFields = [
+      ...model.fields.filter(
+        (field) => !(field.type === "link" && field.kind === "many")
+      ),
+      ...loadedFields
+    ];
   }
   if (instructions.including && Object.keys(instructions.including).length > 0) {
     statement += ", ";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.11.4-leo-ron-1083-2-experimental-238",
+  "version": "0.11.4-leo-ron-1083-2-experimental-240",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {