@ronin/compiler 0.11.5 → 0.11.6-leo-ron-1071-experimental-247

package/dist/index.d.ts

@@ -5998,16 +5998,18 @@ type NativeRecord = Record<string, unknown> & {
 };
 type SingleRecordResult<T = NativeRecord> = {
     record: T | null;
+    modelFields: Record<ModelField['slug'], ModelField['type']>;
 };
-type MultipleRecordResult = {
-    records: Array<NativeRecord>;
+type MultipleRecordResult<T = NativeRecord> = {
+    records: Array<T>;
     moreAfter?: string;
     moreBefore?: string;
+    modelFields: Record<ModelField['slug'], ModelField['type']>;
 };
 type AmountResult = {
     amount: number;
 };
-type Result = SingleRecordResult | MultipleRecordResult | AmountResult;
+type Result<T = NativeRecord> = SingleRecordResult<T> | MultipleRecordResult<T> | AmountResult;
 
 /**
  * A list of placeholders that can be located inside queries after those queries were

package/dist/index.js

@@ -1599,8 +1599,7 @@ var Transaction = class {
     const modelListWithPresets = modelList.map((model) => {
       return addDefaultModelPresets(modelList, model);
     });
-    const dependencyStatements = [];
-    const mainStatements = [];
+    const statements = [];
     for (const query of queries) {
       const result = compileQueryInput(
         query,
@@ -1608,12 +1607,11 @@ var Transaction = class {
         options?.inlineParams ? null : [],
         { expandColumns: options?.expandColumns }
       );
-      dependencyStatements.push(...result.dependencies);
-      mainStatements.push(result.main);
+      statements.push(...result.dependencies, result.main);
       this.fields.push(result.loadedFields);
     }
     this.models = modelListWithPresets;
-    return [...dependencyStatements, ...mainStatements];
+    return statements;
   };
   formatRows(fields, rows, single) {
     const records = [];
@@ -1669,19 +1667,26 @@ var Transaction = class {
     });
     return normalizedResults.map((rows, index) => {
       const query = this.queries.at(-index);
-      const fields = this.fields.at(-index);
+      const rawModelFields = this.fields.at(-index);
       const { queryType, queryModel, queryInstructions } = splitQuery(query);
       const model = getModelBySlug(this.models, queryModel);
+      const modelFields = Object.fromEntries(
+        model.fields.map((field) => [field.slug, field.type])
+      );
       if (queryType === "count") {
         return { amount: rows[0][0] };
       }
       const single = queryModel !== model.pluralSlug;
       if (single) {
-        return { record: rows[0] ? this.formatRows(fields, rows, single) : null };
+        return {
+          record: rows[0] ? this.formatRows(rawModelFields, rows, single) : null,
+          modelFields
+        };
       }
       const pageSize = queryInstructions?.limitedTo;
       const output = {
-        records: this.formatRows(fields, rows, single)
+        records: this.formatRows(rawModelFields, rows, single),
+        modelFields
       };
       if (pageSize && output.records.length > 0) {
         if (output.records.length > pageSize) {

package/package.json

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