@ronin/compiler 0.13.14 → 0.14.0

package/dist/index.d.ts

@@ -372,8 +372,8 @@ declare class Transaction {
     statements: Array<Statement>;
     models: Array<Model>;
     constructor(queries: Array<Query>, options?: TransactionOptions);
-    formatResults<Record>(results: Array<Array<RawRow>>, raw?: true): Array<Result<Record>>;
     formatResults<Record>(results: Array<Array<ObjectRow>>, raw?: false): Array<Result<Record>>;
+    formatResults<Record>(results: Array<Array<RawRow>>, raw?: true): Array<Result<Record>>;
 }
 
 declare const CLEAN_ROOT_MODEL: PublicModel;

package/dist/index.js

@@ -125,7 +125,6 @@ var getProperty = (obj, path) => {
   return path.split(".").reduce((acc, key) => acc?.[key], obj);
 };
 var setProperty = (obj, path, value) => {
-  if (!obj) return setProperty({}, path, value);
   const segments = path.split(/[.[\]]/g).filter((x) => !!x.trim());
   const _set = (node) => {
     if (segments.length > 1) {
@@ -139,9 +138,7 @@ var setProperty = (obj, path, value) => {
       node[segments[0]] = value;
     }
   };
-  const cloned = structuredClone(obj);
-  _set(cloned);
-  return cloned;
+  _set(obj);
 };
 var splitQuery = (query) => {
   const queryType = Object.keys(query)[0];
@@ -302,7 +299,7 @@ var handleFor = (model, instructions) => {
 };
 
 // src/instructions/including.ts
-var handleIncluding = (models, model, statementParams, instruction) => {
+var handleIncluding = (models, model, statementParams, single, instruction) => {
   let statement = "";
   let tableSubQuery;
   for (const ephemeralFieldSlug in instruction) {
@@ -315,10 +312,10 @@ var handleIncluding = (models, model, statementParams, instruction) => {
     let joinType = "LEFT";
     let relatedTableSelector = `"${relatedModel.table}"`;
     const tableAlias = composeIncludedTableAlias(ephemeralFieldSlug);
-    const single = queryModel !== relatedModel.pluralSlug;
+    const subSingle = queryModel !== relatedModel.pluralSlug;
     if (!modifiableQueryInstructions?.with) {
       joinType = "CROSS";
-      if (single) {
+      if (subSingle) {
         if (!modifiableQueryInstructions) modifiableQueryInstructions = {};
         modifiableQueryInstructions.limitedTo = 1;
       }
@@ -350,7 +347,9 @@ var handleIncluding = (models, model, statementParams, instruction) => {
       );
       statement += ` ON (${subStatement})`;
     }
-    if (!single) tableSubQuery = `SELECT * FROM "${model.table}" LIMIT 1`;
+    if (single && !subSingle) {
+      tableSubQuery = `SELECT * FROM "${model.table}" LIMIT 1`;
+    }
   }
   return { statement, tableSubQuery };
 };
@@ -392,7 +391,7 @@ var handleOrderedBy = (model, instruction) => {
 };
 
 // src/instructions/selecting.ts
-var handleSelecting = (models, model, statementParams, instructions, options) => {
+var handleSelecting = (models, model, statementParams, single, instructions, options) => {
   let loadedFields = [];
   let expandColumns = false;
   let statement = "*";
@@ -408,8 +407,8 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
         isJoining = true;
         expandColumns = Boolean(options?.expandColumns || queryInstructions?.selecting);
         const tableAlias = composeIncludedTableAlias(key);
-        const single = queryModel !== subQueryModel.pluralSlug;
-        if (!single) {
+        const subSingle = queryModel !== subQueryModel.pluralSlug;
+        if (single && !subSingle) {
           model.tableAlias = `sub_${model.table}`;
         }
         const queryModelFields = queryInstructions?.selecting ? subQueryModel.fields.filter((field) => {
@@ -421,7 +420,13 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
           })
         );
         for (const field of queryModelFields) {
-          loadedFields.push({ ...field, parentField: key });
+          loadedFields.push({
+            ...field,
+            parentField: {
+              slug: key,
+              single: subSingle
+            }
+          });
           if (expandColumns) {
             const newValue2 = parseFieldExpression(
               { ...subQueryModel, tableAlias },
@@ -608,6 +613,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     models,
     model,
     statementParams,
+    single,
     {
       selecting: instructions?.selecting,
       including: instructions?.including
@@ -638,6 +644,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
       models,
       model,
       statementParams,
+      single,
       instructions?.including
     );
     if (tableSubQuery) {
@@ -1903,38 +1910,46 @@ var Transaction = class {
   };
   #formatRows(fields, rows, single, isMeta) {
     const records = [];
-    for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
-      const row = rows[rowIndex];
-      for (let valueIndex = 0; valueIndex < row.length; valueIndex++) {
-        const value = row[valueIndex];
-        const field = fields[valueIndex];
+    for (const row of rows) {
+      const record = fields.reduce((acc, field, fieldIndex) => {
         let newSlug = field.slug;
-        let newValue = value;
+        let newValue = row[fieldIndex];
+        if (field.parentField) {
+          const arrayKey = field.parentField.single ? "" : "[0]";
+          newSlug = `${field.parentField.slug}${arrayKey}.${field.slug}`;
+        }
         if (field.type === "json") {
-          newValue = JSON.parse(value);
+          newValue = JSON.parse(newValue);
         } else if (field.type === "boolean") {
-          newValue = Boolean(value);
-        }
-        const parentFieldSlug = field.parentField;
-        let usableRowIndex = rowIndex;
-        if (parentFieldSlug) {
-          if (rows.length === 1) {
-            newSlug = `${parentFieldSlug}.${field.slug}`;
-          } else {
-            newSlug = `${parentFieldSlug}[${rowIndex}].${field.slug}`;
-            usableRowIndex = 0;
-          }
+          newValue = Boolean(newValue);
         }
         if (isMeta && PLURAL_MODEL_ENTITIES_VALUES.includes(newSlug)) {
           newValue = newValue ? Object.entries(newValue).map(([slug, attributes]) => {
             return { slug, ...attributes };
           }) : [];
         }
-        records[usableRowIndex] = setProperty(
-          records[usableRowIndex],
-          newSlug,
-          newValue
-        );
+        setProperty(acc, newSlug, newValue);
+        return acc;
+      }, {});
+      const existingRecord = record.id ? records.find((existingRecord2) => {
+        return existingRecord2.id === record.id;
+      }) : null;
+      if (!existingRecord) {
+        records.push(record);
+        continue;
+      }
+      const joinFields = fields.reduce(
+        (acc, field) => {
+          if (!field.parentField) return acc;
+          const { single: single2, slug } = field.parentField;
+          return single2 || acc.includes(slug) ? acc : acc.concat([slug]);
+        },
+        []
+      );
+      for (const parentField of joinFields) {
+        const currentValue = existingRecord[parentField];
+        const newValue = record[parentField];
+        currentValue.push(...newValue);
       }
     }
     return single ? records[0] : records;
@@ -1979,13 +1994,13 @@ var Transaction = class {
         const single = queryModel !== model.pluralSlug;
         if (single) {
           return {
-            record: rows[0] ? this.#formatRows(rawModelFields, rows, single, isMeta) : null,
+            record: rows[0] ? this.#formatRows(rawModelFields, rows, true, isMeta) : null,
             modelFields
           };
         }
         const pageSize = queryInstructions?.limitedTo;
         const output = {
-          records: this.#formatRows(rawModelFields, rows, single, isMeta),
+          records: this.#formatRows(rawModelFields, rows, false, isMeta),
           modelFields
         };
         if (pageSize && output.records.length > 0) {

package/package.json

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