@ronin/compiler 0.12.4 → 0.12.5

package/dist/index.d.ts

@@ -15671,8 +15671,8 @@ declare class Transaction {
      */
     private compileQueries;
     private formatRows;
-    formatResults(results: Array<Array<RawRow>>, raw?: true): Array<Result>;
-    formatResults(results: Array<Array<ObjectRow>>, raw?: false): Array<Result>;
+    formatResults<Record>(results: Array<Array<RawRow>>, raw?: true): Array<Result<Record>>;
+    formatResults<Record>(results: Array<Array<ObjectRow>>, raw?: false): Array<Result<Record>>;
 }
 
 declare const CLEAN_ROOT_MODEL: PublicModel;

package/dist/index.js

@@ -675,6 +675,7 @@ var PLURAL_MODEL_ENTITIES = {
   trigger: "triggers",
   preset: "presets"
 };
+var PLURAL_MODEL_ENTITIES_VALUES = Object.values(PLURAL_MODEL_ENTITIES);
 var formatModelEntity = (type, entities) => {
   const entries = entities?.map((entity) => {
     const { slug, ...rest } = "slug" in entity ? entity : { slug: `${type}Slug`, ...entity };
@@ -1630,7 +1631,7 @@ var Transaction = class {
     this.models = modelListWithPresets;
     return statements;
   };
-  formatRows(fields, rows, single) {
+  formatRows(fields, rows, single, isMeta) {
     const records = [];
     for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
       const row = rows[rowIndex];
@@ -1654,7 +1655,16 @@ var Transaction = class {
             usableRowIndex = 0;
           }
         }
-        records[usableRowIndex] = setProperty(records[usableRowIndex], newSlug, newValue);
+        if (isMeta && PLURAL_MODEL_ENTITIES_VALUES.includes(newSlug)) {
+          newValue = Object.entries(newValue).map(([slug, attributes]) => {
+            return { slug, ...attributes };
+          });
+        }
+        records[usableRowIndex] = setProperty(
+          records[usableRowIndex],
+          newSlug,
+          newValue
+        );
       }
     }
     return single ? records[0] : records;
@@ -1679,60 +1689,67 @@ var Transaction = class {
         return Object.values(row);
       });
     });
-    const formattedResults = normalizedResults.map((rows, index) => {
-      const { returning, query, fields: rawModelFields } = this.internalStatements[index];
-      if (!returning) return null;
-      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(rawModelFields, rows, single) : null,
+    const formattedResults = normalizedResults.map(
+      (rows, index) => {
+        const {
+          returning,
+          query,
+          fields: rawModelFields
+        } = this.internalStatements[index];
+        if (!returning) return null;
+        const { queryType, queryModel, queryInstructions } = splitQuery(query);
+        const model = getModelBySlug(this.models, queryModel);
+        const isMeta = queryModel === "model" || queryModel === "models";
+        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(rawModelFields, rows, single, isMeta) : null,
+            modelFields
+          };
+        }
+        const pageSize = queryInstructions?.limitedTo;
+        const output = {
+          records: this.formatRows(rawModelFields, rows, single, isMeta),
           modelFields
         };
-      }
-      const pageSize = queryInstructions?.limitedTo;
-      const output = {
-        records: this.formatRows(rawModelFields, rows, single),
-        modelFields
-      };
-      if (pageSize && output.records.length > 0) {
-        if (output.records.length > pageSize) {
-          if (queryInstructions?.before) {
-            output.records.shift();
-          } else {
-            output.records.pop();
+        if (pageSize && output.records.length > 0) {
+          if (output.records.length > pageSize) {
+            if (queryInstructions?.before) {
+              output.records.shift();
+            } else {
+              output.records.pop();
+            }
+            const direction = queryInstructions?.before ? "moreBefore" : "moreAfter";
+            const lastRecord = output.records.at(
+              direction === "moreAfter" ? -1 : 0
+            );
+            output[direction] = generatePaginationCursor(
+              model,
+              queryInstructions.orderedBy,
+              lastRecord
+            );
+          }
+          if (queryInstructions?.before || queryInstructions?.after) {
+            const direction = queryInstructions?.before ? "moreAfter" : "moreBefore";
+            const firstRecord = output.records.at(
+              direction === "moreAfter" ? -1 : 0
+            );
+            output[direction] = generatePaginationCursor(
+              model,
+              queryInstructions.orderedBy,
+              firstRecord
+            );
           }
-          const direction = queryInstructions?.before ? "moreBefore" : "moreAfter";
-          const lastRecord = output.records.at(
-            direction === "moreAfter" ? -1 : 0
-          );
-          output[direction] = generatePaginationCursor(
-            model,
-            queryInstructions.orderedBy,
-            lastRecord
-          );
-        }
-        if (queryInstructions?.before || queryInstructions?.after) {
-          const direction = queryInstructions?.before ? "moreAfter" : "moreBefore";
-          const firstRecord = output.records.at(
-            direction === "moreAfter" ? -1 : 0
-          );
-          output[direction] = generatePaginationCursor(
-            model,
-            queryInstructions.orderedBy,
-            firstRecord
-          );
         }
+        return output;
       }
-      return output;
-    });
+    );
     return formattedResults.filter((result) => result !== null);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.12.4",
+  "version": "0.12.5",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {