@ronin/compiler 0.16.1 → 0.16.2-leo-ron-1099-1-experimental-368

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) {
@@ -816,7 +821,8 @@ var filterSelectedFields = (model, instruction) => {
 var prepareStatementValue = (statementParams, value) => {
   if (value === null) return "NULL";
   if (!statementParams) {
-    const valueString = typeof value === "object" ? `json('${JSON.stringify(value, replaceJSON)}')` : `'${value.toString()}'`;
+    if (typeof value === "string") return `'${value}'`;
+    const valueString = typeof value === "object" ? `json('${JSON.stringify(value, replaceJSON)}')` : value.toString();
     return valueString;
   }
   let formattedValue = value;
@@ -854,7 +860,7 @@ var composeFieldValues = (models, model, statementParams, instructionName, value
   );
   const collectStatementValue = options.type !== "fields";
   const symbol = getQuerySymbol(value);
-  let conditionMatcher = "=";
+  let conditionMatcher = instructionName === "to" ? "=" : getMatcher(value, false);
   let conditionValue = value;
   if (options.condition) {
     [conditionMatcher, conditionValue] = WITH_CONDITIONS[options.condition](value);

package/package.json

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