@carbonorm/carbonnode 3.0.0 → 3.0.2

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import Qs from 'qs';
-import { __awaiter, __generator, __assign, __spreadArray } from 'tslib';
+import { __assign, __awaiter, __spreadArray, __generator, __extends } from 'tslib';
 import { toast } from 'react-toastify';
 
 var C6Constants = {
@@ -232,366 +232,6 @@ var axiosInstance = (axios.create({
     */
 }));
 
-// import { validatePayloadAgainstSchema } from './validator'; // C6 schema validator
-var CarbonSqlExecutor = /** @class */ (function () {
-    function CarbonSqlExecutor(pool, C6) {
-        this.pool = pool;
-        this.C6 = C6;
-    }
-    CarbonSqlExecutor.prototype.withConnection = function (cb) {
-        return __awaiter(this, void 0, void 0, function () {
-            var conn;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.pool.getConnection()];
-                    case 1:
-                        conn = _a.sent();
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, , 4, 5]);
-                        return [4 /*yield*/, cb(conn)];
-                    case 3: return [2 /*return*/, _a.sent()];
-                    case 4:
-                        conn.release();
-                        return [7 /*endfinally*/];
-                    case 5: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    CarbonSqlExecutor.prototype.handle = function (req, res, next) {
-        return __awaiter(this, void 0, void 0, function () {
-            var method, table, primary, payload, result, _a, err_1;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 11, , 12]);
-                        method = req.method.toUpperCase();
-                        table = req.params.table;
-                        primary = req.params.primary;
-                        payload = method === 'GET' ? req.query : req.body;
-                        if (!(table in this.C6.TABLES)) {
-                            res.status(400).json({ error: "Invalid table: ".concat(table) });
-                            return [2 /*return*/];
-                        }
-                        result = void 0;
-                        _a = method;
-                        switch (_a) {
-                            case 'GET': return [3 /*break*/, 1];
-                            case 'OPTIONS': return [3 /*break*/, 1];
-                            case 'POST': return [3 /*break*/, 3];
-                            case 'PUT': return [3 /*break*/, 5];
-                            case 'DELETE': return [3 /*break*/, 7];
-                        }
-                        return [3 /*break*/, 9];
-                    case 1: return [4 /*yield*/, this.select(table, primary, payload)];
-                    case 2:
-                        result = _b.sent();
-                        return [3 /*break*/, 10];
-                    case 3: return [4 /*yield*/, this.insert(table, payload)];
-                    case 4:
-                        result = _b.sent();
-                        return [3 /*break*/, 10];
-                    case 5: return [4 /*yield*/, this.update(table, primary, payload)];
-                    case 6:
-                        result = _b.sent();
-                        return [3 /*break*/, 10];
-                    case 7: return [4 /*yield*/, this.delete(table, primary, payload)];
-                    case 8:
-                        result = _b.sent();
-                        return [3 /*break*/, 10];
-                    case 9: throw new Error("Unsupported method: ".concat(method));
-                    case 10:
-                        res.status(200).json({ success: true, result: result });
-                        return [3 /*break*/, 12];
-                    case 11:
-                        err_1 = _b.sent();
-                        next(err_1);
-                        return [3 /*break*/, 12];
-                    case 12: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    CarbonSqlExecutor.prototype.buildBooleanJoinedConditions = function (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(this.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, ")");
-    };
-    CarbonSqlExecutor.prototype.buildAggregateField = function (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));
-        }
-    };
-    CarbonSqlExecutor.prototype.buildSelectQuery = function (table, primary, args, isSubSelect) {
-        var _this = this;
-        var _a, _b, _c, _d;
-        if (isSubSelect === void 0) { isSubSelect = false; }
-        var selectList = (_a = args === null || args === void 0 ? void 0 : args[this.C6.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, "`");
-        if (args === null || args === void 0 ? void 0 : args[this.C6.JOIN]) {
-            var joins = args[this.C6.JOIN];
-            for (var joinType in joins) {
-                var joinKeyword = joinType.replace('_', ' ').toUpperCase();
-                for (var joinTable in joins[joinType]) {
-                    var onClause = this.buildBooleanJoinedConditions(joins[joinType][joinTable]);
-                    sql += " ".concat(joinKeyword, " JOIN `").concat(joinTable, "` ON ").concat(onClause);
-                }
-            }
-        }
-        if (args === null || args === void 0 ? void 0 : args[this.C6.WHERE]) {
-            sql += " WHERE ".concat(this.buildBooleanJoinedConditions(args[this.C6.WHERE]));
-        }
-        if (args === null || args === void 0 ? void 0 : args[this.C6.GROUP_BY]) {
-            var groupByFields = Array.isArray(args[this.C6.GROUP_BY]) ? args[this.C6.GROUP_BY].join(', ') : args[this.C6.GROUP_BY];
-            sql += " GROUP BY ".concat(groupByFields);
-        }
-        if (args === null || args === void 0 ? void 0 : args[this.C6.HAVING]) {
-            sql += " HAVING ".concat(this.buildBooleanJoinedConditions(args[this.C6.HAVING]));
-        }
-        if (args === null || args === void 0 ? void 0 : args[this.C6.PAGINATION]) {
-            var p = args[this.C6.PAGINATION];
-            var limitClause = '';
-            if (p[this.C6.ORDER]) {
-                var orderArray = Object.entries(p[this.C6.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
-                var primaryKey = (_c = (_b = this.C6.TABLES['users'].PRIMARY_SHORT) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : 'user_id';
-                sql += " ORDER BY ".concat(primaryKey, " DESC");
-            }
-            if (p[this.C6.LIMIT] != null) {
-                var limit = parseInt(p[this.C6.LIMIT], 10);
-                if (isNaN(limit) || limit < 0) {
-                    throw new Error("Invalid LIMIT: ".concat(p[this.C6.LIMIT]));
-                }
-                var page = parseInt((_d = p[this.C6.PAGE]) !== null && _d !== void 0 ? _d : 1, 10);
-                if (isNaN(page) || page < 1) {
-                    throw new Error("PAGE must be >= 1 (got ".concat(p[this.C6.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;
-    };
-    CarbonSqlExecutor.prototype.select = function (table, primary, args) {
-        return __awaiter(this, void 0, void 0, function () {
-            var sql;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        sql = this.buildSelectQuery(table, primary, args);
-                        return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
-                                var rows;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            console.log(sql);
-                                            return [4 /*yield*/, conn.query(sql)];
-                                        case 1:
-                                            rows = (_a.sent())[0];
-                                            return [2 /*return*/, rows];
-                                    }
-                                });
-                            }); })];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    CarbonSqlExecutor.prototype.insert = function (table, data) {
-        return __awaiter(this, void 0, void 0, function () {
-            var keys, values, placeholders, sql;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        keys = Object.keys(data);
-                        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, ")");
-                        return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
-                                var result;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, conn.execute(sql, values)];
-                                        case 1:
-                                            result = (_a.sent())[0];
-                                            return [2 /*return*/, result];
-                                    }
-                                });
-                            }); })];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    CarbonSqlExecutor.prototype.update = function (table, primary, data) {
-        return __awaiter(this, void 0, void 0, function () {
-            var keys, values, updates, sql;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!primary) {
-                            throw new Error('Primary key is required for update');
-                        }
-                        keys = Object.keys(data);
-                        values = keys.map(function (k) { return data[k]; });
-                        updates = keys.map(function (k) { return "`".concat(k, "` = ?"); }).join(', ');
-                        sql = "UPDATE `".concat(table, "` SET ").concat(updates, " WHERE `").concat(primary, "` = ?");
-                        values.push(data[primary]);
-                        return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
-                                var result;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, conn.execute(sql, values)];
-                                        case 1:
-                                            result = (_a.sent())[0];
-                                            return [2 /*return*/, result];
-                                    }
-                                });
-                            }); })];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    CarbonSqlExecutor.prototype.delete = function (table, primary, args) {
-        return __awaiter(this, void 0, void 0, function () {
-            var sql;
-            var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!primary || !(args === null || args === void 0 ? void 0 : args[primary])) {
-                            throw new Error('Primary key and value required for delete');
-                        }
-                        sql = "DELETE FROM `".concat(table, "` WHERE `").concat(primary, "` = ?");
-                        return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
-                                var result;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0: return [4 /*yield*/, conn.execute(sql, [args[primary]])];
-                                        case 1:
-                                            result = (_a.sent())[0];
-                                            return [2 /*return*/, result];
-                                    }
-                                });
-                            }); })];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    return CarbonSqlExecutor;
-}());
-
-var carbonSqlExecutor = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    CarbonSqlExecutor: CarbonSqlExecutor
-});
-
 function convertForRequestBody (restfulObject, tableName, C6, regexErrorHandler) {
     if (regexErrorHandler === void 0) { regexErrorHandler = alert; }
     var payload = {};
@@ -666,6 +306,221 @@ function convertForRequestBody (restfulObject, tableName, C6, regexErrorHandler)
 var _a;
 var isNode = typeof process !== 'undefined' && !!((_a = process.versions) === null || _a === void 0 ? void 0 : _a.node);
 
+/**
+ * Facade: routes API calls to SQL or HTTP executors based on runtime context.
+ */
+function restRequest(config) {
+    var _this = this;
+    return function () {
+        var args_1 = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            args_1[_i] = arguments[_i];
+        }
+        return __awaiter(_this, __spreadArray([], args_1, true), void 0, function (request) {
+            var SqlExecutor, executor, HttpExecutor, http;
+            if (request === void 0) { request = {}; }
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!(isNode && config.mysqlPool)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, Promise.resolve().then(function () { return SqlExecutor$1; })];
+                    case 1:
+                        SqlExecutor = (_a.sent()).SqlExecutor;
+                        executor = new SqlExecutor(config, request);
+                        return [2 /*return*/, executor.execute()];
+                    case 2: return [4 /*yield*/, Promise.resolve().then(function () { return HttpExecutor$1; })];
+                    case 3:
+                        HttpExecutor = (_a.sent()).HttpExecutor;
+                        http = new HttpExecutor(config, request);
+                        return [2 /*return*/, http.execute()];
+                }
+            });
+        });
+    };
+}
+
+function timeout(shouldContinueAfterTimeout, cb, timeoutMs) {
+    if (timeoutMs === void 0) { timeoutMs = 3000; }
+    var timer = function () { return setTimeout(function () {
+        if (false === shouldContinueAfterTimeout()) {
+            return;
+        }
+        cb();
+    }, timeoutMs); };
+    var timerId = timer();
+    return function () {
+        clearTimeout(timerId);
+    };
+}
+
+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;
+}
+
+var Executor = /** @class */ (function () {
+    function Executor(config, request) {
+        if (request === void 0) { request = {}; }
+        this.config = config;
+        this.request = request;
+    }
+    return Executor;
+}());
+
 function getEnvVar(key, fallback) {
     if (fallback === void 0) { fallback = ''; }
     // Vite-style injection
@@ -690,6 +545,36 @@ var isTest = getEnvVar('JEST_WORKER_ID') || getEnvVar('NODE_ENV') === 'test'
 var envVerbose = getEnvVar('VERBOSE') || getEnvVar('REACT_APP_VERBOSE') || getEnvVar('VITE_VERBOSE') || '';
 var isVerbose = ['true', '1', 'yes', 'on'].includes(envVerbose.toLowerCase());
 
+var eFetchDependencies;
+(function (eFetchDependencies) {
+    eFetchDependencies[eFetchDependencies["NONE"] = 0] = "NONE";
+    eFetchDependencies[eFetchDependencies["REFERENCED"] = 1] = "REFERENCED";
+    eFetchDependencies[eFetchDependencies["CHILDREN"] = 1] = "CHILDREN";
+    eFetchDependencies[eFetchDependencies["REFERENCES"] = 2] = "REFERENCES";
+    eFetchDependencies[eFetchDependencies["PARENTS"] = 2] = "PARENTS";
+    eFetchDependencies[eFetchDependencies["ALL"] = 3] = "ALL";
+    eFetchDependencies[eFetchDependencies["C6ENTITY"] = 4] = "C6ENTITY";
+    eFetchDependencies[eFetchDependencies["RECURSIVE"] = 8] = "RECURSIVE";
+})(eFetchDependencies || (eFetchDependencies = {}));
+
+/**
+ * the first argument ....
+ *
+ * Our api returns a zero argument function iff the method is get and the previous request reached the predefined limit.
+ * This function can be aliased as GetNextPageOfResults(). If the end is reached undefined will be returned.
+ *
+ *
+ * For POST, PUT, and DELETE requests one can expect the primary key of the new or modified index, or a boolean success
+ * indication if no primary key exists.
+ **/
+var POST = 'POST';
+var PUT = 'PUT';
+var GET = 'GET';
+var DELETE = 'DELETE';
+function isPromise(x) {
+    return Object(x).constructor === Promise;
+}
+
 var toastOptions = {
     position: "bottom-left",
     autoClose: 10000,
@@ -730,6 +615,12 @@ function TestRestfulResponse(response, success, error) {
     }
     return false;
 }
+function removePrefixIfExists(tableName, prefix) {
+    if (tableName.startsWith(prefix.toLowerCase())) {
+        return tableName.slice(prefix.length);
+    }
+    return tableName;
+}
 function removeInvalidKeys(request, c6Tables) {
     var intersection = {};
     var restfulObjectKeys = [];
@@ -747,61 +638,11 @@ function removeInvalidKeys(request, c6Tables) {
     isTest || console.log('intersection', intersection);
     return intersection;
 }
-var eFetchDependencies;
-(function (eFetchDependencies) {
-    eFetchDependencies[eFetchDependencies["NONE"] = 0] = "NONE";
-    eFetchDependencies[eFetchDependencies["REFERENCED"] = 1] = "REFERENCED";
-    eFetchDependencies[eFetchDependencies["CHILDREN"] = 1] = "CHILDREN";
-    eFetchDependencies[eFetchDependencies["REFERENCES"] = 2] = "REFERENCES";
-    eFetchDependencies[eFetchDependencies["PARENTS"] = 2] = "PARENTS";
-    eFetchDependencies[eFetchDependencies["ALL"] = 3] = "ALL";
-    eFetchDependencies[eFetchDependencies["C6ENTITY"] = 4] = "C6ENTITY";
-    eFetchDependencies[eFetchDependencies["RECURSIVE"] = 8] = "RECURSIVE";
-})(eFetchDependencies || (eFetchDependencies = {}));
+
 // do not remove entries from this array. It is used to track the progress of API requests.
 // position in array is important. Do not sort. To not add to begging.
 var apiRequestCache = [];
 var userCustomClearCache = [];
-function checkAllRequestsComplete() {
-    var stillRunning = apiRequestCache.filter(function (cache) { return undefined === cache.response; });
-    if (stillRunning.length !== 0) {
-        if (document === null || document === undefined) {
-            throw new Error('document is undefined while waiting for API requests to complete (' + JSON.stringify(apiRequestCache) + ')');
-        }
-        // when requests return emtpy sets in full renders, it may not be possible to track their progress.
-        console.warn('stillRunning...', stillRunning);
-        return stillRunning.map(function (cache) { return cache.requestArgumentsSerialized; });
-    }
-    return true;
-}
-function checkCache(cacheResult, requestMethod, tableName, request) {
-    var _a, _b, _c;
-    if (undefined === (cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.response)) {
-        console.groupCollapsed('%c API: The request on (' + tableName + ') is in cache and the response is undefined. The request has not finished. Returning the request Promise!', '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', request);
-        console.groupEnd();
-        return cacheResult.request;
-    }
-    if (true === (cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.final)) {
-        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);
-            console.log('%c Response Data:', 'color: #cc0', ((_b = (_a = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.rest) || ((_c = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.response) === null || _c === void 0 ? void 0 : _c.data) || (cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.response));
-            console.groupEnd();
-        }
-        return undefined;
-    }
-    return false;
-}
-function sortAndSerializeQueryObject(tables, query) {
-    var orderedQuery = Object.keys(query).sort().reduce(function (obj, key) {
-        obj[key] = query[key];
-        return obj;
-    }, {});
-    return tables + ' ' + JSON.stringify(orderedQuery);
-}
 function clearCache(props) {
     if (false === (props === null || props === void 0 ? void 0 : props.ignoreWarning)) {
         console.warn('The rest api clearCache should only be used with extreme care! Avoid using this in favor of using `cacheResults : boolean`.');
@@ -809,72 +650,104 @@ function clearCache(props) {
     userCustomClearCache.map(function (f) { return 'function' === typeof f && f(); });
     userCustomClearCache = apiRequestCache = [];
 }
-function removePrefixIfExists(tableName, prefix) {
-    if (tableName.startsWith(prefix.toLowerCase())) {
-        return tableName.slice(prefix.length);
-    }
-    return tableName;
-}
-/**
- * the first argument ....
- *
- * Our api returns a zero argument function iff the method is get and the previous request reached the predefined limit.
- * This function can be aliased as GetNextPageOfResults(). If the end is reached undefined will be returned.
- *
- *
- * For POST, PUT, and DELETE requests one can expect the primary key of the new or modified index, or a boolean success
- * indication if no primary key exists.
- **/
-var POST = 'POST';
-var PUT = 'PUT';
-var GET = 'GET';
-var DELETE = 'DELETE';
-function isPromise(x) {
-    return Object(x).constructor === Promise;
+function checkCache(cacheResult, requestMethod, tableName, request) {
+    var _a, _b, _c;
+    if (undefined === (cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.response)) {
+        console.groupCollapsed('%c API: The request on (' + tableName + ') is in cache and the response is undefined. The request has not finished. Returning the request Promise!', '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', request);
+        console.groupEnd();
+        return cacheResult.request;
+    }
+    if (true === (cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.final)) {
+        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);
+            console.log('%c Response Data:', 'color: #cc0', ((_b = (_a = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.rest) || ((_c = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.response) === null || _c === void 0 ? void 0 : _c.data) || (cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.response));
+            console.groupEnd();
+        }
+        return undefined;
+    }
+    return false;
 }
-function extendedTypeHints() {
-    return function (argv) { return restRequest(argv); };
+
+function sortAndSerializeQueryObject(tables, query) {
+    var orderedQuery = Object.keys(query).sort().reduce(function (obj, key) {
+        obj[key] = query[key];
+        return obj;
+    }, {});
+    return tables + ' ' + JSON.stringify(orderedQuery);
 }
-function restRequest(_a) {
-    var _this = this;
-    var C6 = _a.C6, _b = _a.axios, axios = _b === void 0 ? axiosInstance : _b, _c = _a.restURL, restURL = _c === void 0 ? '/rest/' : _c, mysqlPool = _a.mysqlPool, _d = _a.withCredentials, withCredentials = _d === void 0 ? true : _d, tableName = _a.tableName, _e = _a.requestMethod, requestMethod = _e === void 0 ? GET : _e, _f = _a.queryCallback, queryCallback = _f === void 0 ? {} : _f, responseCallback = _a.responseCallback, _g = _a.skipPrimaryCheck, skipPrimaryCheck = _g === void 0 ? false : _g, _h = _a.clearCache, clearCache = _h === void 0 ? undefined : _h;
-    var fullTableList = Array.isArray(tableName) ? tableName : [tableName];
-    var operatingTableFullName = fullTableList[0];
-    var operatingTable = removePrefixIfExists(operatingTableFullName, C6.PREFIX);
-    var tables = fullTableList.join(',');
-    switch (requestMethod) {
-        case GET:
-        case POST:
-        case PUT:
-        case DELETE:
-            break;
-        default:
-            throw Error('Bad request method passed to getApi');
-    }
-    if (null !== clearCache || undefined !== clearCache) {
-        userCustomClearCache[tables + requestMethod] = clearCache;
+
+var HttpExecutor = /** @class */ (function (_super) {
+    __extends(HttpExecutor, _super);
+    function HttpExecutor() {
+        return _super !== null && _super.apply(this, arguments) || this;
     }
-    return function () {
-        var args_1 = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args_1[_i] = arguments[_i];
-        }
-        return __awaiter(_this, __spreadArray([], args_1, true), void 0, function (request) {
-            // this could return itself with a new page number, or undefined if the end is reached
-            function apiRequest() {
-                return __awaiter(this, void 0, void 0, function () {
-                    var querySerialized, cacheResult, cachingConfirmed, cacheCheck, cacheCheck, addBackPK, apiResponse, returnGetNextPageFunction, restRequestUri, needsConditionOrPrimaryCheck, TABLES, primaryKey, CarbonSqlExecutor, engine, removedPkValue_1, axiosActiveRequest;
-                    var _this = this;
-                    var _a, _b, _c, _d, _e, _f, _g;
-                    return __generator(this, function (_h) {
-                        switch (_h.label) {
-                            case 0:
-                                (_a = request.cacheResults) !== null && _a !== void 0 ? _a : (request.cacheResults = C6.GET === requestMethod);
+    HttpExecutor.prototype.execute = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, C6, axios, restURL, withCredentials, restModel, requestMethod, queryCallback, responseCallback, skipPrimaryCheck, clearCache, tableName, fullTableList, operatingTableFullName, operatingTable, tables, query, apiRequest;
+            var _this = this;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.config, C6 = _a.C6, axios = _a.axios, restURL = _a.restURL, withCredentials = _a.withCredentials, restModel = _a.restModel, requestMethod = _a.requestMethod, queryCallback = _a.queryCallback, responseCallback = _a.responseCallback, skipPrimaryCheck = _a.skipPrimaryCheck, clearCache = _a.clearCache;
+                        tableName = restModel.TABLE_NAME;
+                        fullTableList = Array.isArray(tableName) ? tableName : [tableName];
+                        operatingTableFullName = fullTableList[0];
+                        operatingTable = removePrefixIfExists(operatingTableFullName, C6.PREFIX);
+                        tables = fullTableList.join(',');
+                        switch (requestMethod) {
+                            case GET:
+                            case POST:
+                            case PUT:
+                            case DELETE:
+                                break;
+                            default:
+                                throw Error('Bad request method passed to getApi');
+                        }
+                        if (null !== clearCache || undefined !== clearCache) {
+                            userCustomClearCache[tables + requestMethod] = clearCache;
+                        }
+                        console.groupCollapsed('%c API: (' + requestMethod + ') Request for (' + tableName + ')', 'color: #0c0');
+                        console.log('request', this.request);
+                        console.groupEnd();
+                        if ('function' === typeof queryCallback) {
+                            query = queryCallback(this.request); // obj or obj[]
+                        }
+                        else {
+                            query = queryCallback;
+                        }
+                        if (undefined === query || null === query) {
+                            if (this.request.debug && isDevelopment) {
+                                toast.warning("DEV: queryCallback returned undefined, signaling in Custom Cache. (returning null)", toastOptionsDevs);
+                            }
+                            console.groupCollapsed('%c API: (' + requestMethod + ') Request Query for (' + tableName + ') undefined, returning null (will not fire ajax)!', 'color: #c00');
+                            console.log('%c Returning (undefined|null) for a query would indicate a custom cache hit (outside API.tsx), thus the request should not fire.', 'color: #c00');
+                            console.trace();
+                            console.groupEnd();
+                            return [2 /*return*/, null];
+                        }
+                        if (C6.GET === requestMethod) {
+                            if (undefined === query[C6.PAGINATION]) {
+                                query[C6.PAGINATION] = {};
+                            }
+                            query[C6.PAGINATION][C6.PAGE] = query[C6.PAGINATION][C6.PAGE] || 1;
+                            query[C6.PAGINATION][C6.LIMIT] = query[C6.PAGINATION][C6.LIMIT] || 100;
+                        }
+                        apiRequest = function () { return __awaiter(_this, void 0, void 0, function () {
+                            var _a, debug, _b, cacheResults, dataInsertMultipleRows, success, _c, fetchDependencies, _d, error, querySerialized, cacheResult, cachingConfirmed, cacheCheck, cacheCheck, addBackPK, apiResponse, returnGetNextPageFunction, restRequestUri, needsConditionOrPrimaryCheck, TABLES, primaryKey, removedPkValue_1, axiosActiveRequest;
+                            var _e;
+                            var _this = this;
+                            var _f, _g, _h, _j, _k, _l;
+                            return __generator(this, function (_m) {
+                                _a = this.request, debug = _a.debug, _b = _a.cacheResults, cacheResults = _b === void 0 ? (C6.GET === requestMethod) : _b, dataInsertMultipleRows = _a.dataInsertMultipleRows, success = _a.success, _c = _a.fetchDependencies, fetchDependencies = _c === void 0 ? eFetchDependencies.NONE : _c, _d = _a.error, error = _d === void 0 ? "An unexpected API error occurred!" : _d;
                                 if (C6.GET === requestMethod
-                                    && undefined !== ((_b = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _b === void 0 ? void 0 : _b[C6.PAGE])
+                                    && undefined !== ((_f = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _f === void 0 ? void 0 : _f[C6.PAGE])
                                     && 1 !== query[C6.PAGINATION][C6.PAGE]) {
                                     console.groupCollapsed('Request on table (' + tableName + ') is firing for page (' + query[C6.PAGINATION][C6.PAGE] + '), please wait!');
-                                    console.log('Request Data (note you may see the success and/or error prompt):', request);
+                                    console.log('Request Data (note you may see the success and/or error prompt):', this.request);
                                     console.trace();
                                     console.groupEnd();
                                 }
@@ -892,11 +765,11 @@ function restRequest(_a) {
                                     query[C6.PAGINATION][C6.PAGE] = query[C6.PAGINATION][C6.PAGE] || 1;
                                     query[C6.PAGINATION][C6.LIMIT] = query[C6.PAGINATION][C6.LIMIT] || 100;
                                     // this will evaluate true most the time
-                                    if (true === request.cacheResults) {
+                                    if (true === cacheResults) {
                                         // just find the next, non-fetched, page and return a function to request it
                                         if (undefined !== cacheResult) {
                                             do {
-                                                cacheCheck = checkCache(cacheResult, requestMethod, tableName, request);
+                                                cacheCheck = checkCache(cacheResult, requestMethod, tableName, this.request);
                                                 if (false !== cacheCheck) {
                                                     return [2 /*return*/, cacheCheck];
                                                 }
@@ -906,7 +779,7 @@ function restRequest(_a) {
                                                 querySerialized = sortAndSerializeQueryObject(tables, query !== null && query !== void 0 ? query : {});
                                                 cacheResult = apiRequestCache.find(function (cache) { return cache.requestArgumentsSerialized === querySerialized; });
                                             } while (undefined !== cacheResult);
-                                            if (request.debug && isDevelopment) {
+                                            if (debug && isDevelopment) {
                                                 toast.warning("DEVS: Request in cache. (" + 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
@@ -915,17 +788,17 @@ function restRequest(_a) {
                                         cachingConfirmed = true;
                                     }
                                     else {
-                                        if (request.debug && isDevelopment) {
+                                        if (debug && isDevelopment) {
                                             toast.info("DEVS: Ignore cache was set to true.", toastOptionsDevs);
                                         }
                                     }
-                                    if (request.debug && isDevelopment) {
+                                    if (debug && isDevelopment) {
                                         toast.success("DEVS: Request not in cache." + (requestMethod === C6.GET ? "Page (" + query[C6.PAGINATION][C6.PAGE] + ")." : '') + " Logging cache 2 console.", toastOptionsDevs);
                                     }
                                 }
-                                else if (request.cacheResults) { // if we are not getting, we are updating, deleting, or inserting
+                                else if (cacheResults) { // if we are not getting, we are updating, deleting, or inserting
                                     if (cacheResult) {
-                                        cacheCheck = checkCache(cacheResult, requestMethod, tableName, request);
+                                        cacheCheck = checkCache(cacheResult, requestMethod, tableName, this.request);
                                         if (false !== cacheCheck) {
                                             return [2 /*return*/, cacheCheck];
                                         }
@@ -938,7 +811,7 @@ function restRequest(_a) {
                                 needsConditionOrPrimaryCheck = (PUT === requestMethod || DELETE === requestMethod)
                                     && false === skipPrimaryCheck;
                                 TABLES = C6.TABLES;
-                                primaryKey = (_f = (_e = (_d = structuredClone((_c = TABLES[operatingTable]) === null || _c === void 0 ? void 0 : _c.PRIMARY)) === null || _d === void 0 ? void 0 : _d.pop()) === null || _e === void 0 ? void 0 : _e.split('.')) === null || _f === void 0 ? void 0 : _f.pop();
+                                primaryKey = (_k = (_j = (_h = structuredClone((_g = TABLES[operatingTable]) === null || _g === void 0 ? void 0 : _g.PRIMARY)) === null || _h === void 0 ? void 0 : _h.pop()) === null || _j === void 0 ? void 0 : _j.split('.')) === null || _k === void 0 ? void 0 : _k.pop();
                                 if (needsConditionOrPrimaryCheck) {
                                     if (undefined === primaryKey) {
                                         if (null === query
@@ -948,17 +821,17 @@ function restRequest(_a) {
                                                 || query[C6.WHERE].length === 0)
                                             || (Object.keys(query === null || query === void 0 ? void 0 : query[C6.WHERE]).length === 0)) {
                                             console.error(query);
-                                            throw Error('Failed to parse primary key information. Query: (' + JSON.stringify(query) + ') Primary Key: (' + JSON.stringify(primaryKey) + ') TABLES[operatingTable]?.PRIMARY: (' + JSON.stringify((_g = TABLES[operatingTable]) === null || _g === void 0 ? void 0 : _g.PRIMARY) + ') for operatingTable (' + operatingTable + ').');
+                                            throw Error('Failed to parse primary key information. Query: (' + JSON.stringify(query) + ') Primary Key: (' + JSON.stringify(primaryKey) + ') TABLES[operatingTable]?.PRIMARY: (' + JSON.stringify((_l = TABLES[operatingTable]) === null || _l === void 0 ? void 0 : _l.PRIMARY) + ') for operatingTable (' + operatingTable + ').');
                                         }
                                     }
                                     else {
                                         if (undefined === query
                                             || null === query
                                             || false === primaryKey in query) {
-                                            if (true === request.debug && isDevelopment) {
+                                            if (true === debug && isDevelopment) {
                                                 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(request, undefined, 4) + ') Query (' + JSON.stringify(query) + ')');
+                                            throw Error('You must provide the primary key (' + primaryKey + ') for table (' + operatingTable + '). Request (' + JSON.stringify(this.request, undefined, 4) + ') Query (' + JSON.stringify(query) + ')');
                                         }
                                         if (undefined === (query === null || query === void 0 ? void 0 : query[primaryKey])
                                             || null === (query === null || query === void 0 ? void 0 : query[primaryKey])) {
@@ -967,55 +840,6 @@ function restRequest(_a) {
                                         }
                                     }
                                 }
-                                if (!(isNode && mysqlPool)) return [3 /*break*/, 2];
-                                return [4 /*yield*/, Promise.resolve().then(function () { return carbonSqlExecutor; })];
-                            case 1:
-                                CarbonSqlExecutor = (_h.sent()).CarbonSqlExecutor;
-                                engine = new CarbonSqlExecutor(mysqlPool, C6);
-                                switch (requestMethod) {
-                                    case GET:
-                                        return [2 /*return*/, engine
-                                                .select(tableName, undefined, request)
-                                                .then(function (rows) {
-                                                // mirror the front‐end shape
-                                                var serverResponse = {
-                                                    rest: rows,
-                                                    session: undefined,
-                                                    sql: true,
-                                                };
-                                                return serverResponse;
-                                            })];
-                                    case POST:
-                                        return [2 /*return*/, engine
-                                                .insert(tableName, request)
-                                                .then(function (created) { return ({
-                                                rest: created,
-                                            }); })];
-                                    case PUT:
-                                        return [2 /*return*/, engine
-                                                .update(tableName, undefined, request)
-                                                .then(function (updatedResult) {
-                                                var _a;
-                                                return ({
-                                                    rest: updatedResult,
-                                                    rowCount: (_a = updatedResult.affectedRows) !== null && _a !== void 0 ? _a : 0,
-                                                });
-                                            })];
-                                    case DELETE:
-                                        return [2 /*return*/, engine
-                                                .delete(tableName, undefined, request)
-                                                .then(function (deletedResult) {
-                                                var _a;
-                                                return ({
-                                                    rest: deletedResult,
-                                                    rowCount: (_a = deletedResult.affectedRows) !== null && _a !== void 0 ? _a : 0,
-                                                    deleted: true,
-                                                });
-                                            })];
-                                    default:
-                                        throw new Error("Unsupported method: ".concat(requestMethod));
-                                }
-                            case 2:
                                 // A part of me exists that wants to remove this, but it's a good feature
                                 // this allows developers the ability to cache requests based on primary key
                                 // for tables like `photos` this can be a huge performance boost
@@ -1037,12 +861,12 @@ function restRequest(_a) {
                                 }
                                 try {
                                     console.groupCollapsed('%c API: (' + requestMethod + ') Request Query for (' + operatingTable + ') is about to fire, will return with promise!', 'color: #A020F0');
-                                    console.log(request);
+                                    console.log(this.request);
                                     console.log('%c If this is the first request for this datatype; thus the value being set is currently undefined, please remember to update the state to null.', 'color: #A020F0');
                                     console.log('%c Remember undefined indicated the request has not fired, null indicates the request is firing, an empty array would signal no data was returned for the sql stmt.', 'color: #A020F0');
                                     console.trace();
                                     console.groupEnd();
-                                    axiosActiveRequest = axios[requestMethod.toLowerCase()].apply(axios, __spreadArray([restRequestUri], ((function () {
+                                    axiosActiveRequest = (_e = axios)[requestMethod.toLowerCase()].apply(_e, __spreadArray([restRequestUri], ((function () {
                                         // @link - https://axios-http.com/docs/instance
                                         // How configuration vs data is passed is variable, use documentation above for reference
                                         if (requestMethod === GET) {
@@ -1052,9 +876,9 @@ function restRequest(_a) {
                                                 }];
                                         }
                                         else if (requestMethod === POST) {
-                                            if (undefined !== (request === null || request === void 0 ? void 0 : request.dataInsertMultipleRows)) {
+                                            if (undefined !== dataInsertMultipleRows) {
                                                 return [
-                                                    request.dataInsertMultipleRows.map(function (data) {
+                                                    dataInsertMultipleRows.map(function (data) {
                                                         return convertForRequestBody(data, fullTableList, C6, function (message) { return toast.error(message, toastOptions); });
                                                     }),
                                                     {
@@ -1100,11 +924,11 @@ function restRequest(_a) {
                                     // returning the promise with this then is important for tests. todo - we could make that optional.
                                     // https://rapidapi.com/guides/axios-async-await
                                     return [2 /*return*/, axiosActiveRequest.then(function (response) { return __awaiter(_this, void 0, void 0, function () {
-                                            var cacheIndex, responseData_1, fetchDependencies, dependencies_1, fetchReferences_1, apiRequestPromises, _loop_1, _a, _b, _c, _i, tableToFetch;
+                                            var cacheIndex, responseData_1, dependencies_1, fetchReferences_1, apiRequestPromises, _loop_1, _a, _b, _c, _i, tableToFetch;
                                             var _this = this;
-                                            var _d, _e, _f, _g, _h, _j, _k, _l, _m;
-                                            return __generator(this, function (_o) {
-                                                switch (_o.label) {
+                                            var _d, _e, _f, _g, _h, _j, _k;
+                                            return __generator(this, function (_l) {
+                                                switch (_l.label) {
                                                     case 0:
                                                         if (typeof response.data === 'string') {
                                                             if (isTest) {
@@ -1119,40 +943,38 @@ function restRequest(_a) {
                                                             // only cache get method requests
                                                             apiRequestCache[cacheIndex].response = response;
                                                         }
-                                                        apiResponse = TestRestfulResponse(response, request === null || request === void 0 ? void 0 : request.success, (_d = request === null || request === void 0 ? void 0 : request.error) !== null && _d !== void 0 ? _d : "An unexpected API error occurred!");
+                                                        apiResponse = TestRestfulResponse(response, success, error);
                                                         if (false === apiResponse) {
-                                                            if (request.debug && isDevelopment) {
+                                                            if (debug && isDevelopment) {
                                                                 toast.warning("DEVS: TestRestfulResponse returned false for (" + operatingTable + ").", toastOptionsDevs);
                                                             }
                                                             return [2 /*return*/, response];
                                                         }
                                                         // stateful operations are done in the response callback - its leverages rest generated functions
                                                         if (responseCallback) {
-                                                            responseCallback(response, request, apiResponse);
+                                                            responseCallback(response, this.request, apiResponse);
                                                         }
                                                         if (!(C6.GET === requestMethod)) return [3 /*break*/, 6];
                                                         responseData_1 = response.data;
-                                                        returnGetNextPageFunction = 1 !== ((_e = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _e === void 0 ? void 0 : _e[C6.LIMIT]) &&
-                                                            ((_f = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _f === void 0 ? void 0 : _f[C6.LIMIT]) === responseData_1.rest.length;
+                                                        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) {
-                                                            console.groupCollapsed('%c API: Response (' + requestMethod + ' ' + tableName + ') returned length (' + ((_g = responseData_1.rest) === null || _g === void 0 ? void 0 : _g.length) + ') of possible (' + ((_h = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _h === void 0 ? void 0 : _h[C6.LIMIT]) + ') limit!', 'color: #0c0');
+                                                            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', request);
+                                                            console.log('%c Request Data (note you may see the success and/or error prompt):', 'color: #0c0', this.request);
                                                             console.log('%c Response Data:', 'color: #0c0', responseData_1.rest);
-                                                            console.log('%c Will return get next page function:' + (1 !== ((_j = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _j === void 0 ? void 0 : _j[C6.LIMIT]) ? '' : ' (Will not return with explicit limit 1 set)'), 'color: #0c0', true === returnGetNextPageFunction);
+                                                            console.log('%c Will return get next page function:' + (1 !== ((_h = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _h === void 0 ? void 0 : _h[C6.LIMIT]) ? '' : ' (Will not return with explicit limit 1 set)'), 'color: #0c0', true === returnGetNextPageFunction);
                                                             console.trace();
                                                             console.groupEnd();
                                                         }
                                                         if (false === returnGetNextPageFunction
-                                                            && true === request.debug
+                                                            && true === debug
                                                             && isDevelopment) {
-                                                            toast.success("DEVS: Response returned length (" + ((_k = responseData_1.rest) === null || _k === void 0 ? void 0 : _k.length) + ") less than limit (" + ((_l = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _l === void 0 ? void 0 : _l[C6.LIMIT]) + ").", toastOptionsDevs);
+                                                            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);
                                                         }
-                                                        (_m = request.fetchDependencies) !== null && _m !== void 0 ? _m : (request.fetchDependencies = eFetchDependencies.NONE);
-                                                        if (!(request.fetchDependencies
-                                                            && 'number' === typeof request.fetchDependencies
+                                                        if (!(fetchDependencies
+                                                            && 'number' === typeof fetchDependencies
                                                             && responseData_1.rest.length > 0)) return [3 /*break*/, 6];
-                                                        fetchDependencies = request.fetchDependencies;
                                                         console.groupCollapsed('%c API: Fetch Dependencies segment (' + requestMethod + ' ' + tableName + ')'
                                                             + (fetchDependencies & eFetchDependencies.CHILDREN ? ' | (CHILDREN|REFERENCED) ' : '')
                                                             + (fetchDependencies & eFetchDependencies.PARENTS ? ' | (PARENTS|REFERENCED_BY)' : '')
@@ -1223,9 +1045,9 @@ function restRequest(_a) {
                                                         console.log('fetchReferences', fetchReferences_1);
                                                         _loop_1 = function (tableToFetch) {
                                                             var referencesTables, shouldContinue, fetchTable, RestApi, nextFetchDependencies;
-                                                            var _p;
-                                                            return __generator(this, function (_q) {
-                                                                switch (_q.label) {
+                                                            var _m;
+                                                            return __generator(this, function (_o) {
+                                                                switch (_o.label) {
                                                                     case 0:
                                                                         if (fetchDependencies & eFetchDependencies.C6ENTITY
                                                                             && 'string' === typeof tableName
@@ -1245,7 +1067,7 @@ function restRequest(_a) {
                                                                         }
                                                                         return [4 /*yield*/, C6.IMPORT(tableToFetch)];
                                                                     case 1:
-                                                                        fetchTable = _q.sent();
+                                                                        fetchTable = _o.sent();
                                                                         RestApi = fetchTable.default;
                                                                         console.log('%c Fetch Dependencies will select (' + tableToFetch + ') using GET request', 'color: #33ccff');
                                                                         nextFetchDependencies = eFetchDependencies.NONE;
@@ -1268,8 +1090,8 @@ function restRequest(_a) {
                                                                         // it not certain that they are using carbons' entities either
                                                                         // this is a dynamic call to the rest api, any generated table may resolve with (RestApi)
                                                                         // todo - using value to avoid joins.... but. maybe this should be a parameterizable option -- think race conditions; its safer to join
-                                                                        apiRequestPromises.push(RestApi.Get((_p = {},
-                                                                            _p[C6.WHERE] = {
+                                                                        apiRequestPromises.push(RestApi.Get((_m = {},
+                                                                            _m[C6.WHERE] = {
                                                                                 0: Object.keys(fetchReferences_1[tableToFetch]).reduce(function (sum, column) {
                                                                                     fetchReferences_1[tableToFetch][column] = fetchReferences_1[tableToFetch][column].flat(Infinity);
                                                                                     if (0 === fetchReferences_1[tableToFetch][column].length) {
@@ -1284,8 +1106,8 @@ function restRequest(_a) {
                                                                                     return sum;
                                                                                 }, {})
                                                                             },
-                                                                            _p.fetchDependencies = nextFetchDependencies,
-                                                                            _p)));
+                                                                            _m.fetchDependencies = nextFetchDependencies,
+                                                                            _m)));
                                                                         return [2 /*return*/];
                                                                 }
                                                             });
@@ -1295,7 +1117,7 @@ function restRequest(_a) {
                                                         for (_c in _a)
                                                             _b.push(_c);
                                                         _i = 0;
-                                                        _o.label = 1;
+                                                        _l.label = 1;
                                                     case 1:
                                                         if (!(_i < _b.length)) return [3 /*break*/, 4];
                                                         _c = _b[_i];
@@ -1303,8 +1125,8 @@ function restRequest(_a) {
                                                         tableToFetch = _c;
                                                         return [5 /*yield**/, _loop_1(tableToFetch)];
                                                     case 2:
-                                                        _o.sent();
-                                                        _o.label = 3;
+                                                        _l.sent();
+                                                        _l.label = 3;
                                                     case 3:
                                                         _i++;
                                                         return [3 /*break*/, 1];
@@ -1312,16 +1134,17 @@ function restRequest(_a) {
                                                         console.groupEnd();
                                                         return [4 /*yield*/, Promise.all(apiRequestPromises)];
                                                     case 5:
-                                                        _o.sent();
+                                                        _l.sent();
                                                         apiRequestPromises.map(function (promise) { return __awaiter(_this, void 0, void 0, function () {
                                                             var _a, _b;
                                                             return __generator(this, function (_c) {
                                                                 switch (_c.label) {
                                                                     case 0:
-                                                                        if (!Array.isArray(request.fetchDependencies)) {
-                                                                            request.fetchDependencies = [];
+                                                                        if (!Array.isArray(this.request.fetchDependencies)) {
+                                                                            // to reassign value we must ref the root
+                                                                            this.request.fetchDependencies = [];
                                                                         }
-                                                                        _b = (_a = request.fetchDependencies).push;
+                                                                        _b = (_a = this.request.fetchDependencies).push;
                                                                         return [4 /*yield*/, promise];
                                                                     case 1:
                                                                         _b.apply(_a, [_c.sent()]);
@@ -1329,9 +1152,9 @@ function restRequest(_a) {
                                                                 }
                                                             });
                                                         }); });
-                                                        _o.label = 6;
+                                                        _l.label = 6;
                                                     case 6:
-                                                        if (request.debug && isDevelopment) {
+                                                        if (debug && isDevelopment) {
                                                             toast.success("DEVS: (" + requestMethod + ") request complete.", toastOptionsDevs);
                                                         }
                                                         return [2 /*return*/, response];
@@ -1339,75 +1162,289 @@ function restRequest(_a) {
                                             });
                                         }); })];
                                 }
-                                catch (error) {
+                                catch (throwableError) {
                                     if (isTest) {
-                                        throw new Error(JSON.stringify(error));
+                                        throw new Error(JSON.stringify(throwableError));
                                     }
                                     console.groupCollapsed('%c API: An error occurred in the try catch block. returning null!', 'color: #ff0000');
                                     console.log('%c ' + requestMethod + ' ' + tableName, 'color: #A020F0');
-                                    console.warn(error);
+                                    console.warn(throwableError);
                                     console.trace();
                                     console.groupEnd();
-                                    TestRestfulResponse(error, request === null || request === void 0 ? void 0 : request.success, (request === null || request === void 0 ? void 0 : request.error) || "An restful API error occurred!");
+                                    TestRestfulResponse(throwableError, success, error);
                                     return [2 /*return*/, null];
                                 }
                                 return [2 /*return*/];
-                        }
-                    });
-                });
-            }
-            var query;
-            if (request === void 0) { request = {}; }
+                            });
+                        }); };
+                        return [4 /*yield*/, apiRequest()];
+                    case 1: return [2 /*return*/, _b.sent()];
+                }
+            });
+        });
+    };
+    return HttpExecutor;
+}(Executor));
+
+var HttpExecutor$1 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    HttpExecutor: HttpExecutor
+});
+
+var SqlExecutor = /** @class */ (function (_super) {
+    __extends(SqlExecutor, _super);
+    function SqlExecutor() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    SqlExecutor.prototype.execute = function () {
+        switch (this.config.requestMethod) {
+            case 'GET':
+                return this.select(this.config.restModel.TABLE_NAME, undefined, this.request).then(function (rows) { return ({ rest: rows }); });
+            case 'POST':
+                return this.insert(this.config.restModel.TABLE_NAME, this.request);
+            case 'PUT':
+                return this.update(this.config.restModel.TABLE_NAME, undefined, this.request);
+            case 'DELETE':
+                return this.delete(this.config.restModel.TABLE_NAME, undefined, this.request);
+        }
+    };
+    SqlExecutor.prototype.withConnection = function (cb) {
+        return __awaiter(this, void 0, void 0, function () {
+            var conn;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.config.mysqlPool.getConnection()];
+                    case 1:
+                        conn = _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, , 4, 5]);
+                        return [4 /*yield*/, cb(conn)];
+                    case 3: return [2 /*return*/, _a.sent()];
+                    case 4:
+                        conn.release();
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    SqlExecutor.prototype.select = function (table, primary, args) {
+        return __awaiter(this, void 0, void 0, function () {
+            var sql;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.groupCollapsed('%c API: (' + requestMethod + ') Request for (' + operatingTable + ')', 'color: #0c0');
-                        console.log('request', request);
-                        console.groupEnd();
-                        if ('function' === typeof queryCallback) {
-                            query = queryCallback(request); // obj or obj[]
-                        }
-                        else {
-                            query = queryCallback;
-                        }
-                        if (undefined === query || null === query) {
-                            if (request.debug && isDevelopment) {
-                                toast.warning("DEV: queryCallback returned undefined, signaling in Custom Cache. (returning null)", toastOptionsDevs);
-                            }
-                            console.groupCollapsed('%c API: (' + requestMethod + ') Request Query for (' + operatingTable + ') undefined, returning null (will not fire ajax)!', 'color: #c00');
-                            console.log('%c Returning (undefined|null) for a query would indicate a custom cache hit (outside API.tsx), thus the request should not fire.', 'color: #c00');
-                            console.trace();
-                            console.groupEnd();
-                            return [2 /*return*/, null];
+                        sql = buildSelectQuery(table, primary, args);
+                        return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
+                                var rows;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            console.log(sql);
+                                            return [4 /*yield*/, conn.query(sql)];
+                                        case 1:
+                                            rows = (_a.sent())[0];
+                                            return [2 /*return*/, rows];
+                                    }
+                                });
+                            }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    SqlExecutor.prototype.insert = function (table, data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var keys, values, placeholders, sql;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        keys = Object.keys(data);
+                        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, ")");
+                        return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
+                                var result;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, conn.execute(sql, values)];
+                                        case 1:
+                                            result = (_a.sent())[0];
+                                            return [2 /*return*/, result];
+                                    }
+                                });
+                            }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    SqlExecutor.prototype.update = function (table, primary, data) {
+        return __awaiter(this, void 0, void 0, function () {
+            var keys, values, updates, sql;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!primary) {
+                            throw new Error('Primary key is required for update');
                         }
-                        if (C6.GET === requestMethod) {
-                            if (undefined === query[C6.PAGINATION]) {
-                                query[C6.PAGINATION] = {};
-                            }
-                            query[C6.PAGINATION][C6.PAGE] = query[C6.PAGINATION][C6.PAGE] || 1;
-                            query[C6.PAGINATION][C6.LIMIT] = query[C6.PAGINATION][C6.LIMIT] || 100;
+                        keys = Object.keys(data);
+                        values = keys.map(function (k) { return data[k]; });
+                        updates = keys.map(function (k) { return "`".concat(k, "` = ?"); }).join(', ');
+                        sql = "UPDATE `".concat(table, "` SET ").concat(updates, " WHERE `").concat(primary, "` = ?");
+                        values.push(data[primary]);
+                        return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
+                                var result;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, conn.execute(sql, values)];
+                                        case 1:
+                                            result = (_a.sent())[0];
+                                            return [2 /*return*/, result];
+                                    }
+                                });
+                            }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    SqlExecutor.prototype.delete = function (table, primary, args) {
+        return __awaiter(this, void 0, void 0, function () {
+            var sql;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!primary || !(args === null || args === void 0 ? void 0 : args[primary])) {
+                            throw new Error('Primary key and value required for delete');
                         }
-                        return [4 /*yield*/, apiRequest()];
+                        sql = "DELETE FROM `".concat(table, "` WHERE `").concat(primary, "` = ?");
+                        return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
+                                var result;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0: return [4 /*yield*/, conn.execute(sql, [args[primary]])];
+                                        case 1:
+                                            result = (_a.sent())[0];
+                                            return [2 /*return*/, result];
+                                    }
+                                });
+                            }); })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
-}
+    return SqlExecutor;
+}(Executor));
 
-function timeout(shouldContinueAfterTimeout, cb, timeoutMs) {
-    if (timeoutMs === void 0) { timeoutMs = 3000; }
-    var timer = function () { return setTimeout(function () {
-        if (false === shouldContinueAfterTimeout()) {
-            return;
+var SqlExecutor$1 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    SqlExecutor: SqlExecutor
+});
+
+function determineRuntimeJsType(mysqlType) {
+    var base = mysqlType.toLowerCase().split('(')[0];
+    if ([
+        'binary', 'varbinary', 'blob', 'tinyblob', 'mediumblob', 'longblob'
+    ].includes(base))
+        return 'buffer';
+    if ([
+        'json', 'geometry', 'point', 'polygon', 'multipoint', 'multilinestring', 'multipolygon', 'geometrycollection'
+    ].includes(base))
+        return 'object';
+    if ([
+        'tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint',
+        'decimal', 'dec', 'numeric', 'float', 'double', 'real'
+    ].includes(base))
+        return 'number';
+    if ([
+        'boolean', 'bool'
+    ].includes(base))
+        return 'boolean';
+    return 'string';
+}
+function getPrimaryKeyTypes(table) {
+    var _a;
+    var result = {};
+    var _loop_1 = function (key) {
+        var fullKey = (_a = Object.entries(table.COLUMNS).find(function (_a) {
+            _a[0]; var short = _a[1];
+            return short === key;
+        })) === null || _a === void 0 ? void 0 : _a[0];
+        if (typeof fullKey === 'string') {
+            var validation = table.TYPE_VALIDATION[fullKey];
+            if (!validation)
+                return "continue";
+            result[key] = determineRuntimeJsType(validation.MYSQL_TYPE);
         }
-        cb();
-    }, timeoutMs); };
-    var timerId = timer();
-    return function () {
-        clearTimeout(timerId);
     };
+    for (var _i = 0, _b = table.PRIMARY_SHORT; _i < _b.length; _i++) {
+        var key = _b[_i];
+        _loop_1(key);
+    }
+    return result;
+}
+
+/**
+ * Conditionally group a log if verbose.
+ */
+function group(title, data) {
+    if (!isVerbose)
+        return;
+    console.groupCollapsed("%c".concat(title), "color: #007acc");
+    if (data !== undefined)
+        console.log(data);
+    console.groupEnd();
+}
+function info(message) {
+    var optional = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        optional[_i - 1] = arguments[_i];
+    }
+    if (!isVerbose)
+        return;
+    console.info.apply(console, __spreadArray(["%cINFO: ".concat(message), "color: #0a0"], optional, false));
+}
+function warn(message) {
+    var optional = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        optional[_i - 1] = arguments[_i];
+    }
+    console.warn.apply(console, __spreadArray(["%cWARN: ".concat(message), "color: #e90"], optional, false));
+}
+function error(message) {
+    var optional = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        optional[_i - 1] = arguments[_i];
+    }
+    console.error.apply(console, __spreadArray(["%cERROR: ".concat(message), "color: #c00"], optional, false));
+}
+
+function checkAllRequestsComplete() {
+    var stillRunning = apiRequestCache.filter(function (cache) { return undefined === cache.response; });
+    if (stillRunning.length !== 0) {
+        if (document === null || document === undefined) {
+            throw new Error('document is undefined while waiting for API requests to complete (' + JSON.stringify(apiRequestCache) + ')');
+        }
+        // when requests return emtpy sets in full renders, it may not be possible to track their progress.
+        console.warn('stillRunning...', stillRunning);
+        return stillRunning.map(function (cache) { return cache.requestArgumentsSerialized; });
+    }
+    return true;
+}
+
+function onSuccess(message) {
+    toast.success(message, isDevelopment ? toastOptionsDevs : toastOptions);
+}
+function onError(message) {
+    toast.error(message, isDevelopment ? toastOptionsDevs : toastOptions);
 }
 
-export { C6Constants, CarbonSqlExecutor, DELETE, GET, POST, PUT, TestRestfulResponse, axiosInstance, checkAllRequestsComplete, clearCache, convertForRequestBody, eFetchDependencies, extendedTypeHints, getEnvVar, isDevelopment as isLocal, isNode, isPromise, isTest, isVerbose, removeInvalidKeys, removePrefixIfExists, restRequest, timeout, toastOptions, toastOptionsDevs };
+export { C6Constants, DELETE, Executor, GET, HttpExecutor, POST, PUT, SqlExecutor, TestRestfulResponse, apiRequestCache, axiosInstance, buildAggregateField, buildBooleanJoinedConditions, buildSelectQuery, checkAllRequestsComplete, checkCache, clearCache, convertForRequestBody, determineRuntimeJsType, eFetchDependencies, error, getEnvVar, getPrimaryKeyTypes, group, info, isDevelopment as isLocal, isNode, isPromise, isTest, isVerbose, onError, onSuccess, removeInvalidKeys, removePrefixIfExists, restRequest, sortAndSerializeQueryObject, timeout, toastOptions, toastOptionsDevs, userCustomClearCache, warn };
 //# sourceMappingURL=index.esm.js.map