@ronin/compiler 0.14.8 → 0.14.9-leo-ron-1099-1-experimental-341

package/dist/index.d.ts

@@ -361,7 +361,7 @@ type PublicModel<T extends Array<ModelField> = Array<ModelField>> = Omit<Partial
 
 type RawRow = Array<unknown>;
 type ObjectRow = Record<string, unknown>;
-type NativeRecord = Record<string, unknown> & {
+type ResultRecord = Record<string, unknown> & {
     id: string;
     ronin: {
         locked: boolean;
@@ -371,11 +371,11 @@ type NativeRecord = Record<string, unknown> & {
         updatedBy: string | null;
     };
 };
-type SingleRecordResult<T = NativeRecord> = {
+type SingleRecordResult<T = ResultRecord> = {
     record: T | null;
     modelFields: Record<ModelField['slug'], ModelField['type']>;
 };
-type MultipleRecordResult<T = NativeRecord> = {
+type MultipleRecordResult<T = ResultRecord> = {
     records: Array<T>;
     moreAfter?: string;
     moreBefore?: string;
@@ -384,7 +384,7 @@ type MultipleRecordResult<T = NativeRecord> = {
 type AmountResult = {
     amount: number;
 };
-type Result<T = NativeRecord> = SingleRecordResult<T> | MultipleRecordResult<T> | AmountResult;
+type Result<T = ResultRecord> = SingleRecordResult<T> | MultipleRecordResult<T> | AmountResult;
 
 interface TransactionOptions {
     /** A list of models that already exist in the database. */
@@ -408,4 +408,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, 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 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 };

package/dist/index.js

@@ -631,6 +631,15 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
   if (instructions && Object.hasOwn(instructions, "for")) {
     instructions = handleFor(model, instructions);
   }
+  if (queryType === "count") {
+    if (!instructions) instructions = {};
+    instructions.selecting = ["amount"];
+    instructions.including = Object.assign(instructions?.including || {}, {
+      amount: {
+        [QUERY_SYMBOLS.EXPRESSION]: "COUNT(*)"
+      }
+    });
+  }
   const { columns, isJoining, selectedFields } = handleSelecting(
     models,
     model,
@@ -645,6 +654,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
   let statement = "";
   switch (queryType) {
     case "get":
+    case "count":
       statement += `SELECT ${columns} FROM `;
       break;
     case "set":
@@ -656,9 +666,6 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     case "remove":
       statement += "DELETE FROM ";
       break;
-    case "count":
-      statement += `SELECT COUNT(${columns}) FROM `;
-      break;
   }
   let isJoiningMultipleRows = false;
   if (isJoining) {
@@ -2092,9 +2099,10 @@ var Transaction = class {
    */
   formatResults(results, raw = true) {
     const normalizedResults = raw ? results : results.map((rows) => {
-      return rows.map((row) => {
+      return rows.map((row, index) => {
+        const { query } = this.#internalStatements[index];
         if (Array.isArray(row)) return row;
-        if (row["COUNT(*)"]) return [row["COUNT(*)"]];
+        if (query.count) return [row.amount];
         return Object.values(row);
       });
     });

package/package.json

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