@carbonorm/carbonnode 3.7.6 → 3.7.8

package/README.md

@@ -5,6 +5,7 @@
 ![Monthly Downloads](https://img.shields.io/npm/dm/%40carbonorm%2Fcarbonnode)
 ![All Downloads](https://img.shields.io/npm/dt/%40carbonorm%2Fcarbonnode)
 ![Star](https://img.shields.io/github/stars/carbonorm/carbonnode?style=social)
+[![Github Actions Test and Publish to NPM](https://github.com/CarbonORM/CarbonNode/actions/workflows/npm-publish-on-bump.yml/badge.svg)](https://github.com/CarbonORM/CarbonNode/actions/workflows/npm-publish-on-bump.yml)
 
 # CarbonNode (Alpha Release)
 
@@ -566,7 +567,7 @@ export default Users;
 
 This project uses Git hooks to automate certain tasks:
 
-- **pre-commit**: Builds the project before pushing to ensure only working code is pushed
+- **post-commit**: Builds the project before pushing to ensure only working code is pushed
 - **post-push**: Automatically publishes to npm when the version number changes
 
 To set up the Git hooks, run:

package/dist/api/orm/builders/AggregateBuilder.d.ts

@@ -1,5 +1,6 @@
 import { Executor } from "../../executors/Executor";
 import { OrmGenerics } from "../../types/ormGenerics";
 export declare abstract class AggregateBuilder<G extends OrmGenerics> extends Executor<G> {
+    protected selectAliases: Set<string>;
     buildAggregateField(field: string | any[]): string;
 }

package/dist/api/types/ormInterfaces.d.ts

@@ -59,7 +59,7 @@ export type Pagination<T = any> = {
 };
 export type RequestGetPutDeleteBody<T extends {
     [key: string]: any;
-} = any> = {
+} = any> = T | {
     SELECT?: SelectField<T>[];
     UPDATE?: Partial<T>;
     DELETE?: boolean;
@@ -83,7 +83,7 @@ export type RequestQueryBody<Method extends iRestMethods, T extends {
     [key: string]: any;
 } = {}, Overrides extends {
     [key: string]: any;
-} = {}> = Method extends 'GET' | 'PUT' | 'DELETE' ? iAPI<RequestGetPutDeleteBody<Modify<T, Overrides> & Custom>> : Method extends 'POST' ? iAPI<RequestGetPutDeleteBody<Modify<T, Overrides> & Custom> & Modify<T, Overrides> & Custom> : iAPI<Modify<T, Overrides> & Custom>;
+} = {}> = Method extends 'GET' | 'PUT' | 'DELETE' ? iAPI<RequestGetPutDeleteBody<Modify<T, Overrides> & Custom>> : iAPI<Modify<T, Overrides> & Custom>;
 export interface iCacheAPI<ResponseDataType = any> {
     requestArgumentsSerialized: string;
     request: AxiosPromise<ResponseDataType>;

package/dist/api/utils/cacheManager.d.ts

@@ -1,5 +1,5 @@
 import { AxiosPromise } from "axios";
-import { iCacheAPI } from "api/types/ormInterfaces";
+import { iCacheAPI } from "../types/ormInterfaces";
 export declare let apiRequestCache: iCacheAPI[];
 export declare let userCustomClearCache: (() => void)[];
 interface iClearCache {

package/dist/api/utils/normalizeSingularRequest.d.ts

@@ -0,0 +1,10 @@
+import { C6RestfulModel, iRestMethods, RequestQueryBody } from "../types/ormInterfaces";
+/**
+ * Converts a singular T-shaped request into complex ORM format for GET/PUT/DELETE
+ * Enforces that all primary keys are present for singular syntax and that the table has PKs.
+ * Optionally accepts a previously removed primary key (key/value) to reconstruct WHERE.
+ */
+export declare function normalizeSingularRequest<Method extends iRestMethods, T extends Record<string, any>, Custom extends Record<string, any> = {}, Overrides extends Record<string, any> = {}>(requestMethod: Method, request: RequestQueryBody<Method, T, Custom, Overrides>, restModel: C6RestfulModel<string, T, any>, removedPrimary?: {
+    key: string;
+    value: any;
+}): RequestQueryBody<Method, T, Custom, Overrides>;

package/dist/index.cjs.js

@@ -593,6 +593,102 @@ function removeInvalidKeys(request, c6Tables) {
     return intersection;
 }
 
+/**
+ * Converts a singular T-shaped request into complex ORM format for GET/PUT/DELETE
+ * Enforces that all primary keys are present for singular syntax and that the table has PKs.
+ * Optionally accepts a previously removed primary key (key/value) to reconstruct WHERE.
+ */
+function normalizeSingularRequest(requestMethod, request, restModel, removedPrimary) {
+    var _a, _b;
+    if (request == null || typeof request !== 'object')
+        return request;
+    var specialKeys = new Set([
+        C6Constants.SELECT,
+        C6Constants.UPDATE,
+        C6Constants.DELETE,
+        C6Constants.WHERE,
+        C6Constants.JOIN,
+        C6Constants.PAGINATION,
+    ]);
+    // Determine if the request is already complex (has any special key besides PAGINATION)
+    var keys = Object.keys(request);
+    var hasComplexKeys = keys.some(function (k) { return k !== C6Constants.PAGINATION && specialKeys.has(k); });
+    if (hasComplexKeys)
+        return request; // already complex
+    // We treat it as singular when it's not complex.
+    // For GET, PUT, DELETE only
+    if (!(requestMethod === C6Constants.GET || requestMethod === C6Constants.PUT || requestMethod === C6Constants.DELETE)) {
+        return request;
+    }
+    var pkShorts = Array.isArray(restModel.PRIMARY_SHORT) ? tslib.__spreadArray([], restModel.PRIMARY_SHORT, true) : [];
+    if (!pkShorts.length) {
+        // For GET requests, do not enforce primary key presence; treat as a collection query.
+        if (requestMethod === C6Constants.GET)
+            return request;
+        throw new Error("Table (".concat(restModel.TABLE_NAME, ") has no primary key; singular request syntax is not allowed."));
+    }
+    // Build pk map from request + possibly removed primary key
+    var pkValues = {};
+    for (var _i = 0, pkShorts_1 = pkShorts; _i < pkShorts_1.length; _i++) {
+        var pk = pkShorts_1[_i];
+        var fromRequest = request[pk];
+        if (fromRequest !== undefined && fromRequest !== null) {
+            pkValues[pk] = fromRequest;
+            continue;
+        }
+        if (removedPrimary && removedPrimary.key === pk) {
+            pkValues[pk] = removedPrimary.value;
+            continue;
+        }
+    }
+    var missing = pkShorts.filter(function (pk) { return !(pk in pkValues); });
+    if (missing.length) {
+        // For GET requests, if not all PKs are provided, treat as a collection query and leave as-is.
+        if (requestMethod === C6Constants.GET) {
+            return request;
+        }
+        throw new Error("Singular request requires all primary key(s) [".concat(pkShorts.join(', '), "] for table (").concat(restModel.TABLE_NAME, "). Missing: [").concat(missing.join(', '), "]"));
+    }
+    // Strip API metadata that should remain at root
+    var _c = request, dataInsertMultipleRows = _c.dataInsertMultipleRows, cacheResults = _c.cacheResults, fetchDependencies = _c.fetchDependencies, debug = _c.debug, success = _c.success, error = _c.error, rest = tslib.__rest(_c, ["dataInsertMultipleRows", "cacheResults", "fetchDependencies", "debug", "success", "error"]);
+    if (requestMethod === C6Constants.GET) {
+        var normalized_1 = {
+            WHERE: tslib.__assign({}, pkValues),
+        };
+        // Preserve pagination if any was added previously
+        if (request[C6Constants.PAGINATION]) {
+            normalized_1[C6Constants.PAGINATION] = request[C6Constants.PAGINATION];
+        }
+        return tslib.__assign(tslib.__assign({}, normalized_1), { dataInsertMultipleRows: dataInsertMultipleRows, cacheResults: cacheResults, fetchDependencies: fetchDependencies, debug: debug, success: success, error: error });
+    }
+    if (requestMethod === C6Constants.DELETE) {
+        var normalized_2 = (_a = {},
+            _a[C6Constants.DELETE] = true,
+            _a.WHERE = tslib.__assign({}, pkValues),
+            _a);
+        return tslib.__assign(tslib.__assign({}, normalized_2), { dataInsertMultipleRows: dataInsertMultipleRows, cacheResults: cacheResults, fetchDependencies: fetchDependencies, debug: debug, success: success, error: error });
+    }
+    // PUT
+    var updateBody = {};
+    for (var _d = 0, _e = Object.keys(rest); _d < _e.length; _d++) {
+        var k = _e[_d];
+        if (pkShorts.includes(k))
+            continue; // don't update PK columns
+        // Skip special request keys if any slipped through
+        if (specialKeys.has(k))
+            continue;
+        updateBody[k] = rest[k];
+    }
+    if (Object.keys(updateBody).length === 0) {
+        throw new Error("Singular PUT request for table (".concat(restModel.TABLE_NAME, ") must include at least one non-primary field to update."));
+    }
+    var normalized = (_b = {},
+        _b[C6Constants.UPDATE] = updateBody,
+        _b.WHERE = tslib.__assign({}, pkValues),
+        _b);
+    return tslib.__assign(tslib.__assign({}, normalized), { dataInsertMultipleRows: dataInsertMultipleRows, cacheResults: cacheResults, fetchDependencies: fetchDependencies, debug: debug, success: success, error: error });
+}
+
 // 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.
 exports.apiRequestCache = [];
@@ -730,7 +826,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                             query[C6.PAGINATION][C6.LIMIT] = query[C6.PAGINATION][C6.LIMIT] || 100;
                         }
                         apiRequest = function () { return tslib.__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 _a, debug, _b, cacheResults, dataInsertMultipleRows, success, _c, fetchDependencies, _d, error, querySerialized, cacheResult, cachingConfirmed, cacheCheck, cacheCheck, addBackPK, removedPrimaryKV, apiResponse, returnGetNextPageFunction, restRequestUri, needsConditionOrPrimaryCheck, TABLES, primaryKey, removedPkValue_1, axiosActiveRequest;
                             var _e;
                             var _this = this;
                             var _f, _g, _h, _j, _k, _l;
@@ -850,6 +946,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                             && primaryKey in query) {
                                             restRequestUri += query[primaryKey] + '/';
                                             removedPkValue_1 = query[primaryKey];
+                                            removedPrimaryKV = { key: primaryKey, value: removedPkValue_1 };
                                             addBackPK = function () {
                                                 query !== null && query !== void 0 ? query : (query = {});
                                                 query[primaryKey] = removedPkValue_1;
@@ -878,9 +975,11 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                 var baseConfig = {
                                                     withCredentials: withCredentials,
                                                 };
+                                                // Normalize singular request (GET/PUT/DELETE) into complex ORM shape
+                                                var normalizedQuery = normalizeSingularRequest(requestMethod, query, restModel, removedPrimaryKV);
                                                 switch (requestMethod) {
                                                     case GET:
-                                                        return [tslib.__assign(tslib.__assign({}, baseConfig), { params: query })];
+                                                        return [tslib.__assign(tslib.__assign({}, baseConfig), { params: normalizedQuery })];
                                                     case POST:
                                                         if (dataInsertMultipleRows !== undefined) {
                                                             return [
@@ -890,9 +989,9 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                         }
                                                         return [convert(query), baseConfig];
                                                     case PUT:
-                                                        return [convert(query), baseConfig];
+                                                        return [convert(normalizedQuery), baseConfig];
                                                     case DELETE:
-                                                        return [tslib.__assign(tslib.__assign({}, baseConfig), { data: convert(query) })];
+                                                        return [tslib.__assign(tslib.__assign({}, baseConfig), { data: convert(normalizedQuery) })];
                                                     default:
                                                         throw new Error("The request method (".concat(requestMethod, ") was not recognized."));
                                                 }
@@ -1213,7 +1312,9 @@ function convertHexIfBinary(_col, val, columnDef) {
 var AggregateBuilder = /** @class */ (function (_super) {
     tslib.__extends(AggregateBuilder, _super);
     function AggregateBuilder() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.selectAliases = new Set();
+        return _this;
     }
     AggregateBuilder.prototype.buildAggregateField = function (field) {
         var _this = this;
@@ -1241,6 +1342,7 @@ var AggregateBuilder = /** @class */ (function (_super) {
             expr = "".concat(F, "(").concat(argList, ")");
         }
         if (alias) {
+            this.selectAliases.add(alias);
             expr += " AS ".concat(alias);
         }
         this.config.verbose && console.log("[SELECT] ".concat(expr));
@@ -1307,12 +1409,21 @@ var ConditionBuilder = /** @class */ (function (_super) {
         throw new Error("Method not implemented.");
     };
     ConditionBuilder.prototype.isTableReference = function (val) {
-        var _a, _b, _c;
-        if (typeof val !== 'string' || !val.includes('.'))
+        var _a, _b, _c, _d;
+        if (typeof val !== 'string')
+            return false;
+        // Support aggregate aliases (e.g., SELECT COUNT(x) AS cnt ... HAVING cnt > 1)
+        if (!val.includes('.')) {
+            var isIdentifier = /^[A-Za-z_][A-Za-z0-9_]*$/.test(val);
+            // selectAliases is defined in AggregateBuilder
+            if (isIdentifier && ((_a = this.selectAliases) === null || _a === void 0 ? void 0 : _a.has(val))) {
+                return true;
+            }
             return false;
-        var _d = val.split('.'), prefix = _d[0], column = _d[1];
-        var tableName = (_a = this.aliasMap[prefix]) !== null && _a !== void 0 ? _a : prefix;
-        var table = (_c = (_b = this.config.C6) === null || _b === void 0 ? void 0 : _b.TABLES) === null || _c === void 0 ? void 0 : _c[tableName];
+        }
+        var _e = val.split('.'), prefix = _e[0], column = _e[1];
+        var tableName = (_b = this.aliasMap[prefix]) !== null && _b !== void 0 ? _b : prefix;
+        var table = (_d = (_c = this.config.C6) === null || _c === void 0 ? void 0 : _c.TABLES) === null || _d === void 0 ? void 0 : _d[tableName];
         if (!table || !table.COLUMNS)
             return false;
         var fullKey = "".concat(tableName, ".").concat(column);
@@ -1325,8 +1436,14 @@ var ConditionBuilder = /** @class */ (function (_super) {
         }
     };
     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 _a, _b, _c;
+        // Determine column definition from C6.TABLES to support type-aware conversions (e.g., BINARY hex -> Buffer)
+        var columnDef;
+        if (typeof column === 'string' && column.includes('.')) {
+            var tableName = column.split('.', 2)[0];
+            var table = (_b = (_a = this.config.C6) === null || _a === void 0 ? void 0 : _a.TABLES) === null || _b === void 0 ? void 0 : _b[tableName];
+            columnDef = (_c = table === null || table === void 0 ? void 0 : table.TYPE_VALIDATION) === null || _c === void 0 ? void 0 : _c[column];
+        }
         var val = convertHexIfBinary(column, value, columnDef);
         if (this.useNamedParams) {
             var key = "param".concat(Object.keys(params).length);
@@ -1370,7 +1487,7 @@ var ConditionBuilder = /** @class */ (function (_super) {
             var leftIsCol = _this.isColumnRef(column);
             var leftIsRef = _this.isTableReference(column);
             var rightIsCol = typeof value === 'string' && _this.isColumnRef(value);
-            if (!leftIsCol && !rightIsCol) {
+            if (!leftIsCol && !leftIsRef && !rightIsCol) {
                 throw new Error("Potential SQL injection detected: '".concat(column, " ").concat(op, " ").concat(value, "'"));
             }
             _this.validateOperator(op);
@@ -1437,21 +1554,22 @@ var ConditionBuilder = /** @class */ (function (_super) {
         var parts = [];
         var buildFromObject = function (obj, mode) {
             var subParts = [];
-            for (var _i = 0, _a = Object.entries(obj); _i < _a.length; _i++) {
-                var _b = _a[_i], k = _b[0], v = _b[1];
-                // numeric keys represent nested OR groups
-                if (!isNaN(Number(k))) {
-                    var sub = _this.buildBooleanJoinedConditions(v, false, params);
-                    if (sub)
-                        subParts.push(sub);
-                    continue;
-                }
+            var entries = Object.entries(obj);
+            var nonNumeric = entries.filter(function (_a) {
+                var k = _a[0];
+                return isNaN(Number(k));
+            });
+            var numeric = entries.filter(function (_a) {
+                var k = _a[0];
+                return !isNaN(Number(k));
+            });
+            var processEntry = function (k, v) {
                 if (typeof v === 'object' && v !== null && Object.keys(v).length === 1) {
-                    var _c = Object.entries(v)[0], op = _c[0], val = _c[1];
+                    var _a = Object.entries(v)[0], op = _a[0], val = _a[1];
                     subParts.push(addCondition(k, op, val));
                 }
                 else if (Array.isArray(v) && v.length >= 2 && typeof v[0] === 'string') {
-                    var _d = v, op = _d[0], val = _d[1];
+                    var _b = v, op = _b[0], val = _b[1];
                     subParts.push(addCondition(k, op, val));
                 }
                 else if (typeof v === 'object' && v !== null) {
@@ -1462,6 +1580,18 @@ var ConditionBuilder = /** @class */ (function (_super) {
                 else {
                     subParts.push(addCondition(k, '=', v));
                 }
+            };
+            // Process non-numeric keys first to preserve intuitive insertion order for params
+            for (var _i = 0, nonNumeric_1 = nonNumeric; _i < nonNumeric_1.length; _i++) {
+                var _a = nonNumeric_1[_i], k = _a[0], v = _a[1];
+                processEntry(k, v);
+            }
+            // Then process numeric keys (treated as grouped OR conditions)
+            for (var _b = 0, numeric_1 = numeric; _b < numeric_1.length; _b++) {
+                var _c = numeric_1[_b]; _c[0]; var v = _c[1];
+                var sub = _this.buildBooleanJoinedConditions(v, false, params);
+                if (sub)
+                    subParts.push(sub);
             }
             return subParts.join(" ".concat(mode ? 'AND' : 'OR', " "));
         };
@@ -1598,13 +1728,12 @@ var PaginationBuilder = /** @class */ (function (_super) {
      */
     PaginationBuilder.prototype.buildPaginationClause = function (pagination) {
         var _this = this;
-        var _a;
         var sql = "";
         /* -------- ORDER BY -------- */
         if (pagination === null || pagination === void 0 ? void 0 : pagination[C6Constants.ORDER]) {
             var orderParts = [];
-            for (var _i = 0, _b = Object.entries(pagination[C6Constants.ORDER]); _i < _b.length; _i++) {
-                var _c = _b[_i], key = _c[0], val = _c[1];
+            for (var _i = 0, _a = Object.entries(pagination[C6Constants.ORDER]); _i < _a.length; _i++) {
+                var _b = _a[_i], key = _b[0], val = _b[1];
                 // FUNCTION CALL: val is an array of args
                 if (Array.isArray(val)) {
                     var args = val
@@ -1623,9 +1752,16 @@ var PaginationBuilder = /** @class */ (function (_super) {
         /* -------- LIMIT / OFFSET -------- */
         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);
+            var pageRaw = pagination[C6Constants.PAGE];
+            var pageParsed = parseInt(pageRaw !== null && pageRaw !== void 0 ? pageRaw : 1, 10);
+            var page = isFinite(pageParsed) && pageParsed > 1 ? pageParsed : 1;
+            if (page === 1) {
+                sql += " LIMIT ".concat(lim);
+            }
+            else {
+                var offset = (page - 1) * lim;
+                sql += " LIMIT ".concat(offset, ", ").concat(lim);
+            }
         }
         this.config.verbose && console.log("[PAGINATION] ".concat(sql.trim()));
         return sql;
@@ -1643,6 +1779,10 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
         var _a;
         if (isSubSelect === void 0) { isSubSelect = false; }
         this.aliasMap = {};
+        // reset any previously collected SELECT aliases (from AggregateBuilder)
+        // @ts-ignore
+        if (this.selectAliases && this.selectAliases.clear)
+            this.selectAliases.clear();
         var args = this.request;
         this.initAlias(table, args.JOIN);
         var params = this.useNamedParams ? {} : [];
@@ -1696,9 +1836,10 @@ var UpdateQueryBuilder = /** @class */ (function (_super) {
         if (!(C6C.UPDATE in this.request)) {
             throw new Error("No update data provided in the request.");
         }
-        var setClauses = Object.entries(this.request[C6C.UPDATE]).map(function (_a) {
+        var setClauses = Object.entries(this.request[C6C.UPDATE])
+            .map(function (_a) {
             var col = _a[0], val = _a[1];
-            return _this.addParam(params, col, val);
+            return "`".concat(col, "` = ").concat(_this.addParam(params, col, val));
         });
         sql += " SET ".concat(setClauses.join(', '));
         if (args.WHERE) {
@@ -1730,6 +1871,14 @@ var SqlExecutor = /** @class */ (function (_super) {
                     case 0:
                         TABLE_NAME = this.config.restModel.TABLE_NAME;
                         method = this.config.requestMethod;
+                        // Normalize singular T-shaped requests into complex ORM shape (GET/PUT/DELETE)
+                        try {
+                            this.request = normalizeSingularRequest(method, this.request, this.config.restModel, undefined);
+                        }
+                        catch (e) {
+                            // Surface normalization errors early
+                            throw e;
+                        }
                         this.config.verbose && console.log("[SQL EXECUTOR] \u25B6\uFE0F Executing ".concat(method, " on table \"").concat(TABLE_NAME, "\""));
                         this.config.verbose && console.log("[SQL EXECUTOR] \uD83E\uDDE9 Request:", this.request);
                         _a = method;
@@ -2134,6 +2283,7 @@ exports.isLocal = isLocal;
 exports.isNode = isNode;
 exports.isTest = isTest;
 exports.isVerbose = isVerbose;
+exports.normalizeSingularRequest = normalizeSingularRequest;
 exports.onError = onError;
 exports.onSuccess = onSuccess;
 exports.removeInvalidKeys = removeInvalidKeys;