@carbonorm/carbonnode 3.5.2 → 3.5.4

package/src/api/executors/Executor.ts

@@ -5,7 +5,6 @@ import {
     iRestReactiveLifecycle,
     RequestQueryBody
 } from "../types/ormInterfaces";
-import isVerbose from "../../variables/isVerbose";
 
 export abstract class Executor<
     G extends OrmGenerics
@@ -40,7 +39,7 @@ export abstract class Executor<
 
         for (const [key, fn] of Object.entries(lifecycleGroup)) {
             if (typeof fn === "function") {
-                if (isVerbose() || (args.request as any).debug) {
+                if (this.config.verbose || (args.request as any).debug) {
                     console.groupCollapsed(`[LIFECYCLE] ${this.config.requestMethod}.${String(phase)}:${key}`);
                     console.log("config:", args.config);
                     console.log("request:", args.request);

package/src/api/executors/HttpExecutor.ts

@@ -2,7 +2,6 @@ import {AxiosPromise, AxiosResponse} from "axios";
 import {toast} from "react-toastify";
 import isLocal from "../../variables/isLocal";
 import isTest from "../../variables/isTest";
-import isVerbose from "../../variables/isVerbose";
 import convertForRequestBody from "../convertForRequestBody";
 import {eFetchDependencies} from "../types/dynamicFetching";
 import {OrmGenerics} from "../types/ormGenerics";
@@ -609,7 +608,7 @@ export class HttpExecutor<
                             returnGetNextPageFunction = 1 !== query?.[C6.PAGINATION]?.[C6.LIMIT] &&
                                 query?.[C6.PAGINATION]?.[C6.LIMIT] === responseData.rest.length
 
-                            if (false === isTest() || true === isVerbose()) {
+                            if (false === isTest() || this.config.verbose) {
 
                                 console.groupCollapsed('%c API: Response (' + requestMethod + ' ' + tableName + ') returned length (' + responseData.rest?.length + ') of possible (' + query?.[C6.PAGINATION]?.[C6.LIMIT] + ') limit!', 'color: #0c0')
 

package/src/api/executors/SqlExecutor.ts

@@ -19,7 +19,10 @@ export class SqlExecutor<
         const {TABLE_NAME} = this.config.restModel;
         const method = this.config.requestMethod;
 
-        console.log(`[SQL EXECUTOR] ▶️ Executing ${method} on table "${TABLE_NAME}"`);
+        this.config.verbose && console.log(`[SQL EXECUTOR] ▶️ Executing ${method} on table "${TABLE_NAME}"`);
+        this.config.verbose && console.log(`[SQL EXECUTOR] 🧩 Request body:`, this.request.body);
+        this.config.verbose && console.log(`[SQL EXECUTOR] 🧩 Request query:`, this.request.query);
+
 
         switch (method) {
             case 'GET': {

package/src/api/orm/builders/AggregateBuilder.ts

@@ -1,4 +1,3 @@
-import isVerbose from "../../../variables/isVerbose";
 import {Executor} from "../../executors/Executor";
 import {OrmGenerics} from "../../types/ormGenerics";
 
@@ -31,7 +30,7 @@ export abstract class AggregateBuilder<G extends OrmGenerics> extends Executor<G
             expr += ` AS ${alias}`;
         }
 
-        isVerbose() && console.log(`[SELECT] ${expr}`);
+        this.config.verbose && console.log(`[SELECT] ${expr}`);
 
         return expr;
     }

package/src/api/orm/builders/ConditionBuilder.ts

@@ -1,5 +1,4 @@
 import {C6C} from "api/C6Constants";
-import isVerbose from "../../../variables/isVerbose";
 import {OrmGenerics} from "../../types/ormGenerics";
 import {DetermineResponseDataType} from "../../types/ormInterfaces";
 import {convertHexIfBinary, SqlBuilderResult} from "../utils/sqlUtils";
@@ -9,6 +8,8 @@ export abstract class ConditionBuilder<
     G extends OrmGenerics
 > extends AggregateBuilder<G> {
 
+    protected aliasMappings: Record<string, string> = {};
+
     abstract build(table: string): SqlBuilderResult;
 
     execute(): Promise<DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>> {
@@ -27,13 +28,13 @@ export abstract class ConditionBuilder<
     ]);
 
     private isTableReference(val: any): boolean {
-        console.log(val)
-        const [tableName] = val.split('.');
-        const is  =  typeof val === 'string' &&
+        if (typeof val !== 'string' || !val.includes('.')) return false;
+        const [prefix, column] = val.split('.');
+        const tableName = this.aliasMappings[prefix] ?? prefix;
+        return (
             typeof this.config.C6?.TABLES[tableName] === 'object' &&
-            val in this.config.C6.TABLES[tableName].COLUMNS;
-        console.log(val, is)
-        return is
+            column in this.config.C6.TABLES[tableName].COLUMNS
+        );
     }
 
     private validateOperator(op: string) {
@@ -111,7 +112,7 @@ export abstract class ConditionBuilder<
                     throw new Error(`MATCH_AGAINST requires a table reference as the left operand. Column '${column}' is not a valid table reference.`);
                 }
                 const matchClause = `(MATCH(${column}) ${againstClause})`;
-                isVerbose() && console.log(`[MATCH_AGAINST] ${matchClause}`);
+                this.config.verbose && console.log(`[MATCH_AGAINST] ${matchClause}`);
                 return matchClause;
             }
 
@@ -141,6 +142,10 @@ export abstract class ConditionBuilder<
                 return `(${column}) ${op} ${value}`;
             }
 
+            if (leftIsRef && !rightIsRef) {
+                return `(${column}) ${op} ${this.addParam(params, column, value)}`;
+            }
+
             if (rightIsRef) {
                 return `(${this.addParam(params, column, column)}) ${op} ${value}`;
             }
@@ -195,7 +200,7 @@ export abstract class ConditionBuilder<
         const clause = this.buildBooleanJoinedConditions(whereArg, true, params);
         if (!clause) return '';
         const trimmed = clause.replace(/^\((.*)\)$/, '$1');
-        isVerbose() && console.log(`[WHERE] ${trimmed}`);
+        this.config.verbose && console.log(`[WHERE] ${trimmed}`);
         return ` WHERE ${trimmed}`;
     }
 }

package/src/api/orm/builders/JoinBuilder.ts

@@ -1,4 +1,3 @@
-import isVerbose from "../../../variables/isVerbose";
 import {OrmGenerics} from "../../types/ormGenerics";
 import {ConditionBuilder} from "./ConditionBuilder";
 
@@ -12,13 +11,16 @@ export abstract class JoinBuilder<G extends OrmGenerics> extends ConditionBuilde
 
             for (const raw in joinArgs[joinType]) {
                 const [table, alias] = raw.split(' ');
+                if (alias) {
+                    this.aliasMappings[alias] = table;
+                }
                 const onClause = this.buildBooleanJoinedConditions(joinArgs[joinType][raw], true, params);
                 const joinSql = alias ? `\`${table}\` AS \`${alias}\`` : `\`${table}\``;
                 sql += ` ${joinKind} JOIN ${joinSql} ON ${onClause}`;
             }
         }
 
-        isVerbose() && console.log(`[JOIN] ${sql.trim()}`);
+        this.config.verbose && console.log(`[JOIN] ${sql.trim()}`);
 
         return sql;
     }

package/src/api/orm/builders/PaginationBuilder.ts

@@ -1,5 +1,4 @@
 import {C6Constants} from "api/C6Constants";
-import isVerbose from "../../../variables/isVerbose";
 import {OrmGenerics} from "../../types/ormGenerics";
 import {JoinBuilder} from "./JoinBuilder";
 
@@ -50,7 +49,7 @@ export abstract class PaginationBuilder<G extends OrmGenerics> extends JoinBuild
             sql += ` LIMIT ${offset}, ${lim}`;
         }
 
-        isVerbose() && console.log(`[PAGINATION] ${sql.trim()}`);
+        this.config.verbose && console.log(`[PAGINATION] ${sql.trim()}`);
         return sql;
     }
 }

package/src/api/orm/queries/DeleteQueryBuilder.ts

@@ -6,6 +6,7 @@ export class DeleteQueryBuilder<G extends OrmGenerics> extends JoinBuilder<G> {
     build(
         table: string
     ): SqlBuilderResult {
+        this.aliasMappings = {};
         const params = this.useNamedParams ? {} : [];
 
         let sql = `DELETE \`${table}\` FROM \`${table}\``;

package/src/api/orm/queries/PostQueryBuilder.ts

@@ -14,6 +14,7 @@ export class PostQueryBuilder<G extends OrmGenerics> extends ConditionBuilder<G>
     }
 
     build(table: string) {
+        this.aliasMappings = {};
         const verb = C6C.REPLACE in this.request ? C6C.REPLACE : C6C.INSERT;
         const body = verb in this.request ? this.request[verb] : this.request;
         const keys = Object.keys(body);

package/src/api/orm/queries/SelectQueryBuilder.ts

@@ -8,6 +8,7 @@ export class SelectQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
         table: string,
         isSubSelect: boolean = false
     ): SqlBuilderResult {
+        this.aliasMappings = {};
         const args = this.request;
         const params = this.useNamedParams ? {} : [];
         const selectList = args.SELECT ?? ['*'];

package/src/api/orm/queries/UpdateQueryBuilder.ts

@@ -8,6 +8,7 @@ export class UpdateQueryBuilder<G extends OrmGenerics> extends PaginationBuilder
     build(
         table: string,
     ): SqlBuilderResult {
+        this.aliasMappings = {};
         const args = this.request;
         const params = this.useNamedParams ? {} : [];
         let sql = `UPDATE \`${table}\``;

package/src/api/restRequest.ts

@@ -32,6 +32,8 @@ export default function restRequest<
 
         const config = typeof configX === "function" ? configX() : configX;
 
+        config.verbose ??= true; // Default to verbose logging if not set
+
         // SQL path if on Node with a provided pool
         if (isNode() && config.mysqlPool) {
             const {SqlExecutor} = await import('./executors/SqlExecutor');

package/src/api/utils/logger.ts

@@ -1,17 +1,13 @@
-import isVerbose from "variables/isVerbose";
-
 /**
  * Conditionally group a log if verbose.
  */
 export function group(title: string, data?: any): void {
-    if (!isVerbose()) return;
     console.groupCollapsed(`%c${title}`, "color: #007acc");
     if (data !== undefined) console.log(data);
     console.groupEnd();
 }
 
 export function info(message: string, ...optional: any[]): void {
-    if (!isVerbose()) return;
     console.info(`%cINFO: ${message}`, "color: #0a0", ...optional);
 }