@ronin/compiler 0.10.1 → 0.10.2

package/dist/index.js

@@ -102,6 +102,9 @@ var expand = (obj) => {
     return res;
   }, {});
 };
+var getProperty = (obj, path) => {
+  return path.split(".").reduce((acc, key) => acc?.[key], obj);
+};
 var splitQuery = (query) => {
   const queryType = Object.keys(query)[0];
   const queryModel = Object.keys(query[queryType])[0];
@@ -939,9 +942,24 @@ var transformMetaQuery = (models, dependencyStatements, statementParams, query)
   };
 };
 
-// src/instructions/before-after.ts
+// src/utils/pagination.ts
 var CURSOR_SEPARATOR = ",";
 var CURSOR_NULL_PLACEHOLDER = "RONIN_NULL";
+var generatePaginationCursor = (model, orderedBy, record) => {
+  const { ascending = [], descending = [] } = orderedBy || {};
+  const keys = [...ascending, ...descending];
+  if (keys.length === 0) keys.push("ronin.createdAt");
+  const cursors = keys.map((fieldSlug) => {
+    const property = getProperty(record, fieldSlug);
+    if (property === null || property === void 0) return CURSOR_NULL_PLACEHOLDER;
+    const { field } = getFieldFromModel(model, fieldSlug, "orderedBy");
+    if (field.type === "date") return new Date(property).getTime();
+    return property;
+  });
+  return cursors.map((cursor) => encodeURIComponent(String(cursor))).join(CURSOR_SEPARATOR);
+};
+
+// src/instructions/before-after.ts
 var handleBeforeOrAfter = (model, statementParams, instructions) => {
   if (!(instructions.before || instructions.after)) {
     throw new RoninError({
@@ -1212,6 +1230,11 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
   if (symbol?.type === "query") {
     let { queryModel: subQueryModelSlug, queryInstructions: subQueryInstructions } = splitQuery(symbol.value);
     const subQueryModel = getModelBySlug(models, subQueryModelSlug);
+    if (subQueryInstructions?.selecting) {
+      const currentFields = new Set(subQueryInstructions.selecting);
+      currentFields.add("id");
+      subQueryInstructions.selecting = Array.from(currentFields);
+    }
     const subQuerySelectedFields = subQueryInstructions?.selecting;
     const subQueryIncludedFields = subQueryInstructions?.including;
     const subQueryFields = [
@@ -1234,7 +1257,19 @@ var handleTo = (models, model, statementParams, queryType, dependencyStatements,
         ...subQueryInstructions.including
       };
     }
-    return compileQueryInput(symbol.value, models, statementParams).main.statement;
+    let statement2 = "";
+    if (subQuerySelectedFields) {
+      const selectedFields = [
+        ...subQueryFields,
+        ...defaultFieldsToAdd.map(([key]) => key)
+      ];
+      const columns = selectedFields.map((field) => {
+        return getFieldFromModel(model, field, "to").fieldSelector;
+      });
+      statement2 = `(${columns.join(", ")}) `;
+    }
+    statement2 += compileQueryInput(symbol.value, models, statementParams).main.statement;
+    return statement2;
   }
   Object.assign(toInstruction, defaultFields);
   for (const fieldSlug in toInstruction) {
@@ -1498,11 +1533,47 @@ var Transaction = class {
     return expand(formattedRecord);
   }
   prepareResults(results) {
-    return results.map((result, index) => {
+    const relevantResults = results.filter((_, index) => {
+      return this.statements[index].returning;
+    });
+    return relevantResults.map((result, index) => {
       const query = this.queries.at(-index);
-      const { queryModel } = splitQuery(query);
+      const { queryType, queryModel, queryInstructions } = splitQuery(query);
       const model = getModelBySlug(this.models, queryModel);
-      return { record: this.formatRecord(model, result[0]) };
+      if (queryType === "count") {
+        return { amount: result[0]["COUNT(*)"] };
+      }
+      const single = queryModel !== model.pluralSlug;
+      if (single) {
+        return { record: this.formatRecord(model, result[0]) };
+      }
+      const pageSize = queryInstructions?.limitedTo;
+      const output = {
+        records: result.map((resultItem) => {
+          return this.formatRecord(model, resultItem);
+        })
+      };
+      if (pageSize && output.records.length > 0) {
+        if (queryInstructions?.before || queryInstructions?.after) {
+          const direction = queryInstructions?.before ? "moreAfter" : "moreBefore";
+          const firstRecord = output.records[0];
+          output[direction] = generatePaginationCursor(
+            model,
+            queryInstructions.orderedBy,
+            firstRecord
+          );
+        }
+        if (output.records.length > pageSize) {
+          const direction = queryInstructions?.before ? "moreBefore" : "moreAfter";
+          const lastRecord = output.records.pop();
+          output[direction] = generatePaginationCursor(
+            model,
+            queryInstructions.orderedBy,
+            lastRecord
+          );
+        }
+      }
+      return output;
     });
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {