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

package/README.md

@@ -127,26 +127,7 @@ new Transaction(queries, {
   // Instead of returning an array of parameters for every statement (which allows for
   // preventing SQL injections), all parameters are inlined directly into the SQL strings.
   // This option should only be used if the generated SQL will be manually verified.
-  inlineParams: true,
-
-  // By default, in the generated SQL statements, the compiler does not alias columns if
-  // multiple different tables with the same column names are being joined. Only the table
-  // names themselves are aliased.
-  //
-  // This ensures the cleanest possible SQL statements in conjunction with the default
-  // behavior of SQL databases, where the result of a statement is a list (array) of
-  // values, which are inherently not prone to conflicts.
-  //
-  // If the driver being used instead returns an object for every row, the driver must
-  // ensure the uniqueness of every key in that object, which means prefixing duplicated
-  // column names with the name of the respective table, if multiple tables are joined
-  // (example for an object key: "table_name.column_name").
-  //
-  // Drivers that return objects for rows offer this behavior as an option that is
-  // usually called "expand columns". If the driver being used does not offer such an
-  // option, you can instead activate the option in the compiler, which results in longer
-  // SQL statements because all column names are aliased.
-  expandColumns: true
+  inlineParams: true
 });
 ```
 

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. */
@@ -394,8 +394,6 @@ interface TransactionOptions {
      * separating them out into a dedicated `params` array.
      */
     inlineParams?: boolean;
-    /** Alias column names that are duplicated when joining multiple tables. */
-    expandColumns?: boolean;
 }
 declare class Transaction {
     #private;
@@ -408,4 +406,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

@@ -424,7 +424,6 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
     }
     return newField;
   });
-  if (instructions.selecting) options.expandColumns = true;
   const joinedSelectedFields = [];
   const joinedColumns = [];
   if (instructions.including) {
@@ -440,7 +439,6 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
         const { queryModel, queryInstructions } = splitQuery(symbol2.value);
         const subQueryModel = getModelBySlug(models, queryModel);
         isJoining = true;
-        if (queryInstructions?.selecting) options.expandColumns = true;
         const subSingle = queryModel !== subQueryModel.pluralSlug;
         if (!model.tableAlias)
           model.tableAlias = single && !subSingle ? `sub_${model.table}` : model.table;
@@ -478,11 +476,7 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
       });
     }
   }
-  let columns = ["*"];
-  const fieldsToExpand = options.expandColumns ? selectedFields : selectedFields.filter(
-    (loadedField) => typeof loadedField.mountedValue !== "undefined"
-  );
-  const extraColumns = fieldsToExpand.map((selectedField) => {
+  const columns = selectedFields.map((selectedField) => {
     if (selectedField.mountedValue) {
       return `${selectedField.mountedValue} as "${selectedField.slug}"`;
     }
@@ -494,11 +488,6 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
     }
     return fieldSelector;
   });
-  if (options.expandColumns) {
-    columns = extraColumns;
-  } else if (extraColumns) {
-    columns.push(...extraColumns);
-  }
   columns.push(...joinedColumns);
   selectedFields.push(...joinedSelectedFields);
   return { columns: columns.join(", "), isJoining, selectedFields };
@@ -631,6 +620,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 +643,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
   let statement = "";
   switch (queryType) {
     case "get":
+    case "count":
       statement += `SELECT ${columns} FROM `;
       break;
     case "set":
@@ -656,9 +655,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) {
@@ -1988,8 +1984,7 @@ var Transaction = class {
       const { dependencies, main, selectedFields } = compileQueryInput(
         query,
         modelsWithPresets,
-        options?.inlineParams ? null : [],
-        { expandColumns: options?.expandColumns }
+        options?.inlineParams ? null : []
       );
       const preDependencies = dependencies.filter(({ after }) => !after);
       const postDependencies = dependencies.map(({ after, ...rest }) => after ? rest : null).filter((item) => item != null);
@@ -2092,9 +2087,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-342",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {