@ronin/compiler 0.17.21-leo-pagination-bug-experimental-424 → 0.17.21-leo-pagination-bug-experimental-426

package/dist/index.js

@@ -396,7 +396,7 @@ var handleOrderedBy = (model, instruction) => {
 };
 
 // src/instructions/selecting.ts
-var handleSelecting = (models, model, statementParams, single, instructions, queryType, options = { inlineDefaults: false }) => {
+var handleSelecting = (models, model, statementParams, queryType, single, instructions, options = { inlineDefaults: false }) => {
   let isJoining = false;
   const selectedFields = filterSelectedFields(
     model,
@@ -444,13 +444,14 @@ var handleSelecting = (models, model, statementParams, single, instructions, que
           models,
           { ...subQueryModel, tableAlias: `including_${subMountingPath}` },
           statementParams,
+          queryType2,
           subSingle,
           {
             selecting: queryInstructions?.selecting,
             including: queryInstructions?.including,
-            limitedTo: instructions.limitedTo
+            orderedBy: queryInstructions?.orderedBy,
+            limitedTo: queryInstructions?.limitedTo
           },
-          queryType2,
           { ...options, mountingPath: subMountingPath }
         );
         if (nestedColumns !== "*") joinedColumns.push(nestedColumns);
@@ -473,13 +474,19 @@ var handleSelecting = (models, model, statementParams, single, instructions, que
       });
     }
   }
-  if (queryType === "get" && !single && !selectedFields.some((field) => field.slug === "ronin.createdAt") && instructions.limitedTo) {
-    selectedFields.push({
-      ...getSystemFields(model.idPrefix)["ronin.createdAt"],
-      slug: "ronin.createdAt",
-      excluded: true,
-      mountingPath: "ronin.createdAt"
+  if (queryType === "get" && !single && typeof instructions.limitedTo !== "undefined") {
+    const orderedFields = Object.values(instructions.orderedBy || {}).flat().map((fieldSlug) => {
+      return getFieldFromModel(model, fieldSlug, { instructionName: "orderedBy" });
     });
+    for (const orderedField of orderedFields) {
+      const { field } = orderedField;
+      if (selectedFields.some(({ slug }) => slug === field.slug)) continue;
+      selectedFields.push({
+        slug: field.slug,
+        mountingPath: field.slug,
+        excluded: true
+      });
+    }
   }
   const columns = selectedFields.map((selectedField) => {
     if (selectedField.mountedValue) {
@@ -1120,13 +1127,14 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     models,
     model,
     statementParams,
+    queryType,
     single,
     {
       selecting: instructions?.selecting,
       including: instructions?.including,
+      orderedBy: instructions?.orderedBy,
       limitedTo: instructions?.limitedTo
     },
-    queryType,
     // biome-ignore lint/complexity/useSimplifiedLogicExpression: This is needed.
     { inlineDefaults: options?.inlineDefaults || false }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.17.21-leo-pagination-bug-experimental-424",
+  "version": "0.17.21-leo-pagination-bug-experimental-426",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {