@ronin/compiler 0.7.0 → 0.7.1

package/dist/index.js

@@ -1127,16 +1127,25 @@ var handleSelecting = (model, statementParams, instructions) => {
     return getFieldFromModel(model, slug, "selecting").fieldSelector;
   }).join(", ") : "*";
   if (instructions.including) {
-    const filteredObject = Object.entries(instructions.including).filter(([_, value]) => {
+    const filteredObject = Object.entries(instructions.including).map(([key, value]) => {
       const symbol = getSymbol(value);
-      const hasQuery = symbol?.type === "query";
-      if (hasQuery) isJoining = true;
-      return !hasQuery;
-    });
+      if (symbol) {
+        if (symbol.type === "query") {
+          isJoining = true;
+          return null;
+        }
+        if (symbol.type === "expression") {
+          value = parseFieldExpression(model, "including", symbol.value);
+        }
+      }
+      return [key, value];
+    }).filter((entry) => entry !== null);
     const newObjectEntries = Object.entries(flatten(Object.fromEntries(filteredObject)));
     if (newObjectEntries.length > 0) {
       statement += ", ";
       statement += newObjectEntries.map(([key, value]) => {
+        if (typeof value === "string" && value.startsWith('"'))
+          return `(${value}) as "${key}"`;
         return `${prepareStatementValue(statementParams, value)} as "${key}"`;
       }).join(", ");
     }

package/package.json

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