@ronin/compiler 0.11.7-leo-ron-1071-experimental-248 → 0.11.7

package/dist/index.d.ts

@@ -6064,7 +6064,8 @@ interface TransactionOptions {
 declare class Transaction {
     statements: Array<Statement>;
     models: Array<Model>;
-    private internalStatements;
+    private queries;
+    private fields;
     constructor(queries: Array<Query>, options?: TransactionOptions);
     /**
      * Composes SQL statements for the provided RONIN queries.

package/dist/index.js

@@ -1570,12 +1570,14 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
 
 // src/index.ts
 var Transaction = class {
-  statements = [];
+  statements;
   models = [];
-  internalStatements = [];
+  queries;
+  fields = [];
   constructor(queries, options) {
     const models = options?.models || [];
-    this.compileQueries(queries, models, options);
+    this.statements = this.compileQueries(queries, models, options);
+    this.queries = queries;
   }
   /**
    * Composes SQL statements for the provided RONIN queries.
@@ -1605,15 +1607,8 @@ var Transaction = class {
         options?.inlineParams ? null : [],
         { expandColumns: options?.expandColumns }
       );
-      const subStatements = [...result.dependencies, result.main];
-      this.statements.push(...subStatements);
-      this.internalStatements.push(
-        ...subStatements.map((statement) => ({
-          ...statement,
-          query,
-          fields: result.loadedFields
-        }))
-      );
+      statements.push(...result.dependencies, result.main);
+      this.fields.push(result.loadedFields);
     }
     this.models = modelListWithPresets;
     return statements;
@@ -1660,16 +1655,19 @@ var Transaction = class {
    * RONIN record, an array of RONIN records, or a RONIN count result.
    */
   formatResults(results, raw = true) {
-    const normalizedResults = raw ? results : results.map((rows) => {
+    const relevantResults = results.filter((_, index) => {
+      return this.statements[index].returning;
+    });
+    const normalizedResults = raw ? relevantResults : relevantResults.map((rows) => {
       return rows.map((row) => {
         if (Array.isArray(row)) return row;
         if (row["COUNT(*)"]) return [row["COUNT(*)"]];
         return Object.values(row);
       });
     });
-    const formattedResults = normalizedResults.map((rows, index) => {
-      const { returning, query, fields: rawModelFields } = this.internalStatements[index];
-      if (!returning) return null;
+    return normalizedResults.map((rows, index) => {
+      const query = this.queries.at(-index);
+      const rawModelFields = this.fields.at(-index);
       const { queryType, queryModel, queryInstructions } = splitQuery(query);
       const model = getModelBySlug(this.models, queryModel);
       const modelFields = Object.fromEntries(
@@ -1721,7 +1719,6 @@ var Transaction = class {
       }
       return output;
     });
-    return formattedResults.filter((result) => result !== null);
   }
 };
 var CLEAN_ROOT_MODEL = omit(ROOT_MODEL, ["system"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.11.7-leo-ron-1071-experimental-248",
+  "version": "0.11.7",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {