@ronin/compiler 0.17.20 → 0.17.21-corny-pagination-bug-experimental-422

package/dist/index.d.ts

@@ -258,6 +258,8 @@ 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. */
+    excluded?: boolean;
 };
 type ModelIndexField<T extends ModelEntityList<ModelField> = ModelEntityList<ModelField>> = {
     /** The collating sequence used for text placed inside the field. */

package/dist/index.js

@@ -163,6 +163,30 @@ var splitQuery = (query) => {
   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 = ",";
@@ -379,7 +403,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 +427,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
@@ -430,8 +454,10 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
           subSingle,
           {
             selecting: queryInstructions?.selecting,
-            including: queryInstructions?.including
+            including: queryInstructions?.including,
+            limitedTo: instructions.limitedTo
           },
+          queryType2,
           { ...options, mountingPath: subMountingPath }
         );
         if (nestedColumns !== "*") joinedColumns.push(nestedColumns);
@@ -454,6 +480,14 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
       });
     }
   }
+  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"
+    });
+  }
   const columns = selectedFields.map((selectedField) => {
     if (selectedField.mountedValue) {
       return `${selectedField.mountedValue} as "${selectedField.slug}"`;
@@ -1077,6 +1111,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,
@@ -1084,8 +1130,10 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     single,
     {
       selecting: instructions?.selecting,
-      including: instructions?.including
+      including: instructions?.including,
+      limitedTo: instructions?.limitedTo
     },
+    queryType,
     // biome-ignore lint/complexity/useSimplifiedLogicExpression: This is needed.
     { inlineDefaults: options?.inlineDefaults || false }
   );
@@ -1156,18 +1204,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({
@@ -1577,10 +1613,10 @@ var ROOT_MODEL = {
     // Providing an empty object as a default value allows us to use `json_insert`
     // without needing to fall back to an empty object in the insertion statement,
     // which makes the statement shorter.
-    fields: { type: "json", defaultValue: "{}" },
-    indexes: { type: "json", defaultValue: "{}" },
-    triggers: { type: "json", defaultValue: "{}" },
-    presets: { type: "json", defaultValue: "{}" }
+    fields: { type: "json", defaultValue: {} },
+    indexes: { type: "json", defaultValue: {} },
+    triggers: { type: "json", defaultValue: {} },
+    presets: { type: "json", defaultValue: {} }
   }
 };
 var ROOT_MODEL_WITH_ATTRIBUTES = addDefaultModelAttributes(ROOT_MODEL, true);
@@ -1642,6 +1678,7 @@ var getFieldStatement = (models, model, field) => {
     const symbol = getQuerySymbol(field.defaultValue);
     let value = typeof field.defaultValue === "string" ? `'${field.defaultValue}'` : field.defaultValue;
     if (symbol) value = `(${parseFieldExpression(model, "to", symbol.value)})`;
+    if (field.type === "json") value = `'${JSON.stringify(field.defaultValue)}'`;
     statement += ` DEFAULT ${value}`;
   }
   if (field.type === "string" && field.collation) {
@@ -2308,6 +2345,14 @@ var Transaction = class {
         );
       }
     }
+    const fieldsToDrop = selectedFields.filter((field) => field.excluded === true);
+    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.20",
+  "version": "0.17.21-corny-pagination-bug-experimental-422",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {