@carbonorm/carbonnode 3.7.16 → 3.7.17

package/dist/index.cjs.js

@@ -623,122 +623,6 @@ function sortAndSerializeQueryObject(tables, query) {
     return tables + ' ' + JSON.stringify(orderedQuery);
 }
 
-/**
- * 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;
-    var _c;
-    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) : [];
-    var pkFulls = Array.isArray(restModel.PRIMARY) ? tslib.__spreadArray([], restModel.PRIMARY, true) : [];
-    var resolveShortKey = function (key) {
-        var _a;
-        var cols = restModel.COLUMNS || {};
-        return (_a = cols[key]) !== null && _a !== void 0 ? _a : key;
-    };
-    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 (accept short or fully-qualified keys)
-    var pkValues = {};
-    var requestObj = request;
-    var _loop_1 = function (pkShort) {
-        // 1) direct short key
-        var value = requestObj[pkShort];
-        if (value === undefined) {
-            // 2) fully-qualified key matching this short key (from PRIMARY list or by concatenation)
-            var fqCandidate_1 = "".concat(restModel.TABLE_NAME, ".").concat(pkShort);
-            var fqKey = (_c = pkFulls.find(function (fq) { return fq === fqCandidate_1 || fq.endsWith(".".concat(pkShort)); })) !== null && _c !== void 0 ? _c : fqCandidate_1;
-            value = requestObj[fqKey];
-        }
-        if (value === undefined && removedPrimary) {
-            // 3) removedPrimary may provide either short or fully-qualified key
-            var removedKeyShort = resolveShortKey(removedPrimary.key);
-            if (removedKeyShort === pkShort)
-                value = removedPrimary.value;
-        }
-        if (value !== undefined && value !== null) {
-            pkValues[pkShort] = value;
-        }
-    };
-    for (var _i = 0, pkShorts_1 = pkShorts; _i < pkShorts_1.length; _i++) {
-        var pkShort = pkShorts_1[_i];
-        _loop_1(pkShort);
-    }
-    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 _d = request, dataInsertMultipleRows = _d.dataInsertMultipleRows, cacheResults = _d.cacheResults, fetchDependencies = _d.fetchDependencies, debug = _d.debug, success = _d.success, error = _d.error, rest = tslib.__rest(_d, ["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 _e = 0, _f = Object.keys(rest); _e < _f.length; _e++) {
-        var k = _f[_e];
-        // Skip special request keys if any slipped through
-        if (specialKeys.has(k))
-            continue;
-        var shortKey = resolveShortKey(k);
-        if (pkShorts.includes(shortKey))
-            continue; // don't update PK columns (short or fully qualified)
-        updateBody[shortKey] = 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 });
-}
-
 var HttpExecutor = /** @class */ (function (_super) {
     tslib.__extends(HttpExecutor, _super);
     function HttpExecutor() {
@@ -845,7 +729,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, removedPrimaryKV, 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, apiResponse, returnGetNextPageFunction, restRequestUri, needsConditionOrPrimaryCheck, TABLES, primaryKey, axiosActiveRequest;
                             var _e;
                             var _this = this;
                             var _f, _g, _h, _j, _k, _l;
@@ -964,14 +848,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                             && undefined !== primaryKey
                                             && 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;
-                                            };
-                                            delete query[primaryKey];
-                                            console.log('query', query, 'primaryKey', primaryKey, 'removedPkValue', removedPkValue_1);
+                                            console.log('query', query, 'primaryKey', primaryKey);
                                         }
                                         else {
                                             console.log('query', query);
@@ -994,11 +871,9 @@ 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: normalizedQuery })];
+                                                        return [tslib.__assign(tslib.__assign({}, baseConfig), { params: query })];
                                                     case POST:
                                                         if (dataInsertMultipleRows !== undefined) {
                                                             return [
@@ -1008,9 +883,9 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                         }
                                                         return [convert(query), baseConfig];
                                                     case PUT:
-                                                        return [convert(normalizedQuery), baseConfig];
+                                                        return [convert(query), baseConfig];
                                                     case DELETE:
-                                                        return [tslib.__assign(tslib.__assign({}, baseConfig), { data: convert(normalizedQuery) })];
+                                                        return [tslib.__assign(tslib.__assign({}, baseConfig), { data: convert(query) })];
                                                     default:
                                                         throw new Error("The request method (".concat(requestMethod, ") was not recognized."));
                                                 }
@@ -1022,9 +897,6 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                     request: axiosActiveRequest
                                                 });
                                             }
-                                            // todo - wip verify this works
-                                            // we had removed the value from the request to add to the URI.
-                                            addBackPK === null || addBackPK === void 0 ? void 0 : addBackPK(); // adding back so post-processing methods work
                                             // 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 tslib.__awaiter(_this, void 0, void 0, function () {
@@ -1881,6 +1753,133 @@ var UpdateQueryBuilder = /** @class */ (function (_super) {
     return UpdateQueryBuilder;
 }(PaginationBuilder));
 
+/**
+ * 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;
+    var _c;
+    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) : [];
+    var pkFulls = Array.isArray(restModel.PRIMARY) ? tslib.__spreadArray([], restModel.PRIMARY, true) : [];
+    var resolveShortKey = function (key) {
+        var _a;
+        var cols = restModel.COLUMNS || {};
+        return (_a = cols[key]) !== null && _a !== void 0 ? _a : key;
+    };
+    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 (accept short or fully-qualified keys)
+    var pkValues = {};
+    var requestObj = request;
+    var _loop_1 = function (pkShort) {
+        // 1) direct short key
+        var value = requestObj[pkShort];
+        if (value === undefined) {
+            // 2) fully-qualified key matching this short key (from PRIMARY list or by concatenation)
+            var fqCandidate_1 = "".concat(restModel.TABLE_NAME, ".").concat(pkShort);
+            var fqKey = (_c = pkFulls.find(function (fq) { return fq === fqCandidate_1 || fq.endsWith(".".concat(pkShort)); })) !== null && _c !== void 0 ? _c : fqCandidate_1;
+            value = requestObj[fqKey];
+        }
+        if (value === undefined && removedPrimary) {
+            // 3) removedPrimary may provide either short or fully-qualified key
+            var removedKeyShort = resolveShortKey(removedPrimary.key);
+            if (removedKeyShort === pkShort)
+                value = removedPrimary.value;
+        }
+        if (value !== undefined && value !== null) {
+            pkValues[pkShort] = value;
+        }
+    };
+    for (var _i = 0, pkShorts_1 = pkShorts; _i < pkShorts_1.length; _i++) {
+        var pkShort = pkShorts_1[_i];
+        _loop_1(pkShort);
+    }
+    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 _d = request, dataInsertMultipleRows = _d.dataInsertMultipleRows, cacheResults = _d.cacheResults, fetchDependencies = _d.fetchDependencies, debug = _d.debug, success = _d.success, error = _d.error, rest = tslib.__rest(_d, ["dataInsertMultipleRows", "cacheResults", "fetchDependencies", "debug", "success", "error"]);
+    // Map short primary keys to fully-qualified column names
+    var shortToFull = {};
+    for (var _e = 0, _f = Object.entries(restModel.COLUMNS || {}); _e < _f.length; _e++) {
+        var _g = _f[_e], full = _g[0], short = _g[1];
+        shortToFull[short] = full;
+    }
+    var pkFullValues = Object.fromEntries(Object.entries(pkValues).map(function (_a) {
+        var _b;
+        var k = _a[0], v = _a[1];
+        return [(_b = shortToFull[k]) !== null && _b !== void 0 ? _b : k, v];
+    }));
+    if (requestMethod === C6Constants.GET) {
+        var normalized_1 = {
+            WHERE: tslib.__assign({}, pkFullValues),
+        };
+        // 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({}, pkFullValues),
+            _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 _h = 0, _j = Object.keys(rest); _h < _j.length; _h++) {
+        var k = _j[_h];
+        // Skip special request keys if any slipped through
+        if (specialKeys.has(k))
+            continue;
+        var shortKey = resolveShortKey(k);
+        if (pkShorts.includes(shortKey))
+            continue; // don't update PK columns (short or fully qualified)
+        updateBody[shortKey] = 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({}, pkFullValues),
+        _b);
+    return tslib.__assign(tslib.__assign({}, normalized), { dataInsertMultipleRows: dataInsertMultipleRows, cacheResults: cacheResults, fetchDependencies: fetchDependencies, debug: debug, success: success, error: error });
+}
+
 var SqlExecutor = /** @class */ (function (_super) {
     tslib.__extends(SqlExecutor, _super);
     function SqlExecutor() {
@@ -2068,12 +2067,12 @@ function ExpressHandler(_a) {
     var _this = this;
     var C6 = _a.C6, mysqlPool = _a.mysqlPool;
     return function (req, res, next) { return tslib.__awaiter(_this, void 0, void 0, function () {
-        var method, table, primary, payload, primaryKeys, primaryKeyName, primaryKeyShort, response, err_1;
-        var _a, _b, _c, _d;
-        return tslib.__generator(this, function (_e) {
-            switch (_e.label) {
+        var method, table, primary, payload, primaryKeys, primaryKeyName, response, err_1;
+        var _a, _b;
+        return tslib.__generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    _e.trys.push([0, 2, , 3]);
+                    _c.trys.push([0, 2, , 3]);
                     method = req.method.toUpperCase();
                     table = req.params.table;
                     primary = req.params.primary;
@@ -2094,30 +2093,17 @@ function ExpressHandler(_a) {
                         return [2 /*return*/];
                     }
                     primaryKeyName = primaryKeys[0];
-                    primaryKeyShort = primaryKeyName.split('.')[1];
-                    if (!((_b = (_a = payload[C6C.WHERE]) === null || _a === void 0 ? void 0 : _a[primaryKeyName]) !== null && _b !== void 0 ? _b : undefined)
-                        && !((_d = (_c = payload[C6C.WHERE]) === null || _c === void 0 ? void 0 : _c[primaryKeyShort]) !== null && _d !== void 0 ? _d : undefined)) {
-                        // 👇 Call restRequest for the resolved method
-                        switch (method) {
-                            case 'GET':
-                                if (primary) {
-                                    payload[C6C.WHERE][primaryKeyName] = primary;
-                                }
-                                break;
-                            case 'PUT':
-                            case 'DELETE':
-                                if (primary) {
-                                    payload[C6C.WHERE][primaryKeyName] = primary;
-                                }
-                                else {
-                                    res.status(400).json({ error: "Invalid request: ".concat(method, " requires a primary key (").concat(primaryKeyName, ").") });
-                                }
-                                break;
-                            case 'POST':
-                                break;
-                            default:
-                                res.status(405).json({ error: "Method ".concat(method, " not allowed") });
-                                return [2 /*return*/];
+                    // If a primary key was provided in the URL, merge it into the payload.
+                    // Support both complex requests using WHERE and singular requests
+                    // where the primary key lives at the root of the payload.
+                    if (primary) {
+                        if (payload[C6C.WHERE]) {
+                            payload[C6C.WHERE][primaryKeyName] =
+                                (_a = payload[C6C.WHERE][primaryKeyName]) !== null && _a !== void 0 ? _a : primary;
+                        }
+                        else {
+                            payload[primaryKeyName] =
+                                (_b = payload[primaryKeyName]) !== null && _b !== void 0 ? _b : primary;
                         }
                     }
                     return [4 /*yield*/, restRequest({
@@ -2127,11 +2113,11 @@ function ExpressHandler(_a) {
                             restModel: C6.TABLES[table]
                         })(payload)];
                 case 1:
-                    response = _e.sent();
+                    response = _c.sent();
                     res.status(200).json(tslib.__assign({ success: true }, response));
                     return [3 /*break*/, 3];
                 case 2:
-                    err_1 = _e.sent();
+                    err_1 = _c.sent();
                     res.status(500).json({ success: false, error: err_1 });
                     next(err_1);
                     return [3 /*break*/, 3];