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

package/dist/index.d.ts

@@ -484,11 +484,13 @@ declare class Transaction {
      *
      * @returns A formatted RONIN result for a particular query.
      */
-    formatIndividualResult<RecordType>(queryType: QueryType, queryInstructions: CombinedInstructions, model: Model, rows: Array<Array<RawRow>>, selectedFields: Array<InternalModelField>, single: boolean): RegularResult<RecordType>;
+    formatIndividualResult<RecordType>(queryType: QueryType, queryInstructions: CombinedInstructions, model: Model, rows: Array<Array<RawRow>>, selectedFields: Array<InternalModelField & {
+        drop?: boolean;
+    }>, single: boolean): RegularResult<RecordType>;
     formatResults<RecordType>(results: Array<Array<ObjectRow>>, raw?: false): Array<Result<RecordType>>;
     formatResults<RecordType>(results: Array<Array<RawRow>>, raw?: true): Array<Result<RecordType>>;
 }
 
 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,12 +379,9 @@ 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,
-    instructions.selecting
-  ).filter((field) => !(field.type === "link" && field.kind === "many")).map((field) => {
+  const selectedFields = filterSelectedFields(model, instructions.selecting).filter((field) => !(field.type === "link" && field.kind === "many")).map((field) => {
     const newField = { ...field, mountingPath: field.slug };
     if (options.mountingPath && options.mountingPath !== "ronin_root") {
       newField.mountingPath = `${options.mountingPath.replace(/\{\d+\}/g, "")}.${field.slug}`;
@@ -403,9 +400,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 +429,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 +452,14 @@ 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",
+      drop: true,
+      mountingPath: "ronin.createdAt"
+    });
+  }
   const columns = selectedFields.map((selectedField) => {
     if (selectedField.mountedValue) {
       return `${selectedField.mountedValue} as "${selectedField.slug}"`;
@@ -1077,6 +1083,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 +1104,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 +1175,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 +2315,38 @@ var Transaction = class {
         );
       }
     }
+    const fieldsToDrop = selectedFields.filter((field) => field.drop === true);
+    const deleteNestedProperty = (obj, path) => {
+      const parts = path.split(".");
+      const lastPart = parts.pop();
+      let current = obj;
+      for (const part of parts) {
+        if (!current || typeof current !== "object") return;
+        const currentAsRecord = current;
+        if (!(part in currentAsRecord)) return;
+        current = currentAsRecord[part];
+      }
+      if (typeof current === "object" && current !== null) {
+        delete current[lastPart];
+      }
+      if (parts.length > 0 && typeof current === "object" && current !== null && Object.keys(current).length === 0) {
+        let temp = obj;
+        for (let i = 0; i < parts.length - 1; i++) {
+          temp = temp[parts[i]];
+        }
+        const lastPart2 = parts.at(-1);
+        if (lastPart2) {
+          delete temp[lastPart2];
+        }
+      }
+    };
+    if (fieldsToDrop.length > 0) {
+      for (const record of result.records) {
+        for (const field of fieldsToDrop) {
+          deleteNestedProperty(record, field.slug);
+        }
+      }
+    }
     return result;
   }
   /**

package/package.json

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