@ronin/compiler 0.14.0-leo-ron-1099-1-experimental-313 → 0.14.0-leo-ron-1099-1-experimental-314

package/dist/index.js

@@ -419,12 +419,16 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
   const joinedSelectedFields = [];
   const joinedColumns = [];
   if (instructions.including) {
+    const symbol = getSymbol(instructions.including);
+    if (symbol?.type === "query") {
+      instructions.including.ronin_root = { ...instructions.including };
+      delete instructions.including[QUERY_SYMBOLS.QUERY];
+    }
     const flatObject = flatten(instructions.including);
-    instructions.including = {};
     for (const [key, value] of Object.entries(flatObject)) {
-      const symbol = getSymbol(value);
-      if (symbol?.type === "query") {
-        const { queryModel, queryInstructions } = splitQuery(symbol.value);
+      const symbol2 = getSymbol(value);
+      if (symbol2?.type === "query") {
+        const { queryModel, queryInstructions } = splitQuery(symbol2.value);
         const subQueryModel = getModelBySlug(models, queryModel);
         isJoining = true;
         if (queryInstructions?.selecting) options.expandColumns = true;
@@ -432,7 +436,7 @@ 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 subMountingPath = `${options?.mountingPath ? `${options?.mountingPath}.` : ""}${subSingle ? key : `${key}[0]`}`;
+        const subMountingPath = key === "ronin_root" ? options.mountingPath : `${options?.mountingPath ? `${options?.mountingPath}.` : ""}${subSingle ? key : `${key}[0]`}`;
         const { columns: nestedColumns, selectedFields: nestedSelectedFields } = handleSelecting(
           models,
           { ...subQueryModel, tableAlias },
@@ -449,8 +453,8 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
         continue;
       }
       let mountedValue = value;
-      if (symbol?.type === "expression") {
-        mountedValue = `(${parseFieldExpression(model, "including", symbol.value)})`;
+      if (symbol2?.type === "expression") {
+        mountedValue = `(${parseFieldExpression(model, "including", symbol2.value)})`;
       } else {
         mountedValue = prepareStatementValue(statementParams, value);
       }

package/package.json

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