@ronin/compiler 0.11.4 → 0.11.5-leo-ron-1083-experimental-244

package/dist/index.js

@@ -658,7 +658,8 @@ var getFieldStatement = (models, model, field) => {
   if (field.type === "link") {
     if (field.kind === "many") return null;
     const actions = field.actions || {};
-    const targetTable = getModelBySlug(models, field.target).table;
+    const modelList = models.some((item) => item.slug === model.slug) ? models : [...models, model];
+    const targetTable = getModelBySlug(modelList, field.target).table;
     statement += ` REFERENCES ${targetTable}("id")`;
     for (const trigger in actions) {
       const triggerName = trigger.toUpperCase().slice(2);
@@ -1209,6 +1210,7 @@ var handleOrderedBy = (model, instruction) => {
 // src/instructions/selecting.ts
 var handleSelecting = (models, model, statementParams, instructions, options) => {
   let loadedFields = [];
+  let expandColumns = false;
   let statement = "*";
   let isJoining = false;
   if (instructions.including) {
@@ -1217,9 +1219,10 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
     for (const [key, value] of Object.entries(flatObject)) {
       const symbol = getSymbol(value);
       if (symbol?.type === "query") {
-        isJoining = true;
         const { queryModel, queryInstructions } = splitQuery(symbol.value);
         const subQueryModel = getModelBySlug(models, queryModel);
+        isJoining = true;
+        expandColumns = Boolean(options?.expandColumns || queryInstructions?.selecting);
         const tableAlias = composeIncludedTableAlias(key);
         const single = queryModel !== subQueryModel.pluralSlug;
         if (!single) {
@@ -1227,10 +1230,15 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
         }
         const queryModelFields = queryInstructions?.selecting ? subQueryModel.fields.filter((field) => {
           return queryInstructions.selecting?.includes(field.slug);
-        }) : subQueryModel.fields;
+        }) : (
+          // Exclude link fields with cardinality "many", since those don't exist as columns.
+          subQueryModel.fields.filter((field) => {
+            return !(field.type === "link" && field.kind === "many");
+          })
+        );
         for (const field of queryModelFields) {
           loadedFields.push({ ...field, parentField: key });
-          if (options?.expandColumns) {
+          if (expandColumns) {
             const newValue2 = parseFieldExpression(
               { ...subQueryModel, tableAlias },
               "including",
@@ -1254,7 +1262,6 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
       });
     }
   }
-  const expandColumns = isJoining && options?.expandColumns;
   if (expandColumns) {
     instructions.selecting = model.fields.filter((field) => !(field.type === "link" && field.kind === "many")).map((field) => field.slug);
   }
@@ -1272,7 +1279,12 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
     }).join(", ");
     loadedFields = [...selectedFields, ...loadedFields];
   } else {
-    loadedFields = [...model.fields, ...loadedFields];
+    loadedFields = [
+      ...model.fields.filter(
+        (field) => !(field.type === "link" && field.kind === "many")
+      ),
+      ...loadedFields
+    ];
   }
   if (instructions.including && Object.keys(instructions.including).length > 0) {
     statement += ", ";
@@ -1587,8 +1599,7 @@ var Transaction = class {
     const modelListWithPresets = modelList.map((model) => {
       return addDefaultModelPresets(modelList, model);
     });
-    const dependencyStatements = [];
-    const mainStatements = [];
+    const statements = [];
     for (const query of queries) {
       const result = compileQueryInput(
         query,
@@ -1596,12 +1607,11 @@ var Transaction = class {
         options?.inlineParams ? null : [],
         { expandColumns: options?.expandColumns }
       );
-      dependencyStatements.push(...result.dependencies);
-      mainStatements.push(result.main);
+      statements.push(...result.dependencies, result.main);
       this.fields.push(result.loadedFields);
     }
     this.models = modelListWithPresets;
-    return [...dependencyStatements, ...mainStatements];
+    return statements;
   };
   formatRows(fields, rows, single) {
     const records = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.11.4",
+  "version": "0.11.5-leo-ron-1083-experimental-244",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.2",
-    "@ronin/engine": "0.0.2",
+    "@ronin/engine": "0.0.19",
     "@types/bun": "1.1.10",
     "@types/title": "3.4.3",
     "tsup": "8.3.0",