@ronin/compiler 0.17.21-corny-pagination-bug-experimental-423 → 0.17.21-leo-pagination-bug-experimental-425

package/dist/index.d.ts

@@ -258,7 +258,7 @@ type InternalModelField = ModelField & {
     mountingPath: string;
     /** A custom value that was provided in the query, which is not stored in the DB. */
     mountedValue?: unknown;
-    /** Indicator if the field should be excluded from the final records. */
+    /** If this is set, the field is used during formatting, but not exposed afterward. */
     excluded?: boolean;
 };
 type ModelIndexField<T extends ModelEntityList<ModelField> = ModelEntityList<ModelField>> = {

package/dist/index.js

@@ -141,8 +141,11 @@ var omit = (obj, properties) => Object.fromEntries(
 var getProperty = (obj, path) => {
   return path.split(".").reduce((acc, key) => acc?.[key], obj);
 };
+var getPathSegments = (path) => {
+  return path.split(/[.[\]]/g).filter((segment) => segment.trim().length > 0);
+};
 var setProperty = (obj, path, value) => {
-  const segments = path.split(/[.[\]]/g).filter((x) => !!x.trim());
+  const segments = getPathSegments(path);
   const _set = (node) => {
     if (segments.length > 1) {
       const key = segments.shift();
@@ -157,36 +160,26 @@ var setProperty = (obj, path, value) => {
   };
   _set(obj);
 };
+var deleteProperty = (obj, path) => {
+  const segments = getPathSegments(path);
+  const _delete = (node, segs) => {
+    const key = segs[0];
+    if (segs.length === 1) {
+      delete node[key];
+    } else if (node[key] && typeof node[key] === "object" && node[key] !== null) {
+      const shouldCleanup = _delete(node[key], segs.slice(1));
+      if (shouldCleanup) delete node[key];
+    }
+    return Object.keys(node).length === 0;
+  };
+  _delete(obj, segments);
+};
 var splitQuery = (query) => {
   const queryType = Object.keys(query)[0];
   const queryModel = Object.keys(query[queryType])[0];
   const queryInstructions = query[queryType][queryModel];
   return { queryType, queryModel, queryInstructions };
 };
-function 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];
-    }
-  }
-}
 
 // src/utils/pagination.ts
 var CURSOR_SEPARATOR = ",";
@@ -455,6 +448,7 @@ var handleSelecting = (models, model, statementParams, single, instructions, que
           {
             selecting: queryInstructions?.selecting,
             including: queryInstructions?.including,
+            orderedBy: queryInstructions?.orderedBy,
             limitedTo: instructions.limitedTo
           },
           queryType2,
@@ -480,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) {
@@ -1131,6 +1131,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     {
       selecting: instructions?.selecting,
       including: instructions?.including,
+      orderedBy: instructions?.orderedBy,
       limitedTo: instructions?.limitedTo
     },
     queryType,
@@ -2349,7 +2350,7 @@ var Transaction = class {
     if (fieldsToDrop.length > 0) {
       for (const record of result.records) {
         for (const field of fieldsToDrop) {
-          deleteNestedProperty(record, field.slug);
+          deleteProperty(record, field.slug);
         }
       }
     }

package/package.json

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