@ronin/compiler 0.16.0 → 0.16.1-leo-ron-1099-1-experimental-366

package/dist/index.d.ts

@@ -392,7 +392,9 @@ type AmountResult = {
     amount: number;
 };
 type RegularResult<T = ResultRecord> = SingleRecordResult<T> | MultipleRecordResult<T> | AmountResult;
-type ExpandedResult<T = ResultRecord> = Record<Model['slug'], RegularResult<T>>;
+type ExpandedResult<T = ResultRecord> = {
+    models: Record<Model['slug'], RegularResult<T>>;
+};
 type Result<T = ResultRecord> = RegularResult<T> | ExpandedResult<T>;
 
 interface TransactionOptions {
@@ -415,4 +417,4 @@ declare class Transaction {
 
 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, type DropQuery, type GetInstructions, type GetQuery, type GetInstructions as GetQueryInstructions, type PublicModel as Model, type ModelField, type ModelIndex, type ModelPreset, type ModelTrigger, QUERY_SYMBOLS, type Query, type QueryInstructionType as QueryInstruction, type QuerySchemaType, type QueryType, CLEAN_ROOT_MODEL as ROOT_MODEL, 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, 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, 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 };

package/dist/index.js

@@ -174,7 +174,7 @@ var generatePaginationCursor = (model, orderedBy, record) => {
 };
 
 // src/instructions/before-after.ts
-var handleBeforeOrAfter = (model, statementParams, instructions) => {
+var handleBeforeOrAfter = (model, statementParams, queryType, instructions) => {
   if (!(instructions.before || instructions.after)) {
     throw new RoninError({
       message: "The `before` or `after` instruction must not be empty.",
@@ -187,7 +187,7 @@ var handleBeforeOrAfter = (model, statementParams, instructions) => {
       code: "MUTUALLY_EXCLUSIVE_INSTRUCTIONS"
     });
   }
-  if (!instructions.limitedTo) {
+  if (!instructions.limitedTo && queryType !== "count") {
     let message = "When providing a pagination cursor in the `before` or `after`";
     message += " instruction, a `limitedTo` instruction must be provided as well, to";
     message += " define the page size.";
@@ -724,7 +724,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     );
     if (withStatement.length > 0) conditions.push(withStatement);
   }
-  if ((queryType === "get" || queryType === "count") && !single && instructions?.limitedTo) {
+  if (!single && (queryType === "get" && instructions?.limitedTo || queryType === "count" && (instructions?.before || instructions?.after))) {
     instructions = instructions || {};
     instructions.orderedBy = instructions.orderedBy || {};
     instructions.orderedBy.ascending = instructions.orderedBy.ascending || [];
@@ -744,13 +744,18 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
         queries: [query]
       });
     }
-    const beforeAndAfterStatement = handleBeforeOrAfter(model, statementParams, {
-      before: instructions.before,
-      after: instructions.after,
-      with: instructions.with,
-      orderedBy: instructions.orderedBy,
-      limitedTo: instructions.limitedTo
-    });
+    const beforeAndAfterStatement = handleBeforeOrAfter(
+      model,
+      statementParams,
+      queryType,
+      {
+        before: instructions.before,
+        after: instructions.after,
+        with: instructions.with,
+        orderedBy: instructions.orderedBy,
+        limitedTo: instructions.limitedTo
+      }
+    );
     conditions.push(beforeAndAfterStatement);
   }
   if (conditions.length > 0) {
@@ -2145,8 +2150,9 @@ var Transaction = class {
         if (!returning) return finalResults;
         const addResult = (result2) => {
           if (typeof expansionIndex !== "undefined") {
-            if (!finalResults[expansionIndex]) finalResults[expansionIndex] = {};
-            finalResults[expansionIndex][queryModel] = result2;
+            let match = finalResults[expansionIndex];
+            if (!match) match = finalResults[expansionIndex] = { models: {} };
+            match.models[queryModel] = result2;
           } else {
             finalResults.push(result2);
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.16.0",
+  "version": "0.16.1-leo-ron-1099-1-experimental-366",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {