@ronin/compiler 0.17.18 → 0.17.19-corny-pagination-bug-experimental-411

package/dist/index.d.ts

@@ -491,4 +491,4 @@ declare class Transaction {
 
 declare const CLEAN_ROOT_MODEL: PublicModel;
 
-export { type AddInstructions, type AddQuery, type AddInstructions as AddQueryInstructions, type AlterQuery, type CombinedInstructions, type CountInstructions, type CountQuery, type CountInstructions as CountQueryInstructions, type CreateQuery, DDL_QUERY_TYPES, DML_QUERY_TYPES, DML_QUERY_TYPES_READ, DML_QUERY_TYPES_WRITE, type DropQuery, type ExpandedResult, type GetInstructions, type GetQuery, type GetInstructions as GetQueryInstructions, type PublicModel as Model, type ModelField, type ModelIndex, type ModelPreset, type ModelTrigger, QUERY_SYMBOLS, QUERY_TYPES, type Query, type QueryInstructionType as QueryInstruction, type QuerySchemaType, type QueryType, CLEAN_ROOT_MODEL as ROOT_MODEL, type RegularResult, type RemoveInstructions, type RemoveQuery, type RemoveInstructions as RemoveQueryInstructions, type Result, type ResultRecord, RoninError, type SetInstructions, type SetQuery, type SetInstructions as SetQueryInstructions, type Statement, type StoredObject, Transaction, type WithInstruction, getQuerySymbol };
+export { type AddInstructions, type AddQuery, type AddInstructions as AddQueryInstructions, type AlterQuery, type CombinedInstructions, type CountInstructions, type CountQuery, type CountInstructions as CountQueryInstructions, type CreateQuery, DDL_QUERY_TYPES, DML_QUERY_TYPES, DML_QUERY_TYPES_READ, DML_QUERY_TYPES_WRITE, type DropQuery, type ExpandedResult, type GetInstructions, type GetQuery, type GetInstructions as GetQueryInstructions, type PublicModel as Model, type ModelField, type ModelIndex, type ModelPreset, type ModelTrigger, QUERY_SYMBOLS, QUERY_TYPES, type Query, type QueryInstructionType as QueryInstruction, type QuerySchemaType, type QueryType, CLEAN_ROOT_MODEL as ROOT_MODEL, type RegularResult, type RemoveInstructions, type RemoveQuery, type RemoveInstructions as RemoveQueryInstructions, type Result, type ResultRecord, type ResultRecordBase, RoninError, type SetInstructions, type SetQuery, type SetInstructions as SetQueryInstructions, type Statement, type StoredObject, Transaction, type WithInstruction, getQuerySymbol };

package/dist/index.js

@@ -379,7 +379,7 @@ var handleOrderedBy = (model, instruction) => {
 };
 
 // src/instructions/selecting.ts
-var handleSelecting = (models, model, statementParams, single, instructions, options = { inlineDefaults: false }) => {
+var handleSelecting = (models, model, statementParams, single, instructions, queryType, options = { inlineDefaults: false }) => {
   let isJoining = false;
   const selectedFields = filterSelectedFields(
     model,
@@ -403,9 +403,9 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
     for (const [key, value] of Object.entries(flatObject)) {
       const symbol2 = getQuerySymbol(value);
       if (symbol2?.type === "query") {
-        const { queryType, queryModel, queryInstructions } = splitQuery(symbol2.value);
+        const { queryType: queryType2, queryModel, queryInstructions } = splitQuery(symbol2.value);
         const subQueryModel = getModelBySlug(models, queryModel);
-        if (queryType === "count") {
+        if (queryType2 === "count") {
           const subSelect = compileQueryInput(symbol2.value, models, statementParams, {
             parentModel: { ...model, tableAlias: model.table },
             inlineDefaults: options.inlineDefaults
@@ -432,6 +432,7 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
             selecting: queryInstructions?.selecting,
             including: queryInstructions?.including
           },
+          queryType2,
           { ...options, mountingPath: subMountingPath }
         );
         if (nestedColumns !== "*") joinedColumns.push(nestedColumns);
@@ -454,6 +455,15 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
       });
     }
   }
+  if (queryType === "get" && !single && !selectedFields.some((field) => field.slug === "ronin.createdAt")) {
+    selectedFields.push({
+      ...getSystemFields(model.idPrefix)["ronin.createdAt"],
+      slug: "ronin.createdAt",
+      // @ts-expect-error - This is a valid field but not in the types atm.
+      drop: true,
+      mountingPath: "ronin.createdAt"
+    });
+  }
   const columns = selectedFields.map((selectedField) => {
     if (selectedField.mountedValue) {
       return `${selectedField.mountedValue} as "${selectedField.slug}"`;
@@ -1077,6 +1087,18 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
       }
     });
   }
+  if (!single && (queryType === "get" && instructions?.limitedTo || queryType === "count" && (instructions?.before || instructions?.after))) {
+    instructions = instructions || {};
+    instructions.orderedBy = instructions.orderedBy || {};
+    instructions.orderedBy.ascending = instructions.orderedBy.ascending || [];
+    instructions.orderedBy.descending = instructions.orderedBy.descending || [];
+    if (![
+      ...instructions.orderedBy.ascending,
+      ...instructions.orderedBy.descending
+    ].includes("ronin.createdAt")) {
+      instructions.orderedBy.descending.push("ronin.createdAt");
+    }
+  }
   const { columns, isJoining, selectedFields } = handleSelecting(
     models,
     model,
@@ -1086,6 +1108,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
       selecting: instructions?.selecting,
       including: instructions?.including
     },
+    queryType,
     // biome-ignore lint/complexity/useSimplifiedLogicExpression: This is needed.
     { inlineDefaults: options?.inlineDefaults || false }
   );
@@ -1156,18 +1179,6 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     );
     if (withStatement.length > 0) conditions.push(withStatement);
   }
-  if (!single && (queryType === "get" && instructions?.limitedTo || queryType === "count" && (instructions?.before || instructions?.after))) {
-    instructions = instructions || {};
-    instructions.orderedBy = instructions.orderedBy || {};
-    instructions.orderedBy.ascending = instructions.orderedBy.ascending || [];
-    instructions.orderedBy.descending = instructions.orderedBy.descending || [];
-    if (![
-      ...instructions.orderedBy.ascending,
-      ...instructions.orderedBy.descending
-    ].includes("ronin.createdAt")) {
-      instructions.orderedBy.descending.push("ronin.createdAt");
-    }
-  }
   if (instructions && (typeof instructions.before !== "undefined" || typeof instructions.after !== "undefined")) {
     if (single) {
       throw new RoninError({
@@ -2308,6 +2319,19 @@ var Transaction = class {
         );
       }
     }
+    const createdAtDrop = selectedFields.some(
+      (field) => (
+        // @ts-expect-error - This is a valid field but not in the types atm.
+        field.slug === "ronin.createdAt" && field.drop === true
+      )
+    );
+    if (createdAtDrop) {
+      for (const record of result.records) {
+        if (record.ronin) {
+          record.ronin = void 0;
+        }
+      }
+    }
     return result;
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.17.18",
+  "version": "0.17.19-corny-pagination-bug-experimental-411",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {