@ronin/compiler 0.14.9-leo-ron-1099-1-experimental-342 → 0.14.9-leo-ron-1099-1-experimental-344

package/README.md

@@ -70,7 +70,7 @@ executed and their results can be formatted by the compiler as well:
 
 ```typescript
 // Passing `rawResults` (rows being arrays of values) provided by the database (ideal)
-const results: Array<Result> = transaction.formatResults(rawResults);
+const results: Array<Result> = transaction.formatResults(rawResults, true);
 
 // Passing `objectResults` (rows being objects) provided by a driver
 const results: Array<Result> = transaction.formatResults(objectResults, false);

package/dist/index.js

@@ -25,12 +25,13 @@ var CURRENT_TIME_EXPRESSION = {
 };
 var MOUNTING_PATH_SUFFIX = /(.*?)(\{(\d+)\})?$/;
 var composeMountingPath = (single, key, mountingPath) => {
-  const subMountingPath = key === "ronin_root" ? mountingPath ? mountingPath.replace(
-    MOUNTING_PATH_SUFFIX,
-    (_, p, __, n) => `${p}{${n ? +n + 1 : 1}}`
-  ) : void 0 : `${mountingPath ? `${mountingPath}.` : ""}${single ? key : `${key}[0]`}`;
-  const tableAlias = `including_${subMountingPath || key}`;
-  return { subMountingPath, tableAlias };
+  if (key === "ronin_root") {
+    return mountingPath ? mountingPath.replace(
+      MOUNTING_PATH_SUFFIX,
+      (_, p, __, n) => `${p}{${n ? +n + 1 : 1}}`
+    ) : key;
+  }
+  return `${mountingPath ? `${mountingPath}.` : ""}${single ? key : `${key}[0]`}`;
 };
 var MODEL_ENTITY_ERROR_CODES = {
   field: "FIELD_NOT_FOUND",
@@ -318,11 +319,12 @@ var handleIncluding = (models, model, statementParams, single, instruction, opti
     let joinType = "LEFT";
     let relatedTableSelector = `"${relatedModel.table}"`;
     const subSingle = queryModel !== relatedModel.pluralSlug;
-    const { tableAlias, subMountingPath } = composeMountingPath(
+    const subMountingPath = composeMountingPath(
       subSingle,
       ephemeralFieldSlug,
       options.mountingPath
     );
+    const tableAlias = `including_${subMountingPath}`;
     if (!modifiableQueryInstructions?.with) {
       joinType = "CROSS";
       if (subSingle) {
@@ -419,7 +421,7 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
     instructions.selecting
   ).filter((field) => !(field.type === "link" && field.kind === "many")).map((field) => {
     const newField = { ...field, mountingPath: field.slug };
-    if (options.mountingPath) {
+    if (options.mountingPath && options.mountingPath !== "ronin_root") {
       newField.mountingPath = `${options.mountingPath.replace(/\{\d+\}/g, "")}.${field.slug}`;
     }
     return newField;
@@ -442,14 +444,10 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
         const subSingle = queryModel !== subQueryModel.pluralSlug;
         if (!model.tableAlias)
           model.tableAlias = single && !subSingle ? `sub_${model.table}` : model.table;
-        const { tableAlias, subMountingPath } = composeMountingPath(
-          subSingle,
-          key,
-          options.mountingPath
-        );
+        const subMountingPath = composeMountingPath(subSingle, key, options.mountingPath);
         const { columns: nestedColumns, selectedFields: nestedSelectedFields } = handleSelecting(
           models,
-          { ...subQueryModel, tableAlias },
+          { ...subQueryModel, tableAlias: `including_${subMountingPath}` },
           statementParams,
           subSingle,
           {
@@ -637,8 +635,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     {
       selecting: instructions?.selecting,
       including: instructions?.including
-    },
-    options
+    }
   );
   let statement = "";
   switch (queryType) {
@@ -2078,17 +2075,17 @@ var Transaction = class {
    *
    * @param results - A list of results from the database, where each result is an array
    * of rows.
-   * @param raw - By default, rows are expected to be arrays of values, which is how SQL
-   * databases return rows by default. If the driver being used returns rows as objects
-   * instead, this option should be set to `false`.
+   * @param raw - By default, rows are expected to be objects. If the driver being used
+   * returns rows as arrays of values (which is how SQL databases return rows directly),
+   * this option should be set to `true`.
    *
    * @returns A list of formatted RONIN results, where each result is either a single
    * RONIN record, an array of RONIN records, or a RONIN count result.
    */
-  formatResults(results, raw = true) {
-    const normalizedResults = raw ? results : results.map((rows) => {
-      return rows.map((row, index) => {
-        const { query } = this.#internalStatements[index];
+  formatResults(results, raw = false) {
+    const normalizedResults = raw ? results : results.map((rows, index) => {
+      const { query } = this.#internalStatements[index];
+      return rows.map((row) => {
         if (Array.isArray(row)) return row;
         if (query.count) return [row.amount];
         return Object.values(row);

package/package.json

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