@carbonorm/carbonnode 3.0.13 → 3.1.2

package/dist/index.esm.js

@@ -2,6 +2,8 @@ import axios from 'axios';
 import Qs from 'qs';
 import { __assign, __awaiter, __generator, __extends, __spreadArray } from 'tslib';
 import { toast } from 'react-toastify';
+import namedPlaceholders from 'named-placeholders';
+import { Buffer as Buffer$1 } from 'buffer';
 
 var C6Constants = {
     // try to 1=1 match the Rest abstract class
@@ -66,6 +68,7 @@ var C6Constants = {
     LOCALTIMESTAMP: 'LOCALTIMESTAMP',
     MAKEDATE: 'MAKEDATE',
     MAKETIME: 'MAKETIME',
+    MATCH_AGAINST: 'MATCH_AGAINST',
     MONTHNAME: 'MONTHNAME',
     MICROSECOND: 'MICROSECOND',
     MINUTE: 'MINUTE',
@@ -86,6 +89,37 @@ var C6Constants = {
     SECOND: 'SECOND',
     SECOND_MICROSECOND: 'SECOND_MICROSECOND',
     SELECT: 'SELECT',
+    // MySQL Spatial Functions
+    ST_AREA: 'ST_Area',
+    ST_ASBINARY: 'ST_AsBinary',
+    ST_ASTEXT: 'ST_AsText',
+    ST_BUFFER: 'ST_Buffer',
+    ST_CONTAINS: 'ST_Contains',
+    ST_CROSSES: 'ST_Crosses',
+    ST_DIFFERENCE: 'ST_Difference',
+    ST_DIMENSION: 'ST_Dimension',
+    ST_DISJOINT: 'ST_Disjoint',
+    ST_DISTANCE: 'ST_Distance',
+    ST_DISTANCE_SPHERE: 'ST_Distance_Sphere',
+    ST_ENDPOINT: 'ST_EndPoint',
+    ST_ENVELOPE: 'ST_Envelope',
+    ST_EQUALS: 'ST_Equals',
+    ST_GEOMFROMGEOJSON: 'ST_GeomFromGeoJSON',
+    ST_GEOMFROMTEXT: 'ST_GeomFromText',
+    ST_GEOMFROMWKB: 'ST_GeomFromWKB',
+    ST_INTERSECTS: 'ST_Intersects',
+    ST_LENGTH: 'ST_Length',
+    ST_OVERLAPS: 'ST_Overlaps',
+    ST_POINT: 'ST_Point',
+    ST_SETSRID: 'ST_SetSRID',
+    ST_SRID: 'ST_SRID',
+    ST_STARTPOINT: 'ST_StartPoint',
+    ST_SYMDIFFERENCE: 'ST_SymDifference',
+    ST_TOUCHES: 'ST_Touches',
+    ST_UNION: 'ST_Union',
+    ST_WITHIN: 'ST_Within',
+    ST_X: 'ST_X',
+    ST_Y: 'ST_Y',
     STR_TO_DATE: 'STR_TO_DATE',
     SUBDATE: 'SUBDATE',
     SUBTIME: 'SUBTIME',
@@ -128,6 +162,7 @@ var C6Constants = {
     FINISH: 'FINISH',
     VALIDATE_C6_ENTITY_ID_REGEX: '#^([a-fA-F0-9]{20,35})$#',
 };
+var C6C = C6Constants;
 
 // @link https://www.npmjs.com/package/axios-cache-adapter
 // updating these values
@@ -386,9 +421,11 @@ function isVerbose () {
 }
 
 var Executor = /** @class */ (function () {
-    function Executor(config, request) {
+    function Executor(config, request, useNamedParams) {
+        if (useNamedParams === void 0) { useNamedParams = false; }
         this.config = config;
         this.request = request;
+        this.useNamedParams = useNamedParams;
     }
     Executor.prototype.runLifecycleHooks = function (phase, args) {
         return __awaiter(this, void 0, void 0, function () {
@@ -418,8 +455,10 @@ var Executor = /** @class */ (function () {
                         _d.label = 2;
                     case 2:
                         _d.trys.push([2, 4, , 5]);
+                        // todo - this
                         return [4 /*yield*/, fn(args)];
                     case 3:
+                        // todo - this
                         _d.sent();
                         return [3 /*break*/, 5];
                     case 4:
@@ -437,211 +476,6 @@ var Executor = /** @class */ (function () {
     return Executor;
 }());
 
-var SqlBuilder = /** @class */ (function (_super) {
-    __extends(SqlBuilder, _super);
-    function SqlBuilder() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    /** Generate nested WHERE/JOIN conditions with parameter binding */
-    SqlBuilder.prototype.buildBooleanJoinedConditions = function (set, andMode, params) {
-        if (andMode === void 0) { andMode = true; }
-        if (params === void 0) { params = []; }
-        var booleanOperator = andMode ? 'AND' : 'OR';
-        var OPERATORS = ['=', '!=', '<', '<=', '>', '>=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'IS', 'IS NOT'];
-        var isAggregateArray = function (value) {
-            return Array.isArray(value) && typeof value[0] === 'string' && OPERATORS.includes(value[0]);
-        };
-        var isNumericKeyed = function (obj) {
-            return Array.isArray(obj) && Object.keys(obj).every(function (k) { return /^\d+$/.test(k); });
-        };
-        var addCondition = function (column, op, value) {
-            var clause;
-            /*if (Buffer.isBuffer(value)) { // TODO - I want this as a parameterized option, for now default to faster
-                params.push(value.toString('hex')); // Or use UNHEX(?) in SQL
-                clause = `(${column} = UNHEX(?))`;
-            } else {*/
-            params.push(value);
-            clause = "( ".concat(column, " ").concat(op, " ? )");
-            //}
-            isVerbose() && console.log("[WHERE] \u2795 ".concat(clause, " ->"), value);
-            return clause;
-        };
-        var sql;
-        if (isNumericKeyed(set)) {
-            isVerbose() && console.log("[WHERE] Numeric keyed condition:", set);
-            switch (set.length) {
-                case 2:
-                    sql = addCondition(set[0], '=', set[1]);
-                    break;
-                case 3:
-                    if (!OPERATORS.includes(set[1]))
-                        throw new Error("Invalid operator: ".concat(set[1]));
-                    sql = addCondition(set[0], set[1], set[2]);
-                    break;
-                default:
-                    throw new Error("Invalid array condition: ".concat(JSON.stringify(set)));
-            }
-        }
-        else {
-            var parts = [];
-            for (var _i = 0, _a = Object.entries(set); _i < _a.length; _i++) {
-                var _b = _a[_i], key = _b[0], value = _b[1];
-                if (/^\d+$/.test(key)) {
-                    parts.push(this.buildBooleanJoinedConditions(value, !andMode, params));
-                }
-                else if (!Array.isArray(value) || isAggregateArray(value)) {
-                    parts.push(addCondition(key, '=', value));
-                }
-                else if (value.length === 2 && OPERATORS.includes(value[0])) {
-                    parts.push(addCondition(key, value[0], value[1]));
-                }
-                else {
-                    throw new Error("Invalid condition for ".concat(key, ": ").concat(JSON.stringify(value)));
-                }
-            }
-            sql = parts.join(" ".concat(booleanOperator, " "));
-        }
-        isVerbose() && console.log("[WHERE] Final: (".concat(sql, ")"));
-        return "(".concat(sql, ")");
-    };
-    /** Translate array or function calls into SQL expressions */
-    SqlBuilder.prototype.buildAggregateField = function (field) {
-        if (typeof field === 'string')
-            return field;
-        if (!Array.isArray(field))
-            throw new Error('Invalid SELECT entry');
-        var fn = field[0], args = field.slice(1);
-        var alias;
-        if (args.length >= 2 && args[args.length - 2] === 'AS') {
-            alias = String(args.pop());
-            args.pop();
-        }
-        var F = String(fn).toUpperCase();
-        var p = args.join(', ');
-        isVerbose() && console.log("[SELECT] ".concat(F, "(").concat(p, ")").concat(alias ? " AS ".concat(alias) : ''));
-        switch (F) {
-            case 'DATE_ADD':
-                return "DATE_ADD(".concat(args[0], ", ").concat(args[1], ")").concat(alias ? " AS ".concat(alias) : '');
-            case 'DATE_SUB':
-                return "DATE_SUB(".concat(args[0], ", ").concat(args[1], ")").concat(alias ? " AS ".concat(alias) : '');
-            case 'YEAR':
-                return "YEAR(".concat(args[0], ")").concat(alias ? " AS ".concat(alias) : '');
-            case 'MONTH':
-                return "MONTH(".concat(args[0], ")").concat(alias ? " AS ".concat(alias) : '');
-            case 'DAY':
-                return "DAY(".concat(args[0], ")").concat(alias ? " AS ".concat(alias) : '');
-            case 'ROUND':
-            case 'CEIL':
-            case 'FLOOR':
-            case 'ABS':
-            case 'SQRT':
-                return "".concat(F, "(").concat(p, ")").concat(alias ? " AS ".concat(alias) : '');
-            case 'ST_DISTANCE':
-                return "ST_Distance(".concat(p, ")").concat(alias ? " AS ".concat(alias) : '');
-            default:
-                if (/^[A-Z_]+$/.test(F))
-                    return "".concat(F, "(").concat(p, ")").concat(alias ? " AS ".concat(alias) : '');
-                throw new Error("Unsupported function: ".concat(F));
-        }
-    };
-    /** Compose a parameterized SELECT query with optional JOIN/WHERE/GROUP/HAVING/PAGINATION */
-    SqlBuilder.prototype.buildSelectQuery = function (table, primary, args, isSubSelect) {
-        var _this = this;
-        var _a, _b, _c, _d;
-        if (isSubSelect === void 0) { isSubSelect = false; }
-        var model = this.config.C6.TABLES[table];
-        var params = [];
-        // SELECT
-        var selectList = (_a = args === null || args === void 0 ? void 0 : args[C6Constants.SELECT]) !== null && _a !== void 0 ? _a : ['*'];
-        var selectFields = Array.isArray(selectList)
-            ? selectList.map(function (f) { return _this.buildAggregateField(f); }).join(', ')
-            : '*';
-        var sql = "SELECT ".concat(selectFields, " FROM ").concat(table);
-        isVerbose() && console.log("[SELECT]", selectFields);
-        // JOIN
-        if (args === null || args === void 0 ? void 0 : args[C6Constants.JOIN]) {
-            for (var jt in args[C6Constants.JOIN]) {
-                var jk = jt.replace('_', ' ').toUpperCase();
-                for (var jn in args[C6Constants.JOIN][jt]) {
-                    var on = this.buildBooleanJoinedConditions(args[C6Constants.JOIN][jt][jn], true, params);
-                    sql += " ".concat(jk, " JOIN `").concat(jn, "` ON ").concat(on);
-                    isVerbose() && console.log("[JOIN]", jk, jn, on);
-                }
-            }
-        }
-        // WHERE
-        if (args === null || args === void 0 ? void 0 : args[C6Constants.WHERE]) {
-            var wc = this.buildBooleanJoinedConditions(args[C6Constants.WHERE], true, params);
-            // Trim leading and trailing parentheses if they fully wrap the condition
-            while (wc.startsWith('(') && wc.endsWith(')')) {
-                wc = wc.slice(1, -1).trim();
-            }
-            sql += " WHERE ".concat(wc);
-        }
-        // GROUP BY
-        if (args === null || args === void 0 ? void 0 : args[C6Constants.GROUP_BY]) {
-            var gb = Array.isArray(args[C6Constants.GROUP_BY])
-                ? args[C6Constants.GROUP_BY].join(', ')
-                : args[C6Constants.GROUP_BY];
-            sql += " GROUP BY ".concat(gb);
-            isVerbose() && console.log("[GROUP BY]", gb);
-        }
-        // HAVING
-        if (args === null || args === void 0 ? void 0 : args[C6Constants.HAVING]) {
-            var hc = this.buildBooleanJoinedConditions(args[C6Constants.HAVING], true, params);
-            sql += " HAVING ".concat(hc);
-        }
-        // PAGINATION
-        if (args === null || args === void 0 ? void 0 : args[C6Constants.PAGINATION]) {
-            var p = args[C6Constants.PAGINATION];
-            if (p[C6Constants.ORDER]) {
-                var ord = Object.entries(p[C6Constants.ORDER]).map(function (_a) {
-                    var c = _a[0], d = _a[1];
-                    return "".concat(c, " ").concat(String(d).toUpperCase());
-                });
-                sql += " ORDER BY ".concat(ord.join(', '));
-                isVerbose() && console.log("[ORDER BY]", ord);
-            }
-            if (p[C6Constants.LIMIT] != null) {
-                var lim = parseInt(p[C6Constants.LIMIT], 10);
-                var pg = parseInt((_b = p[C6Constants.PAGE]) !== null && _b !== void 0 ? _b : 1, 10);
-                var off = (pg - 1) * lim;
-                sql += " LIMIT ".concat(off, ", ").concat(lim);
-                isVerbose() && console.log("[LIMIT]", off, lim);
-            }
-        }
-        // Fallback ORDER/LIMIT
-        else if (!isSubSelect) {
-            var ok = void 0;
-            if (primary)
-                ok = primary;
-            else if ((_c = model === null || model === void 0 ? void 0 : model.PRIMARY_SHORT) === null || _c === void 0 ? void 0 : _c[0])
-                ok = model.PRIMARY_SHORT[0];
-            else
-                for (var _i = 0, _e = ['created_at', 'updated_at']; _i < _e.length; _i++) {
-                    var ts = _e[_i];
-                    if ((_d = model === null || model === void 0 ? void 0 : model.COLUMNS) === null || _d === void 0 ? void 0 : _d["".concat(table, ".").concat(ts)]) {
-                        ok = ts;
-                        break;
-                    }
-                }
-            if (ok) {
-                var dir = primary ? 'ASC' : 'DESC';
-                var lim = primary ? 1 : 100;
-                sql += " ORDER BY ".concat(ok, " ").concat(dir, " LIMIT ").concat(lim);
-                isVerbose() && console.log("[ORDER]", ok, dir, lim);
-            }
-            else {
-                sql += " LIMIT 100";
-                isVerbose() && console.warn("[ORDER] fallback LIMIT 100");
-            }
-        }
-        isVerbose() && console.log("[SQL]", sql, params);
-        return { sql: sql, params: params };
-    };
-    return SqlBuilder;
-}(Executor));
-
 function isLocal () {
     return getEnvVar('NODE_ENV', '') === 'development';
 }
@@ -1360,10 +1194,246 @@ var HttpExecutor$1 = /*#__PURE__*/Object.freeze({
     HttpExecutor: HttpExecutor
 });
 
+function convertHexIfBinary(_col, val, columnDef) {
+    if (typeof val === 'string' &&
+        /^[0-9a-fA-F]{32}$/.test(val) &&
+        typeof columnDef === 'object' &&
+        columnDef.MYSQL_TYPE.toUpperCase().includes('BINARY')) {
+        return Buffer.from(val, 'hex');
+    }
+    return val;
+}
+
+var AggregateBuilder = /** @class */ (function (_super) {
+    __extends(AggregateBuilder, _super);
+    function AggregateBuilder() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    AggregateBuilder.prototype.buildAggregateField = function (field) {
+        var _this = this;
+        if (typeof field === 'string') {
+            return field;
+        }
+        if (!Array.isArray(field) || field.length === 0) {
+            throw new Error('Invalid SELECT field entry');
+        }
+        var fn = field[0], args = field.slice(1);
+        var alias;
+        if (args.length >= 2 && String(args[args.length - 2]).toUpperCase() === 'AS') {
+            alias = String(args.pop());
+            args.pop();
+        }
+        var F = String(fn).toUpperCase();
+        var argList = args.map(function (arg) {
+            return Array.isArray(arg) ? _this.buildAggregateField(arg) : arg;
+        }).join(', ');
+        var expr = "".concat(F, "(").concat(argList, ")");
+        if (alias) {
+            expr += " AS ".concat(alias);
+        }
+        isVerbose() && console.log("[SELECT] ".concat(expr));
+        return expr;
+    };
+    return AggregateBuilder;
+}(Executor));
+
+var ConditionBuilder = /** @class */ (function (_super) {
+    __extends(ConditionBuilder, _super);
+    function ConditionBuilder() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.OPERATORS = new Set([
+            '=', '!=', '<', '<=', '>', '>=',
+            'LIKE', 'NOT LIKE', 'IN', 'NOT IN',
+            'IS', 'IS NOT', 'BETWEEN', 'NOT BETWEEN',
+            C6Constants.MATCH_AGAINST
+        ]);
+        return _this;
+    }
+    ConditionBuilder.prototype.execute = function () {
+        throw new Error("Method not implemented.");
+    };
+    ConditionBuilder.prototype.validateOperator = function (op) {
+        if (!this.OPERATORS.has(op)) {
+            throw new Error("Invalid or unsupported SQL operator detected: '".concat(op, "'"));
+        }
+    };
+    ConditionBuilder.prototype.addParam = function (params, column, value) {
+        var _a, _b;
+        var columnDef = (_b = (_a = this.config.C6[column.split('.')[0]]) === null || _a === void 0 ? void 0 : _a.TYPE_VALIDATION) === null || _b === void 0 ? void 0 : _b[column];
+        var val = convertHexIfBinary(column, value, columnDef);
+        if (this.useNamedParams) {
+            var key = "param".concat(Object.keys(params).length);
+            params[key] = val;
+            return ":".concat(key);
+        }
+        else {
+            params.push(val);
+            return '?';
+        }
+    };
+    ConditionBuilder.prototype.buildBooleanJoinedConditions = function (set, andMode, params) {
+        var _this = this;
+        if (andMode === void 0) { andMode = true; }
+        if (params === void 0) { params = []; }
+        var booleanOperator = andMode ? 'AND' : 'OR';
+        var addCondition = function (column, op, value) {
+            _this.validateOperator(op);
+            if (op === C6Constants.MATCH_AGAINST && Array.isArray(value)) {
+                var search = value[0], mode = value[1];
+                var paramName = _this.useNamedParams ? "param".concat(Object.keys(params).length) : null;
+                if (_this.useNamedParams) {
+                    params[paramName] = search;
+                }
+                else {
+                    params.push(search);
+                }
+                var againstClause = void 0;
+                switch ((mode || '').toUpperCase()) {
+                    case 'BOOLEAN':
+                        againstClause = _this.useNamedParams ? "AGAINST(:".concat(paramName, " IN BOOLEAN MODE)") : "AGAINST(? IN BOOLEAN MODE)";
+                        break;
+                    case 'WITH QUERY EXPANSION':
+                        againstClause = _this.useNamedParams ? "AGAINST(:".concat(paramName, " WITH QUERY EXPANSION)") : "AGAINST(? WITH QUERY EXPANSION)";
+                        break;
+                    default: // NATURAL or undefined
+                        againstClause = _this.useNamedParams ? "AGAINST(:".concat(paramName, ")") : "AGAINST(?)";
+                        break;
+                }
+                var matchClause = "(MATCH(".concat(column, ") ").concat(againstClause, ")");
+                isVerbose() && console.log("[MATCH_AGAINST] ".concat(matchClause));
+                return matchClause;
+            }
+            // handle other operators
+            return "( ".concat(column, " ").concat(op, " ").concat(_this.addParam(params, column, value), " )");
+        };
+        var parts = [];
+        if (typeof set === 'object' && !Array.isArray(set)) {
+            for (var _i = 0, _a = Object.entries(set); _i < _a.length; _i++) {
+                var _b = _a[_i], key = _b[0], value = _b[1];
+                if (typeof value === 'object' && value !== null && Object.keys(value).length === 1) {
+                    var _c = Object.entries(value)[0], op = _c[0], val = _c[1];
+                    parts.push(addCondition(key, op, val));
+                }
+                else {
+                    parts.push(addCondition(key, '=', value));
+                }
+            }
+        }
+        var clause = parts.join(" ".concat(booleanOperator, " "));
+        return clause ? "(".concat(clause, ")") : '';
+    };
+    ConditionBuilder.prototype.buildWhereClause = function (whereArg, params) {
+        var clause = this.buildBooleanJoinedConditions(whereArg, true, params);
+        if (!clause)
+            return '';
+        var trimmed = clause.replace(/^\((.*)\)$/, '$1');
+        isVerbose() && console.log("[WHERE] ".concat(trimmed));
+        return " WHERE ".concat(trimmed);
+    };
+    return ConditionBuilder;
+}(AggregateBuilder));
+
+var JoinBuilder = /** @class */ (function (_super) {
+    __extends(JoinBuilder, _super);
+    function JoinBuilder() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    JoinBuilder.prototype.buildJoinClauses = function (joinArgs, params) {
+        var sql = '';
+        for (var joinType in joinArgs) {
+            var joinKind = joinType.replace('_', ' ').toUpperCase();
+            for (var raw in joinArgs[joinType]) {
+                var _a = raw.split(' '), table = _a[0], alias = _a[1];
+                var onClause = this.buildBooleanJoinedConditions(joinArgs[joinType][raw], true, params);
+                var joinSql = alias ? "`".concat(table, "` AS `").concat(alias, "`") : "`".concat(table, "`");
+                sql += " ".concat(joinKind, " JOIN ").concat(joinSql, " ON ").concat(onClause);
+            }
+        }
+        isVerbose() && console.log("[JOIN] ".concat(sql.trim()));
+        return sql;
+    };
+    return JoinBuilder;
+}(ConditionBuilder));
+
+var PaginationBuilder = /** @class */ (function (_super) {
+    __extends(PaginationBuilder, _super);
+    function PaginationBuilder() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    PaginationBuilder.prototype.buildPaginationClause = function (pagination) {
+        var _this = this;
+        var _a;
+        var sql = '';
+        if (pagination === null || pagination === void 0 ? void 0 : pagination[C6Constants.ORDER]) {
+            var orderParts = Object.entries(pagination[C6Constants.ORDER])
+                .map(function (_a) {
+                var col = _a[0], dir = _a[1];
+                return "".concat(Array.isArray(col) ? _this.buildAggregateField(col) : col, " ").concat(String(dir).toUpperCase());
+            });
+            sql += " ORDER BY ".concat(orderParts.join(', '));
+        }
+        if ((pagination === null || pagination === void 0 ? void 0 : pagination[C6Constants.LIMIT]) != null) {
+            var lim = parseInt(pagination[C6Constants.LIMIT], 10);
+            var page = parseInt((_a = pagination[C6Constants.PAGE]) !== null && _a !== void 0 ? _a : 1, 10);
+            var offset = (page - 1) * lim;
+            sql += " LIMIT ".concat(offset, ", ").concat(lim);
+        }
+        isVerbose() && console.log("[PAGINATION] ".concat(sql.trim()));
+        return sql;
+    };
+    return PaginationBuilder;
+}(JoinBuilder));
+
+var SelectQueryBuilder = /** @class */ (function (_super) {
+    __extends(SelectQueryBuilder, _super);
+    function SelectQueryBuilder() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    SelectQueryBuilder.prototype.build = function (table, args, primary, isSubSelect) {
+        var _this = this;
+        var _a;
+        if (isSubSelect === void 0) { isSubSelect = false; }
+        var params = this.useNamedParams ? {} : [];
+        var selectList = (_a = args.SELECT) !== null && _a !== void 0 ? _a : ['*'];
+        var selectFields = selectList
+            .map(function (f) { return _this.buildAggregateField(f); })
+            .join(', ');
+        var sql = "SELECT ".concat(selectFields, " FROM `").concat(table, "`");
+        if (args.JOIN) {
+            sql += this.buildJoinClauses(args.JOIN, params);
+        }
+        if (args.WHERE) {
+            sql += this.buildWhereClause(args.WHERE, params);
+        }
+        if (args.GROUP_BY) {
+            var groupBy = Array.isArray(args.GROUP_BY)
+                ? args.GROUP_BY.join(', ')
+                : args.GROUP_BY;
+            sql += " GROUP BY ".concat(groupBy);
+        }
+        if (args.HAVING) {
+            sql += " HAVING ".concat(this.buildBooleanJoinedConditions(args.HAVING, true, params));
+        }
+        if (args.PAGINATION) {
+            sql += this.buildPaginationClause(args.PAGINATION);
+        }
+        else if (!isSubSelect) {
+            sql += primary ? " ORDER BY ".concat(primary, " ASC LIMIT 1") : " LIMIT 100";
+        }
+        return { sql: sql, params: params };
+    };
+    return SelectQueryBuilder;
+}(PaginationBuilder));
+
 var SqlExecutor = /** @class */ (function (_super) {
     __extends(SqlExecutor, _super);
     function SqlExecutor() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.serialize = function (row) { return Object.fromEntries(Object.entries(row).map(function (_a) {
+            var k = _a[0], v = _a[1];
+            return [k, Buffer$1.isBuffer(v) ? v.toString('hex').toUpperCase() : v];
+        })); };
+        return _this;
     }
     SqlExecutor.prototype.execute = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -1387,7 +1457,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                     case 2:
                         rest = _b.sent();
                         console.log("[SQL EXECUTOR] \u2705 GET result:", rest);
-                        return [2 /*return*/, { rest: rest }];
+                        return [2 /*return*/, rest];
                     case 3: return [4 /*yield*/, this.insert(TABLE_NAME, this.request)];
                     case 4:
                         result = _b.sent();
@@ -1398,11 +1468,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                     case 6:
                         result = _b.sent();
                         console.log("[SQL EXECUTOR] \u2705 PUT result:", result);
-                        updated = {
-                            rest: result,
-                            updated: true,
-                            rowCount: result.affectedRows
-                        };
+                        updated = __assign(__assign({}, result), { updated: true, rowCount: result.rest.affectedRows });
                         return [2 /*return*/, updated];
                     case 7: return [4 /*yield*/, this.delete(TABLE_NAME, [], this.request)];
                     case 8:
@@ -1411,7 +1477,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                         deleted = {
                             rest: result,
                             deleted: true,
-                            rowCount: result.affectedRows
+                            rowCount: result.rest.affectedRows
                         };
                         return [2 /*return*/, deleted];
                     case 9: throw new Error("Unsupported request method: ".concat(method));
@@ -1446,28 +1512,36 @@ var SqlExecutor = /** @class */ (function (_super) {
     };
     SqlExecutor.prototype.select = function (table, primary, args) {
         return __awaiter(this, void 0, void 0, function () {
-            var sql, formatted;
+            var QueryResult, formatted, toUnnamed, _a, sql, values;
             var _this = this;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        sql = this.buildSelectQuery(table, primary, args);
-                        console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated SELECT SQL:", sql);
-                        formatted = this.formatSQLWithParams(sql.sql, sql.params);
+                        QueryResult = (new SelectQueryBuilder(this.config, this.request)).build(table, args, primary);
+                        console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated SELECT SQL:", QueryResult);
+                        formatted = this.formatSQLWithParams(QueryResult.sql, QueryResult.params);
                         console.log("[SQL EXECUTOR] \uD83E\uDDE0 Formatted SELECT SQL:", formatted);
+                        toUnnamed = namedPlaceholders();
+                        _a = toUnnamed(QueryResult.sql, QueryResult.params), sql = _a[0], values = _a[1];
                         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: return [4 /*yield*/, conn.query(sql.sql, sql.params)];
+                                        case 0: return [4 /*yield*/, conn.query(sql, values)];
                                         case 1:
                                             rows = (_a.sent())[0];
                                             console.log("[SQL EXECUTOR] \uD83D\uDCE6 Rows fetched:", rows);
-                                            return [2 /*return*/, rows];
+                                            return [2 /*return*/, {
+                                                    rest: rows.map(this.serialize),
+                                                    sql: {
+                                                        sql: sql,
+                                                        values: values
+                                                    }
+                                                }];
                                     }
                                 });
                             }); })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1: return [2 /*return*/, _b.sent()];
                 }
             });
         });
@@ -1482,7 +1556,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                         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, ")");
+                        sql = "INSERT INTO `".concat(table, "` (").concat(keys.join(', '), ")\n                     VALUES (").concat(placeholders, ")");
                         console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated INSERT SQL:", sql);
                         console.log("[SQL EXECUTOR] \uD83D\uDD22 Values:", values);
                         return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
@@ -1492,7 +1566,13 @@ var SqlExecutor = /** @class */ (function (_super) {
                                         case 0: return [4 /*yield*/, conn.execute(sql, values)];
                                         case 1:
                                             result = (_a.sent())[0];
-                                            return [2 /*return*/, result];
+                                            return [2 /*return*/, {
+                                                    rest: result,
+                                                    sql: {
+                                                        sql: sql,
+                                                        placeholders: placeholders
+                                                    }
+                                                }];
                                     }
                                 });
                             }); })];
@@ -1513,7 +1593,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                         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[0], "` = ?");
+                        sql = "UPDATE `".concat(table, "`\n                     SET ").concat(updates, "\n                     WHERE `").concat(primary[0], "` = ?");
                         values.push(data[primary[0]]);
                         console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated UPDATE SQL:", sql);
                         console.log("[SQL EXECUTOR] \uD83D\uDD22 Values:", values);
@@ -1524,7 +1604,13 @@ var SqlExecutor = /** @class */ (function (_super) {
                                         case 0: return [4 /*yield*/, conn.execute(sql, values)];
                                         case 1:
                                             result = (_a.sent())[0];
-                                            return [2 /*return*/, result];
+                                            return [2 /*return*/, {
+                                                    rest: result,
+                                                    sql: {
+                                                        sql: sql,
+                                                        values: values
+                                                    }
+                                                }];
                                     }
                                 });
                             }); })];
@@ -1543,7 +1629,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                         key = primary === null || primary === void 0 ? void 0 : primary[0];
                         if (!key || !(args === null || args === void 0 ? void 0 : args[key]))
                             throw new Error('Primary key and value required for delete');
-                        sql = "DELETE FROM `".concat(table, "` WHERE `").concat(key, "` = ?");
+                        sql = "DELETE\n                     FROM `".concat(table, "`\n                     WHERE `").concat(key, "` = ?");
                         console.log("[SQL EXECUTOR] \uD83E\uDDE0 Generated DELETE SQL:", sql);
                         console.log("[SQL EXECUTOR] \uD83D\uDD22 Value:", args[key]);
                         return [4 /*yield*/, this.withConnection(function (conn) { return __awaiter(_this, void 0, void 0, function () {
@@ -1553,7 +1639,13 @@ var SqlExecutor = /** @class */ (function (_super) {
                                         case 0: return [4 /*yield*/, conn.execute(sql, [args[key]])];
                                         case 1:
                                             result = (_a.sent())[0];
-                                            return [2 /*return*/, result];
+                                            return [2 /*return*/, {
+                                                    rest: result,
+                                                    sql: {
+                                                        sql: sql,
+                                                        args: args
+                                                    }
+                                                }];
                                     }
                                 });
                             }); })];
@@ -1563,26 +1655,38 @@ var SqlExecutor = /** @class */ (function (_super) {
         });
     };
     SqlExecutor.prototype.formatSQLWithParams = function (sql, params) {
-        var index = 0;
-        return sql.replace(/\?/g, function () {
-            if (index >= params.length)
-                return '?'; // fallback if params are missing
-            var val = params[index++];
-            if (val === null || val === undefined)
-                return 'NULL';
-            if (Buffer.isBuffer(val))
-                return "UNHEX('".concat(val.toString('hex'), "')");
-            if (typeof val === 'string')
-                return "'".concat(val.replace(/'/g, "''"), "'");
-            if (typeof val === 'number')
-                return val.toString();
-            if (val instanceof Date)
-                return "'".concat(val.toISOString().slice(0, 19).replace('T', ' '), "'");
-            return "'".concat(JSON.stringify(val), "'");
-        });
+        var _this = this;
+        if (Array.isArray(params)) {
+            var index_1 = 0;
+            return sql.replace(/\?/g, function () {
+                if (index_1 >= params.length)
+                    return '?';
+                var val = params[index_1++];
+                return _this.formatValue(val);
+            });
+        }
+        else {
+            return sql.replace(/:([a-zA-Z0-9_]+)/g, function (_, key) {
+                var val = params[key];
+                return _this.formatValue(val);
+            });
+        }
+    };
+    SqlExecutor.prototype.formatValue = function (val) {
+        if (val === null || val === undefined)
+            return 'NULL';
+        if (Buffer$1.isBuffer(val))
+            return "UNHEX('".concat(val.toString('hex'), "')");
+        if (typeof val === 'string')
+            return "'".concat(val.replace(/'/g, "''"), "'");
+        if (typeof val === 'number')
+            return val.toString();
+        if (val instanceof Date)
+            return "'".concat(val.toISOString().slice(0, 19).replace('T', ' '), "'");
+        return "'".concat(JSON.stringify(val), "'");
     };
     return SqlExecutor;
-}(SqlBuilder));
+}(Executor));
 
 var SqlExecutor$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -1633,11 +1737,11 @@ function ExpressHandler(_a) {
                         })(payload)];
                 case 1:
                     response = _a.sent();
-                    console.log('response', JSON.stringify(response));
                     res.status(200).json(__assign({ success: true }, response));
                     return [3 /*break*/, 3];
                 case 2:
                     err_1 = _a.sent();
+                    res.status(500).json({ success: false, error: err_1 });
                     next(err_1);
                     return [3 /*break*/, 3];
                 case 3: return [2 /*return*/];
@@ -1646,6 +1750,85 @@ function ExpressHandler(_a) {
     }); };
 }
 
+// Alias a table name with a given alias
+var A = function (tableName, alias) {
+    return "".concat(tableName, " ").concat(alias);
+};
+// Qualify a column constant (e.g. 'property_units.parcel_id') to an alias
+var F = function (qualifiedCol, alias) {
+    return "".concat(alias, ".").concat(qualifiedCol.split('.').pop());
+};
+// Equal join condition using full-qualified column constants
+var fieldEq = function (leftCol, rightCol, leftAlias, rightAlias) {
+    var _a;
+    return (_a = {},
+        _a[F(leftCol, leftAlias)] = F(rightCol, rightAlias),
+        _a);
+};
+// ST_Distance_Sphere for aliased fields
+var distSphere = function (fromCol, toCol, fromAlias, toAlias) {
+    return [C6C.ST_DISTANCE_SPHERE, F(fromCol, fromAlias), F(toCol, toAlias)];
+};
+
+var DeleteQueryBuilder = /** @class */ (function (_super) {
+    __extends(DeleteQueryBuilder, _super);
+    function DeleteQueryBuilder() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    DeleteQueryBuilder.prototype.build = function (table, args) {
+        if (args === void 0) { args = {}; }
+        var params = this.useNamedParams ? {} : [];
+        var sql = args.JOIN ? "DELETE ".concat(table, "\n                               FROM `").concat(table, "`") : "DELETE\n                                                     FROM `".concat(table, "`");
+        if (args.JOIN) {
+            sql += this.buildJoinClauses(args.JOIN, params);
+        }
+        if (args.WHERE) {
+            sql += this.buildWhereClause(args.WHERE, params);
+        }
+        if (args.PAGINATION) {
+            sql += this.buildPaginationClause(args.PAGINATION);
+        }
+        return { sql: sql, params: params };
+    };
+    return DeleteQueryBuilder;
+}(PaginationBuilder));
+
+var UpdateQueryBuilder = /** @class */ (function (_super) {
+    __extends(UpdateQueryBuilder, _super);
+    function UpdateQueryBuilder() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    UpdateQueryBuilder.prototype.build = function (table, data, args) {
+        if (args === void 0) { args = {}; }
+        var params = this.useNamedParams ? {} : [];
+        var sql = "UPDATE `".concat(table, "`");
+        if (args.JOIN) {
+            sql += this.buildJoinClauses(args.JOIN, params);
+        }
+        var setClauses = Object.entries(data).map(function (_a) {
+            var col = _a[0], val = _a[1];
+            if (Array.isArray(params)) {
+                params.push(val);
+                return "`".concat(col, "` = ?");
+            }
+            else {
+                var key = "param".concat(Object.keys(params).length);
+                params[key] = val;
+                return "`".concat(col, "` = :").concat(key);
+            }
+        });
+        sql += " SET ".concat(setClauses.join(', '));
+        if (args.WHERE) {
+            sql += this.buildWhereClause(args.WHERE, params);
+        }
+        if (args.PAGINATION) {
+            sql += this.buildPaginationClause(args.PAGINATION);
+        }
+        return { sql: sql, params: params };
+    };
+    return UpdateQueryBuilder;
+}(PaginationBuilder));
+
 function determineRuntimeJsType(mysqlType) {
     var base = mysqlType.toLowerCase().split('(')[0];
     if ([
@@ -1744,5 +1927,5 @@ function onError(message) {
     toast.error(message, isLocal() ? toastOptionsDevs : toastOptions);
 }
 
-export { C6Constants, DELETE, Executor, ExpressHandler, GET, HttpExecutor, POST, PUT, SqlBuilder, SqlExecutor, TestRestfulResponse, apiRequestCache, axiosInstance, checkAllRequestsComplete, checkCache, clearCache, convertForRequestBody, determineRuntimeJsType, eFetchDependencies, error, getEnvVar, getPrimaryKeyTypes, group, info, isLocal, isNode, isTest, isVerbose, onError, onSuccess, removeInvalidKeys, removePrefixIfExists, restOrm, restRequest, sortAndSerializeQueryObject, timeout, toastOptions, toastOptionsDevs, userCustomClearCache, warn };
+export { A, AggregateBuilder, C6C, C6Constants, ConditionBuilder, DELETE, DeleteQueryBuilder, Executor, ExpressHandler, F, GET, HttpExecutor, JoinBuilder, POST, PUT, PaginationBuilder, SelectQueryBuilder, SqlExecutor, TestRestfulResponse, UpdateQueryBuilder, apiRequestCache, axiosInstance, checkAllRequestsComplete, checkCache, clearCache, convertForRequestBody, convertHexIfBinary, determineRuntimeJsType, distSphere, eFetchDependencies, error, fieldEq, getEnvVar, getPrimaryKeyTypes, group, info, isLocal, isNode, isTest, isVerbose, onError, onSuccess, removeInvalidKeys, removePrefixIfExists, restOrm, restRequest, sortAndSerializeQueryObject, timeout, toastOptions, toastOptionsDevs, userCustomClearCache, warn };
 //# sourceMappingURL=index.esm.js.map