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

package/dist/index.d.ts

@@ -484,7 +484,9 @@ 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>>;
 }

package/dist/index.js

@@ -381,10 +381,7 @@ var handleOrderedBy = (model, instruction) => {
 // src/instructions/selecting.ts
 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}`;
@@ -430,7 +427,8 @@ var handleSelecting = (models, model, statementParams, single, instructions, que
           subSingle,
           {
             selecting: queryInstructions?.selecting,
-            including: queryInstructions?.including
+            including: queryInstructions?.including,
+            limitedTo: instructions.limitedTo
           },
           queryType2,
           { ...options, mountingPath: subMountingPath }
@@ -455,11 +453,10 @@ var handleSelecting = (models, model, statementParams, single, instructions, que
       });
     }
   }
-  if (queryType === "get" && !single && !selectedFields.some((field) => field.slug === "ronin.createdAt")) {
+  if (queryType === "get" && !single && !selectedFields.some((field) => field.slug === "ronin.createdAt") && instructions.limitedTo) {
     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"
     });
@@ -2319,16 +2316,35 @@ 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) {
+    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) {
-        if (record.ronin) {
-          record.ronin = void 0;
+        for (const field of fieldsToDrop) {
+          deleteNestedProperty(record, field.slug);
         }
       }
     }

package/package.json

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