@ronin/compiler 0.10.0-leo-ron-1083-experimental-207 → 0.10.1-leo-ron-1083-experimental-208

package/dist/index.js

@@ -1212,6 +1212,11 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
   if (symbol?.type === "query") {
     let { queryModel: subQueryModelSlug, queryInstructions: subQueryInstructions } = splitQuery(symbol.value);
     const subQueryModel = getModelBySlug(models, subQueryModelSlug);
+    if (subQueryInstructions?.selecting) {
+      const currentFields = new Set(subQueryInstructions.selecting);
+      currentFields.add("id");
+      subQueryInstructions.selecting = Array.from(currentFields);
+    }
     const subQuerySelectedFields = subQueryInstructions?.selecting;
     const subQueryIncludedFields = subQueryInstructions?.including;
     const subQueryFields = [
@@ -1234,7 +1239,19 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
         ...subQueryInstructions.including
       };
     }
-    return compileQueryInput(symbol.value, models, statementParams).main.statement;
+    let statement2 = "";
+    if (subQuerySelectedFields) {
+      const selectedFields = [
+        ...subQueryFields,
+        ...defaultFieldsToAdd.map(([key]) => key)
+      ];
+      const columns = selectedFields.map((field) => {
+        return getFieldFromModel(model, field, "to").fieldSelector;
+      });
+      statement2 = `(${columns.join(", ")}) `;
+    }
+    statement2 += compileQueryInput(symbol.value, models, statementParams).main.statement;
+    return statement2;
   }
   Object.assign(toInstruction, defaultFields);
   for (const fieldSlug in toInstruction) {
@@ -1498,11 +1515,22 @@ var Transaction = class {
     return expand(formattedRecord);
   }
   prepareResults(results) {
-    return results.map((result, index) => {
+    const relevantResults = results.filter((_, index) => {
+      return this.statements[index].returning;
+    });
+    return relevantResults.map((result, index) => {
       const query = this.queries.at(-index);
       const { queryModel } = splitQuery(query);
       const model = getModelBySlug(this.models, queryModel);
-      return { record: this.formatRecord(model, result[0]) };
+      const single = queryModel !== model.pluralSlug;
+      if (single) {
+        return { record: this.formatRecord(model, result[0]) };
+      }
+      return {
+        records: result.map((resultItem) => {
+          return this.formatRecord(model, resultItem);
+        })
+      };
     });
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.10.0-leo-ron-1083-experimental-207",
+  "version": "0.10.1-leo-ron-1083-experimental-208",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {