@carbonorm/carbonnode 3.0.10 → 3.0.12

package/dist/index.cjs.js

@@ -311,8 +311,13 @@ function convertForRequestBody (restfulObject, tableName, C6, regexErrorHandler)
     }, {});
 }
 
-var _a;
-var isNode = typeof process !== 'undefined' && !!((_a = process.versions) === null || _a === void 0 ? void 0 : _a.node);
+var isNode = function () {
+    var _a;
+    console.log('Checking if running in Node.js environment...');
+    var isNodeEnv = typeof process !== 'undefined' && !!((_a = process.versions) === null || _a === void 0 ? void 0 : _a.node);
+    console.log("Is Node.js environment: ".concat(isNodeEnv));
+    return isNodeEnv;
+};
 
 /**
  * Facade: routes API calls to SQL or HTTP executors based on runtime context.
@@ -325,7 +330,7 @@ function restRequest(configX) {
             switch (_a.label) {
                 case 0:
                     config = typeof configX === "function" ? configX() : configX;
-                    if (!(isNode && config.mysqlPool)) return [3 /*break*/, 2];
+                    if (!(isNode() && config.mysqlPool)) return [3 /*break*/, 2];
                     return [4 /*yield*/, Promise.resolve().then(function () { return SqlExecutor$1; })];
                 case 1:
                     SqlExecutor = (_a.sent()).SqlExecutor;
@@ -363,165 +368,6 @@ function timeout(shouldContinueAfterTimeout, cb, timeoutMs) {
     };
 }
 
-function buildBooleanJoinedConditions(set, andMode) {
-    if (andMode === void 0) { andMode = true; }
-    var booleanOperator = andMode ? 'AND' : 'OR';
-    var sql = '';
-    var OPERATORS = ['=', '!=', '<', '<=', '>', '>=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'IS', 'IS NOT'];
-    var isAggregateArray = function (value) { return Array.isArray(value) && typeof value[0] === 'string' && OPERATORS.includes(value[0]); };
-    var isNumericKeyed = function (obj) { return Array.isArray(obj) && Object.keys(obj).every(function (k) { return /^\d+$/.test(k); }); };
-    // todo - we should be doing something with value no????
-    var addCondition = function (column, op, _value) {
-        var paramName = column.replace(/\W+/g, '_');
-        return "(".concat(column, " ").concat(op, " :").concat(paramName, ")");
-    };
-    if (isNumericKeyed(set)) {
-        switch (set.length) {
-            case 2:
-                sql += addCondition(set[0], '=', set[1]);
-                break;
-            case 3:
-                if (!OPERATORS.includes(set[1])) {
-                    throw new Error("Invalid operator: ".concat(set[1]));
-                }
-                sql += addCondition(set[0], set[1], set[2]);
-                break;
-            default:
-                throw new Error("Invalid array condition: ".concat(JSON.stringify(set)));
-        }
-    }
-    else {
-        var parts = [];
-        for (var _i = 0, _a = Object.entries(set); _i < _a.length; _i++) {
-            var _b = _a[_i], key = _b[0], value = _b[1];
-            if (/^\d+$/.test(key)) {
-                parts.push(buildBooleanJoinedConditions(value, !andMode));
-                continue;
-            }
-            if (!Array.isArray(value) || isAggregateArray(value)) {
-                parts.push(addCondition(key, '='));
-                continue;
-            }
-            if (value.length === 2 && OPERATORS.includes(value[0])) {
-                parts.push(addCondition(key, value[0], value[1]));
-            }
-            else if (value.length === 1 && isAggregateArray(value[0])) {
-                parts.push(addCondition(key, '=', value[0]));
-            }
-            else {
-                throw new Error("Invalid condition for ".concat(key, ": ").concat(JSON.stringify(value)));
-            }
-        }
-        sql = parts.join(" ".concat(booleanOperator, " "));
-    }
-    return "(".concat(sql, ")");
-}
-function buildAggregateField(field) {
-    if (typeof field === 'string')
-        return field;
-    if (!Array.isArray(field))
-        throw new Error('Invalid SELECT entry: must be string or array');
-    var agg = field[0], args = field.slice(1);
-    switch (agg) {
-        case 'COUNT':
-            return "COUNT(".concat(args[0] || '*', ")");
-        case 'SUM':
-        case 'AVG':
-        case 'MIN':
-        case 'MAX':
-            return "".concat(agg, "(").concat(args[0], ")").concat(args[1] ? " AS ".concat(args[1]) : '');
-        case 'DISTINCT':
-            return "DISTINCT(".concat(args[0], ")").concat(args[1] ? " AS ".concat(args[1]) : '');
-        case 'GROUP_CONCAT': {
-            var col = args[0], alias = args[1], sortCol = args[2], sortType = args[3];
-            var order = sortCol ? " ORDER BY ".concat(sortCol, " ").concat(sortType || 'ASC') : '';
-            return "GROUP_CONCAT(DISTINCT ".concat(col).concat(order, " SEPARATOR ',')").concat(alias ? " AS ".concat(alias) : '');
-        }
-        case 'AS': {
-            var col = args[0], alias = args[1];
-            return "".concat(col, " AS ").concat(alias);
-        }
-        case 'CONVERT_TZ': {
-            var ts = args[0], fromTz = args[1], toTz = args[2];
-            return "CONVERT_TZ(".concat(ts, ", ").concat(fromTz, ", ").concat(toTz, ")");
-        }
-        case 'NOW':
-            return 'NOW()';
-        default:
-            throw new Error("Unsupported aggregate: ".concat(agg));
-    }
-}
-function buildSelectQuery(table, primary, args, isSubSelect) {
-    var _a, _b;
-    if (isSubSelect === void 0) { isSubSelect = false; }
-    var selectList = (_a = args === null || args === void 0 ? void 0 : args[C6Constants.SELECT]) !== null && _a !== void 0 ? _a : ['*'];
-    var selectFields = Array.isArray(selectList)
-        ? selectList.map(function (f) { return buildAggregateField(f); }).join(', ')
-        : '*';
-    var sql = "SELECT ".concat(selectFields, " FROM `").concat(table, "`");
-    if (args === null || args === void 0 ? void 0 : args[C6Constants.JOIN]) {
-        var joins = args[C6Constants.JOIN];
-        for (var joinType in joins) {
-            var joinKeyword = joinType.replace('_', ' ').toUpperCase();
-            for (var joinTable in joins[joinType]) {
-                var onClause = buildBooleanJoinedConditions(joins[joinType][joinTable]);
-                sql += " ".concat(joinKeyword, " JOIN `").concat(joinTable, "` ON ").concat(onClause);
-            }
-        }
-    }
-    if (args === null || args === void 0 ? void 0 : args[C6Constants.WHERE]) {
-        sql += " WHERE ".concat(buildBooleanJoinedConditions(args[C6Constants.WHERE]));
-    }
-    if (args === null || args === void 0 ? void 0 : args[C6Constants.GROUP_BY]) {
-        var groupByFields = Array.isArray(args[C6Constants.GROUP_BY]) ? args[C6Constants.GROUP_BY].join(', ') : args[C6Constants.GROUP_BY];
-        sql += " GROUP BY ".concat(groupByFields);
-    }
-    if (args === null || args === void 0 ? void 0 : args[C6Constants.HAVING]) {
-        sql += " HAVING ".concat(buildBooleanJoinedConditions(args[C6Constants.HAVING]));
-    }
-    if (args === null || args === void 0 ? void 0 : args[C6Constants.PAGINATION]) {
-        var p = args[C6Constants.PAGINATION];
-        var limitClause = '';
-        if (p[C6Constants.ORDER]) {
-            var orderArray = Object.entries(p[C6Constants.ORDER]).map(function (_a) {
-                var col = _a[0], dir = _a[1];
-                if (!['ASC', 'DESC'].includes(String(dir).toUpperCase())) {
-                    throw new Error("Invalid order direction: ".concat(dir));
-                }
-                return "".concat(col, " ").concat(String(dir).toUpperCase());
-            });
-            sql += " ORDER BY ".concat(orderArray.join(', '));
-        }
-        else if (primary) {
-            sql += " ORDER BY ".concat(primary, " DESC");
-        } /*else {
-            // todo - this is wrong
-            const primaryKey = C6Constants.TABLES['users'].PRIMARY_SHORT?.[0] ?? 'user_id';
-            sql += ` ORDER BY ${primaryKey} DESC`;
-        }*/
-        if (p[C6Constants.LIMIT] != null) {
-            var limit = parseInt(p[C6Constants.LIMIT], 10);
-            if (isNaN(limit) || limit < 0) {
-                throw new Error("Invalid LIMIT: ".concat(p[C6Constants.LIMIT]));
-            }
-            var page = parseInt((_b = p[C6Constants.PAGE]) !== null && _b !== void 0 ? _b : 1, 10);
-            if (isNaN(page) || page < 1) {
-                throw new Error("PAGE must be >= 1 (got ".concat(p[C6Constants.PAGE], ")"));
-            }
-            var offset = (page - 1) * limit;
-            limitClause += " LIMIT ".concat(offset, ", ").concat(limit);
-        }
-        sql += limitClause;
-    }
-    else if (!isSubSelect && primary) {
-        sql += " ORDER BY ".concat(primary, " ASC LIMIT 1");
-    }
-    else if (!isSubSelect && !primary) {
-        sql += " ORDER BY id ASC LIMIT 100"; // fallback default limit
-    }
-    return sql;
-}
-
 function getEnvVar(key, fallback) {
     if (fallback === void 0) { fallback = ''; }
     // Vite-style injection
@@ -537,8 +383,10 @@ function getEnvVar(key, fallback) {
     return fallback;
 }
 
-var envVerbose = getEnvVar('VERBOSE') || getEnvVar('REACT_APP_VERBOSE') || getEnvVar('VITE_VERBOSE') || '';
-var isVerbose = ['true', '1', 'yes', 'on'].includes(envVerbose.toLowerCase());
+function isVerbose () {
+    var envVerbose = getEnvVar('VERBOSE') || getEnvVar('REACT_APP_VERBOSE') || getEnvVar('VITE_VERBOSE') || '';
+    return ['true', '1', 'yes', 'on'].includes(envVerbose.toLowerCase());
+}
 
 var Executor = /** @class */ (function () {
     function Executor(config, request) {
@@ -561,7 +409,7 @@ var Executor = /** @class */ (function () {
                         if (!(_i < _a.length)) return [3 /*break*/, 6];
                         _b = _a[_i], key = _b[0], fn = _b[1];
                         if (!(typeof fn === "function")) return [3 /*break*/, 5];
-                        if (isVerbose || args.request.debug) {
+                        if (isVerbose() || args.request.debug) {
                             console.groupCollapsed("[LIFECYCLE] ".concat(this.config.requestMethod, ".").concat(String(phase), ":").concat(key));
                             console.log("config:", args.config);
                             console.log("request:", args.request);
@@ -592,11 +440,220 @@ var Executor = /** @class */ (function () {
     return Executor;
 }());
 
-var isDevelopment = getEnvVar('NODE_ENV', '') === 'development';
+var SqlBuilder = /** @class */ (function (_super) {
+    tslib.__extends(SqlBuilder, _super);
+    function SqlBuilder() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    /** Generate nested WHERE/JOIN conditions with parameter binding */
+    SqlBuilder.prototype.buildBooleanJoinedConditions = function (set, andMode, params) {
+        if (andMode === void 0) { andMode = true; }
+        if (params === void 0) { params = []; }
+        var booleanOperator = andMode ? 'AND' : 'OR';
+        var OPERATORS = ['=', '!=', '<', '<=', '>', '>=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'IS', 'IS NOT'];
+        var isAggregateArray = function (value) {
+            return Array.isArray(value) && typeof value[0] === 'string' && OPERATORS.includes(value[0]);
+        };
+        var isNumericKeyed = function (obj) {
+            return Array.isArray(obj) && Object.keys(obj).every(function (k) { return /^\d+$/.test(k); });
+        };
+        var addCondition = function (column, op, value) {
+            var clause;
+            /*if (Buffer.isBuffer(value)) { // TODO - I want this as a parameterized option, for now default to faster
+                params.push(value.toString('hex')); // Or use UNHEX(?) in SQL
+                clause = `(${column} = UNHEX(?))`;
+            } else {*/
+            params.push(value);
+            clause = "( ".concat(column, " ").concat(op, " ? )");
+            //}
+            isVerbose() && console.log("[WHERE] \u2795 ".concat(clause, " ->"), value);
+            return clause;
+        };
+        var sql;
+        if (isNumericKeyed(set)) {
+            isVerbose() && console.log("[WHERE] Numeric keyed condition:", set);
+            switch (set.length) {
+                case 2:
+                    sql = addCondition(set[0], '=', set[1]);
+                    break;
+                case 3:
+                    if (!OPERATORS.includes(set[1]))
+                        throw new Error("Invalid operator: ".concat(set[1]));
+                    sql = addCondition(set[0], set[1], set[2]);
+                    break;
+                default:
+                    throw new Error("Invalid array condition: ".concat(JSON.stringify(set)));
+            }
+        }
+        else {
+            var parts = [];
+            for (var _i = 0, _a = Object.entries(set); _i < _a.length; _i++) {
+                var _b = _a[_i], key = _b[0], value = _b[1];
+                if (/^\d+$/.test(key)) {
+                    parts.push(this.buildBooleanJoinedConditions(value, !andMode, params));
+                }
+                else if (!Array.isArray(value) || isAggregateArray(value)) {
+                    parts.push(addCondition(key, '=', value));
+                }
+                else if (value.length === 2 && OPERATORS.includes(value[0])) {
+                    parts.push(addCondition(key, value[0], value[1]));
+                }
+                else {
+                    throw new Error("Invalid condition for ".concat(key, ": ").concat(JSON.stringify(value)));
+                }
+            }
+            sql = parts.join(" ".concat(booleanOperator, " "));
+        }
+        isVerbose() && console.log("[WHERE] Final: (".concat(sql, ")"));
+        return "(".concat(sql, ")");
+    };
+    /** Translate array or function calls into SQL expressions */
+    SqlBuilder.prototype.buildAggregateField = function (field) {
+        if (typeof field === 'string')
+            return field;
+        if (!Array.isArray(field))
+            throw new Error('Invalid SELECT entry');
+        var fn = field[0], args = field.slice(1);
+        var alias;
+        if (args.length >= 2 && args[args.length - 2] === 'AS') {
+            alias = String(args.pop());
+            args.pop();
+        }
+        var F = String(fn).toUpperCase();
+        var p = args.join(', ');
+        isVerbose() && console.log("[SELECT] ".concat(F, "(").concat(p, ")").concat(alias ? " AS ".concat(alias) : ''));
+        switch (F) {
+            case 'DATE_ADD':
+                return "DATE_ADD(".concat(args[0], ", ").concat(args[1], ")").concat(alias ? " AS ".concat(alias) : '');
+            case 'DATE_SUB':
+                return "DATE_SUB(".concat(args[0], ", ").concat(args[1], ")").concat(alias ? " AS ".concat(alias) : '');
+            case 'YEAR':
+                return "YEAR(".concat(args[0], ")").concat(alias ? " AS ".concat(alias) : '');
+            case 'MONTH':
+                return "MONTH(".concat(args[0], ")").concat(alias ? " AS ".concat(alias) : '');
+            case 'DAY':
+                return "DAY(".concat(args[0], ")").concat(alias ? " AS ".concat(alias) : '');
+            case 'ROUND':
+            case 'CEIL':
+            case 'FLOOR':
+            case 'ABS':
+            case 'SQRT':
+                return "".concat(F, "(").concat(p, ")").concat(alias ? " AS ".concat(alias) : '');
+            case 'ST_DISTANCE':
+                return "ST_Distance(".concat(p, ")").concat(alias ? " AS ".concat(alias) : '');
+            default:
+                if (/^[A-Z_]+$/.test(F))
+                    return "".concat(F, "(").concat(p, ")").concat(alias ? " AS ".concat(alias) : '');
+                throw new Error("Unsupported function: ".concat(F));
+        }
+    };
+    /** Compose a parameterized SELECT query with optional JOIN/WHERE/GROUP/HAVING/PAGINATION */
+    SqlBuilder.prototype.buildSelectQuery = function (table, primary, args, isSubSelect) {
+        var _this = this;
+        var _a, _b, _c, _d;
+        if (isSubSelect === void 0) { isSubSelect = false; }
+        var model = this.config.C6.TABLES[table];
+        var params = [];
+        // SELECT
+        var selectList = (_a = args === null || args === void 0 ? void 0 : args[C6Constants.SELECT]) !== null && _a !== void 0 ? _a : ['*'];
+        var selectFields = Array.isArray(selectList)
+            ? selectList.map(function (f) { return _this.buildAggregateField(f); }).join(', ')
+            : '*';
+        var sql = "SELECT ".concat(selectFields, " FROM ").concat(table);
+        isVerbose() && console.log("[SELECT]", selectFields);
+        // JOIN
+        if (args === null || args === void 0 ? void 0 : args[C6Constants.JOIN]) {
+            for (var jt in args[C6Constants.JOIN]) {
+                var jk = jt.replace('_', ' ').toUpperCase();
+                for (var jn in args[C6Constants.JOIN][jt]) {
+                    var on = this.buildBooleanJoinedConditions(args[C6Constants.JOIN][jt][jn], true, params);
+                    sql += " ".concat(jk, " JOIN `").concat(jn, "` ON ").concat(on);
+                    isVerbose() && console.log("[JOIN]", jk, jn, on);
+                }
+            }
+        }
+        // WHERE
+        if (args === null || args === void 0 ? void 0 : args[C6Constants.WHERE]) {
+            var wc = this.buildBooleanJoinedConditions(args[C6Constants.WHERE], true, params);
+            // Trim leading and trailing parentheses if they fully wrap the condition
+            while (wc.startsWith('(') && wc.endsWith(')')) {
+                wc = wc.slice(1, -1).trim();
+            }
+            sql += " WHERE ".concat(wc);
+        }
+        // GROUP BY
+        if (args === null || args === void 0 ? void 0 : args[C6Constants.GROUP_BY]) {
+            var gb = Array.isArray(args[C6Constants.GROUP_BY])
+                ? args[C6Constants.GROUP_BY].join(', ')
+                : args[C6Constants.GROUP_BY];
+            sql += " GROUP BY ".concat(gb);
+            isVerbose() && console.log("[GROUP BY]", gb);
+        }
+        // HAVING
+        if (args === null || args === void 0 ? void 0 : args[C6Constants.HAVING]) {
+            var hc = this.buildBooleanJoinedConditions(args[C6Constants.HAVING], true, params);
+            sql += " HAVING ".concat(hc);
+        }
+        // PAGINATION
+        if (args === null || args === void 0 ? void 0 : args[C6Constants.PAGINATION]) {
+            var p = args[C6Constants.PAGINATION];
+            if (p[C6Constants.ORDER]) {
+                var ord = Object.entries(p[C6Constants.ORDER]).map(function (_a) {
+                    var c = _a[0], d = _a[1];
+                    return "".concat(c, " ").concat(String(d).toUpperCase());
+                });
+                sql += " ORDER BY ".concat(ord.join(', '));
+                isVerbose() && console.log("[ORDER BY]", ord);
+            }
+            if (p[C6Constants.LIMIT] != null) {
+                var lim = parseInt(p[C6Constants.LIMIT], 10);
+                var pg = parseInt((_b = p[C6Constants.PAGE]) !== null && _b !== void 0 ? _b : 1, 10);
+                var off = (pg - 1) * lim;
+                sql += " LIMIT ".concat(off, ", ").concat(lim);
+                isVerbose() && console.log("[LIMIT]", off, lim);
+            }
+        }
+        // Fallback ORDER/LIMIT
+        else if (!isSubSelect) {
+            var ok = void 0;
+            if (primary)
+                ok = primary;
+            else if ((_c = model === null || model === void 0 ? void 0 : model.PRIMARY_SHORT) === null || _c === void 0 ? void 0 : _c[0])
+                ok = model.PRIMARY_SHORT[0];
+            else
+                for (var _i = 0, _e = ['created_at', 'updated_at']; _i < _e.length; _i++) {
+                    var ts = _e[_i];
+                    if ((_d = model === null || model === void 0 ? void 0 : model.COLUMNS) === null || _d === void 0 ? void 0 : _d["".concat(table, ".").concat(ts)]) {
+                        ok = ts;
+                        break;
+                    }
+                }
+            if (ok) {
+                var dir = primary ? 'ASC' : 'DESC';
+                var lim = primary ? 1 : 100;
+                sql += " ORDER BY ".concat(ok, " ").concat(dir, " LIMIT ").concat(lim);
+                isVerbose() && console.log("[ORDER]", ok, dir, lim);
+            }
+            else {
+                sql += " LIMIT 100";
+                isVerbose() && console.warn("[ORDER] fallback LIMIT 100");
+            }
+        }
+        isVerbose() && console.log("[SQL]", sql, params);
+        return { sql: sql, params: params };
+    };
+    return SqlBuilder;
+}(Executor));
+
+function isLocal () {
+    return getEnvVar('NODE_ENV', '') === 'development';
+}
 
-var isTest = getEnvVar('JEST_WORKER_ID') || getEnvVar('NODE_ENV') === 'test'
-    || getEnvVar('REACT_APP_TEST') === 'true' || getEnvVar('VITE_TEST') === 'true'
-    || getEnvVar('MODE') === 'test' || getEnvVar('VITE_TEST_MODE') === 'true';
+function isTest () {
+    return getEnvVar('JEST_WORKER_ID') || getEnvVar('NODE_ENV') === 'test'
+        || getEnvVar('REACT_APP_TEST') === 'true' || getEnvVar('VITE_TEST') === 'true'
+        || getEnvVar('MODE') === 'test' || getEnvVar('VITE_TEST_MODE') === 'true';
+}
 
 exports.eFetchDependencies = void 0;
 (function (eFetchDependencies) {
@@ -676,7 +733,7 @@ function removeInvalidKeys(request, c6Tables) {
             intersection[key] = request[key];
         }
     });
-    isTest || console.log('intersection', intersection);
+    isTest() || console.log('intersection', intersection);
     return intersection;
 }
 
@@ -701,7 +758,7 @@ function checkCache(cacheResult, requestMethod, tableName, request) {
         return cacheResult.request;
     }
     if (true === (cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.final)) {
-        if (false === isTest || true === isVerbose) {
+        if (false === isTest() || true === isVerbose()) {
             console.groupCollapsed('%c API: Rest api cache (' + requestMethod + '  ' + tableName + ') has reached the final result. Returning undefined!', 'color: #cc0');
             console.log('%c ' + requestMethod + ' ' + tableName, 'color: #cc0');
             console.log('%c Request Data (note you may see the success and/or error prompt):', 'color: #cc0', request);
@@ -874,7 +931,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                         if (undefined !== cacheResult) return [3 /*break*/, 1];
                                         _p.label = 5;
                                     case 5:
-                                        if (debug && isDevelopment) {
+                                        if (debug && isLocal()) {
                                             reactToastify.toast.warning("DEVS: Request in cache. (" + exports.apiRequestCache.findIndex(function (cache) { return cache.requestArgumentsSerialized === querySerialized; }) + "). Returning function to request page (" + query[C6.PAGINATION][C6.PAGE] + ")", toastOptionsDevs);
                                         }
                                         // @ts-ignore - this is an incorrect warning on TS, it's well typed
@@ -883,12 +940,12 @@ var HttpExecutor = /** @class */ (function (_super) {
                                         cachingConfirmed = true;
                                         return [3 /*break*/, 8];
                                     case 7:
-                                        if (debug && isDevelopment) {
+                                        if (debug && isLocal()) {
                                             reactToastify.toast.info("DEVS: Ignore cache was set to true.", toastOptionsDevs);
                                         }
                                         _p.label = 8;
                                     case 8:
-                                        if (debug && isDevelopment) {
+                                        if (debug && isLocal()) {
                                             reactToastify.toast.success("DEVS: Request not in cache." + (requestMethod === C6.GET ? "Page (" + query[C6.PAGINATION][C6.PAGE] + ")." : '') + " Logging cache 2 console.", toastOptionsDevs);
                                         }
                                         return [3 /*break*/, 12];
@@ -925,7 +982,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                 if (undefined === query
                                                     || null === query
                                                     || false === primaryKey in query) {
-                                                    if (true === debug && isDevelopment) {
+                                                    if (true === debug && isLocal()) {
                                                         reactToastify.toast.error('DEVS: The primary key (' + primaryKey + ') was not provided!!');
                                                     }
                                                     throw Error('You must provide the primary key (' + primaryKey + ') for table (' + operatingTable + '). Request (' + JSON.stringify(this.request, undefined, 4) + ') Query (' + JSON.stringify(query) + ')');
@@ -1014,7 +1071,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                             case 0:
                                                                 // noinspection SuspiciousTypeOfGuard
                                                                 if (typeof response.data === 'string') {
-                                                                    if (isTest) {
+                                                                    if (isTest()) {
                                                                         console.trace();
                                                                         throw new Error('The response data was a string this typically indicated html was sent. Make sure all cookies (' + JSON.stringify(response.config.headers) + ') needed are present! (' + response.data + ')');
                                                                     }
@@ -1034,7 +1091,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                 // todo - this feels dumb now, but i digress
                                                                 apiResponse = TestRestfulResponse(response, success, error);
                                                                 if (false === apiResponse) {
-                                                                    if (debug && isDevelopment) {
+                                                                    if (debug && isLocal()) {
                                                                         reactToastify.toast.warning("DEVS: TestRestfulResponse returned false for (" + operatingTable + ").", toastOptionsDevs);
                                                                     }
                                                                     return [2 /*return*/, response];
@@ -1072,7 +1129,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                 responseData_1 = response.data;
                                                                 returnGetNextPageFunction = 1 !== ((_d = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _d === void 0 ? void 0 : _d[C6.LIMIT]) &&
                                                                     ((_e = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _e === void 0 ? void 0 : _e[C6.LIMIT]) === responseData_1.rest.length;
-                                                                if (false === isTest || true === isVerbose) {
+                                                                if (false === isTest() || true === isVerbose()) {
                                                                     console.groupCollapsed('%c API: Response (' + requestMethod + ' ' + tableName + ') returned length (' + ((_f = responseData_1.rest) === null || _f === void 0 ? void 0 : _f.length) + ') of possible (' + ((_g = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _g === void 0 ? void 0 : _g[C6.LIMIT]) + ') limit!', 'color: #0c0');
                                                                     console.log('%c ' + requestMethod + ' ' + tableName, 'color: #0c0');
                                                                     console.log('%c Request Data (note you may see the success and/or error prompt):', 'color: #0c0', this.request);
@@ -1083,7 +1140,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                 }
                                                                 if (false === returnGetNextPageFunction
                                                                     && true === debug
-                                                                    && isDevelopment) {
+                                                                    && isLocal()) {
                                                                     reactToastify.toast.success("DEVS: Response returned length (" + ((_j = responseData_1.rest) === null || _j === void 0 ? void 0 : _j.length) + ") less than limit (" + ((_k = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _k === void 0 ? void 0 : _k[C6.LIMIT]) + ").", toastOptionsDevs);
                                                                 }
                                                                 if (!(fetchDependencies
@@ -1268,7 +1325,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                 }); });
                                                                 _l.label = 6;
                                                             case 6:
-                                                                if (debug && isDevelopment) {
+                                                                if (debug && isLocal()) {
                                                                     reactToastify.toast.success("DEVS: (" + requestMethod + ") request complete.", toastOptionsDevs);
                                                                 }
                                                                 return [2 /*return*/, response];
@@ -1277,7 +1334,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                 }); }).then(function (response) { return response.data; })];
                                         }
                                         catch (throwableError) {
-                                            if (isTest) {
+                                            if (isTest()) {
                                                 throw new Error(JSON.stringify(throwableError));
                                             }
                                             console.groupCollapsed('%c API: An error occurred in the try catch block. returning null!', 'color: #ff0000');
@@ -1313,13 +1370,16 @@ var SqlExecutor = /** @class */ (function (_super) {
     }
     SqlExecutor.prototype.execute = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, TABLE_NAME, PRIMARY, _b, rest, result, created, result, updated, result, deleted;
-            return tslib.__generator(this, function (_c) {
-                switch (_c.label) {
+            var TABLE_NAME, method, _a, rest, result, created, result, updated, result, deleted;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        _a = this.config.restModel, TABLE_NAME = _a.TABLE_NAME, PRIMARY = _a.PRIMARY;
-                        _b = this.config.requestMethod;
-                        switch (_b) {
+                        TABLE_NAME = this.config.restModel.TABLE_NAME;
+                        method = this.config.requestMethod;
+                        console.log("[SQL EXECUTOR] \u25B6\uFE0F Executing ".concat(method, " on table \"").concat(TABLE_NAME, "\""));
+                        console.log("[SQL EXECUTOR] \uD83E\uDDFE Request payload:", this.request);
+                        _a = method;
+                        switch (_a) {
                             case 'GET': return [3 /*break*/, 1];
                             case 'POST': return [3 /*break*/, 3];
                             case 'PUT': return [3 /*break*/, 5];
@@ -1328,24 +1388,36 @@ var SqlExecutor = /** @class */ (function (_super) {
                         return [3 /*break*/, 9];
                     case 1: return [4 /*yield*/, this.select(TABLE_NAME, undefined, this.request)];
                     case 2:
-                        rest = _c.sent();
+                        rest = _b.sent();
+                        console.log("[SQL EXECUTOR] \u2705 GET result:", rest);
                         return [2 /*return*/, { rest: rest }];
                     case 3: return [4 /*yield*/, this.insert(TABLE_NAME, this.request)];
                     case 4:
-                        result = _c.sent();
+                        result = _b.sent();
+                        console.log("[SQL EXECUTOR] \u2705 POST result:", result);
                         created = { rest: result, created: true };
                         return [2 /*return*/, created];
-                    case 5: return [4 /*yield*/, this.update(TABLE_NAME, PRIMARY, this.request)];
+                    case 5: return [4 /*yield*/, this.update(TABLE_NAME, [], this.request)];
                     case 6:
-                        result = _c.sent();
-                        updated = { rest: result, updated: true, rowCount: result.affectedRows };
+                        result = _b.sent();
+                        console.log("[SQL EXECUTOR] \u2705 PUT result:", result);
+                        updated = {
+                            rest: result,
+                            updated: true,
+                            rowCount: result.affectedRows
+                        };
                         return [2 /*return*/, updated];
-                    case 7: return [4 /*yield*/, this.delete(TABLE_NAME, PRIMARY, this.request)];
+                    case 7: return [4 /*yield*/, this.delete(TABLE_NAME, [], this.request)];
                     case 8:
-                        result = _c.sent();
-                        deleted = { rest: result, deleted: true, rowCount: result.affectedRows };
+                        result = _b.sent();
+                        console.log("[SQL EXECUTOR] \u2705 DELETE result:", result);
+                        deleted = {
+                            rest: result,
+                            deleted: true,
+                            rowCount: result.affectedRows
+                        };
                         return [2 /*return*/, deleted];
-                    case 9: throw new Error("Unsupported request method: ".concat(this.config.requestMethod));
+                    case 9: throw new Error("Unsupported request method: ".concat(method));
                 }
             });
         });
@@ -1355,15 +1427,19 @@ var SqlExecutor = /** @class */ (function (_super) {
             var conn;
             return tslib.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.config.mysqlPool.getConnection()];
+                    case 0:
+                        console.log("[SQL EXECUTOR] \uD83D\uDCE1 Getting DB connection");
+                        return [4 /*yield*/, this.config.mysqlPool.getConnection()];
                     case 1:
                         conn = _a.sent();
                         _a.label = 2;
                     case 2:
                         _a.trys.push([2, , 4, 5]);
+                        console.log("[SQL EXECUTOR] \u2705 Connection acquired");
                         return [4 /*yield*/, cb(conn)];
                     case 3: return [2 /*return*/, _a.sent()];
                     case 4:
+                        console.log("[SQL EXECUTOR] \uD83D\uDD0C Releasing DB connection");
                         conn.release();
                         return [7 /*endfinally*/];
                     case 5: return [2 /*return*/];
@@ -1373,21 +1449,23 @@ var SqlExecutor = /** @class */ (function (_super) {
     };
     SqlExecutor.prototype.select = function (table, primary, args) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var sql;
+            var sql, formatted;
             var _this = this;
             return tslib.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        sql = buildSelectQuery(table, primary, args);
+                        sql = this.buildSelectQuery(table, primary, args);
+                        console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated SELECT SQL:", sql);
+                        formatted = this.formatSQLWithParams(sql.sql, sql.params);
+                        console.log("[SQL EXECUTOR] \uD83E\uDDE0 Formatted SELECT SQL:", formatted);
                         return [4 /*yield*/, this.withConnection(function (conn) { return tslib.__awaiter(_this, void 0, void 0, function () {
                                 var rows;
                                 return tslib.__generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0:
-                                            console.log(sql);
-                                            return [4 /*yield*/, conn.query(sql)];
+                                        case 0: return [4 /*yield*/, conn.query(sql.sql, sql.params)];
                                         case 1:
                                             rows = (_a.sent())[0];
+                                            console.log("[SQL EXECUTOR] \uD83D\uDCE6 Rows fetched:", rows);
                                             return [2 /*return*/, rows];
                                     }
                                 });
@@ -1408,6 +1486,8 @@ var SqlExecutor = /** @class */ (function (_super) {
                         values = keys.map(function (k) { return data[k]; });
                         placeholders = keys.map(function () { return '?'; }).join(', ');
                         sql = "INSERT INTO `".concat(table, "` (").concat(keys.join(', '), ") VALUES (").concat(placeholders, ")");
+                        console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated INSERT SQL:", sql);
+                        console.log("[SQL EXECUTOR] \uD83D\uDD22 Values:", values);
                         return [4 /*yield*/, this.withConnection(function (conn) { return tslib.__awaiter(_this, void 0, void 0, function () {
                                 var result;
                                 return tslib.__generator(this, function (_a) {
@@ -1438,6 +1518,8 @@ var SqlExecutor = /** @class */ (function (_super) {
                         updates = keys.map(function (k) { return "`".concat(k, "` = ?"); }).join(', ');
                         sql = "UPDATE `".concat(table, "` SET ").concat(updates, " WHERE `").concat(primary[0], "` = ?");
                         values.push(data[primary[0]]);
+                        console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated UPDATE SQL:", sql);
+                        console.log("[SQL EXECUTOR] \uD83D\uDD22 Values:", values);
                         return [4 /*yield*/, this.withConnection(function (conn) { return tslib.__awaiter(_this, void 0, void 0, function () {
                                 var result;
                                 return tslib.__generator(this, function (_a) {
@@ -1465,6 +1547,8 @@ var SqlExecutor = /** @class */ (function (_super) {
                         if (!key || !(args === null || args === void 0 ? void 0 : args[key]))
                             throw new Error('Primary key and value required for delete');
                         sql = "DELETE FROM `".concat(table, "` WHERE `").concat(key, "` = ?");
+                        console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated DELETE SQL:", sql);
+                        console.log("[SQL EXECUTOR] \uD83D\uDD22 Value:", args[key]);
                         return [4 /*yield*/, this.withConnection(function (conn) { return tslib.__awaiter(_this, void 0, void 0, function () {
                                 var result;
                                 return tslib.__generator(this, function (_a) {
@@ -1481,8 +1565,27 @@ var SqlExecutor = /** @class */ (function (_super) {
             });
         });
     };
+    SqlExecutor.prototype.formatSQLWithParams = function (sql, params) {
+        var index = 0;
+        return sql.replace(/\?/g, function () {
+            if (index >= params.length)
+                return '?'; // fallback if params are missing
+            var val = params[index++];
+            if (val === null || val === undefined)
+                return 'NULL';
+            if (Buffer.isBuffer(val))
+                return "UNHEX('".concat(val.toString('hex'), "')");
+            if (typeof val === 'string')
+                return "'".concat(val.replace(/'/g, "''"), "'");
+            if (typeof val === 'number')
+                return val.toString();
+            if (val instanceof Date)
+                return "'".concat(val.toISOString().slice(0, 19).replace('T', ' '), "'");
+            return "'".concat(JSON.stringify(val), "'");
+        });
+    };
     return SqlExecutor;
-}(Executor));
+}(SqlBuilder));
 
 var SqlExecutor$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -1593,7 +1696,7 @@ function getPrimaryKeyTypes(table) {
  * Conditionally group a log if verbose.
  */
 function group(title, data) {
-    if (!isVerbose)
+    if (!isVerbose())
         return;
     console.groupCollapsed("%c".concat(title), "color: #007acc");
     if (data !== undefined)
@@ -1605,7 +1708,7 @@ function info(message) {
     for (var _i = 1; _i < arguments.length; _i++) {
         optional[_i - 1] = arguments[_i];
     }
-    if (!isVerbose)
+    if (!isVerbose())
         return;
     console.info.apply(console, tslib.__spreadArray(["%cINFO: ".concat(message), "color: #0a0"], optional, false));
 }
@@ -1638,10 +1741,10 @@ function checkAllRequestsComplete() {
 }
 
 function onSuccess(message) {
-    reactToastify.toast.success(message, isDevelopment ? toastOptionsDevs : toastOptions);
+    reactToastify.toast.success(message, isLocal() ? toastOptionsDevs : toastOptions);
 }
 function onError(message) {
-    reactToastify.toast.error(message, isDevelopment ? toastOptionsDevs : toastOptions);
+    reactToastify.toast.error(message, isLocal() ? toastOptionsDevs : toastOptions);
 }
 
 exports.C6Constants = C6Constants;
@@ -1652,12 +1755,10 @@ exports.GET = GET;
 exports.HttpExecutor = HttpExecutor;
 exports.POST = POST;
 exports.PUT = PUT;
+exports.SqlBuilder = SqlBuilder;
 exports.SqlExecutor = SqlExecutor;
 exports.TestRestfulResponse = TestRestfulResponse;
 exports.axiosInstance = axiosInstance;
-exports.buildAggregateField = buildAggregateField;
-exports.buildBooleanJoinedConditions = buildBooleanJoinedConditions;
-exports.buildSelectQuery = buildSelectQuery;
 exports.checkAllRequestsComplete = checkAllRequestsComplete;
 exports.checkCache = checkCache;
 exports.clearCache = clearCache;
@@ -1668,7 +1769,7 @@ exports.getEnvVar = getEnvVar;
 exports.getPrimaryKeyTypes = getPrimaryKeyTypes;
 exports.group = group;
 exports.info = info;
-exports.isLocal = isDevelopment;
+exports.isLocal = isLocal;
 exports.isNode = isNode;
 exports.isTest = isTest;
 exports.isVerbose = isVerbose;