@ronin/compiler 0.8.8-leo-ron-1083-experimental-193 → 0.8.8-leo-ron-1083-experimental-194

package/dist/index.d.ts

@@ -5995,7 +5995,7 @@ type Result = SingleRecordResult | MultipleRecordResult | AmountResult;
 
 declare class Transaction {
     statements: Array<Statement>;
-    models: Array<PublicModel>;
+    models: Array<Model>;
     private queries;
     constructor(queries: Array<Query>, options?: Parameters<typeof this.compileQueries>[2] & {
         models?: Array<PublicModel>;
@@ -6010,6 +6010,7 @@ declare class Transaction {
      * @returns The composed SQL statements.
      */
     private compileQueries;
+    private formatRecord;
     formatOutput(results: Array<Array<Row>>): Array<Result>;
 }
 

package/dist/index.js

@@ -1353,12 +1353,11 @@ var compileQueryInput = (query, models, statementParams, options) => {
 // src/index.ts
 var Transaction = class {
   statements;
-  models;
+  models = [];
   queries;
   constructor(queries, options) {
     const models = options?.models || [];
     this.statements = this.compileQueries(queries, models, options);
-    this.models = models;
     this.queries = queries;
   }
   /**
@@ -1395,17 +1394,27 @@ var Transaction = class {
       dependencyStatements.push(...result.dependencies);
       mainStatements.push(result.main);
     }
+    this.models = modelListWithPresets;
     return [...dependencyStatements, ...mainStatements];
   };
+  formatRecord(model, record) {
+    const formattedRecord = { ...record };
+    for (const key in record) {
+      const { field } = getFieldFromModel(model, key, "to");
+      if (field.type === "json") {
+        formattedRecord[key] = JSON.parse(record[key]);
+        continue;
+      }
+      formattedRecord[key] = record[key];
+    }
+    return expand(formattedRecord);
+  }
   formatOutput(results) {
     return results.map((result, index) => {
       const query = this.queries.at(-index);
-      const { queryType, queryModel } = splitQuery(query);
+      const { queryModel } = splitQuery(query);
       const model = getModelBySlug(this.models, queryModel);
-      const single = queryModel !== model.pluralSlug;
-      if (single) return { record: result[0] };
-      if (queryType === "count") return { amount: result[0] };
-      return { records: result };
+      return { record: this.formatRecord(model, result[0]) };
     });
   }
 };

package/package.json

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