@carbonorm/carbonnode 6.0.19 → 6.0.20

package/dist/index.esm.js

@@ -951,7 +951,7 @@ function colorSql(sql) {
     return s;
 }
 
-var version = "6.0.19";
+var version = "6.0.20";
 
 var DEFAULT_STEP = 8;
 function parseSemver(version) {
@@ -1111,8 +1111,8 @@ function clearCache(props) {
 // -----------------------------------------------------------------------------
 // Check Cache (dedupe via hashed key)
 // -----------------------------------------------------------------------------
-function checkCache(method, tableName, requestData, logContext) {
-    var _a, _b, _c, _d, _e;
+function checkCache(method, tableName, requestData, logContext, allowListStatus) {
+    var _a, _b, _c, _d, _e, _f, _g;
     var key = makeCacheKey(method, tableName, requestData);
     var cached = apiRequestCache.get(key);
     if (!cached) {
@@ -1122,7 +1122,7 @@ function checkCache(method, tableName, requestData, logContext) {
         var sql = (_d = (_c = (_b = (_a = cached.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.sql) === null || _c === void 0 ? void 0 : _c.sql) !== null && _d !== void 0 ? _d : "";
         var sqlMethod = ((_e = sql.trim().split(/\s+/, 1)[0]) === null || _e === void 0 ? void 0 : _e.toUpperCase()) || method;
         logSql({
-            allowListStatus: "not verified",
+            allowListStatus: (_g = (_f = cached.allowListStatus) !== null && _f !== void 0 ? _f : allowListStatus) !== null && _g !== void 0 ? _g : "not verified",
             cacheStatus: "hit",
             context: logContext,
             method: sqlMethod,
@@ -1138,8 +1138,8 @@ function setCache(method, tableName, requestData, cacheEntry) {
     var key = makeCacheKey(method, tableName, requestData);
     apiRequestCache.set(key, cacheEntry);
 }
-function evictCacheEntry(method, tableName, requestData, logContext) {
-    var _a, _b, _c, _d, _e;
+function evictCacheEntry(method, tableName, requestData, logContext, allowListStatus) {
+    var _a, _b, _c, _d, _e, _f, _g;
     var key = makeCacheKey(method, tableName, requestData);
     var cached = apiRequestCache.get(key);
     var deleted = apiRequestCache.delete(key);
@@ -1147,7 +1147,7 @@ function evictCacheEntry(method, tableName, requestData, logContext) {
         var sql = (_d = (_c = (_b = (_a = cached === null || cached === void 0 ? void 0 : cached.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.sql) === null || _c === void 0 ? void 0 : _c.sql) !== null && _d !== void 0 ? _d : "";
         var sqlMethod = ((_e = sql.trim().split(/\s+/, 1)[0]) === null || _e === void 0 ? void 0 : _e.toUpperCase()) || method;
         logSql({
-            allowListStatus: "not verified",
+            allowListStatus: (_g = (_f = cached === null || cached === void 0 ? void 0 : cached.allowListStatus) !== null && _f !== void 0 ? _f : allowListStatus) !== null && _g !== void 0 ? _g : "not verified",
             cacheStatus: "evicted",
             context: logContext,
             method: sqlMethod,
@@ -1202,27 +1202,34 @@ var HttpExecutor = /** @class */ (function (_super) {
     };
     HttpExecutor.prototype.postState = function (response, request, callback) {
         var _this = this;
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
+        var responseRestRaw = (_a = response.data) === null || _a === void 0 ? void 0 : _a.rest;
+        var responseRows = Array.isArray(responseRestRaw)
+            ? responseRestRaw
+            : (responseRestRaw ? [responseRestRaw] : []);
         if (this.config.restModel.PRIMARY_SHORT.length === 1) {
             var pk = this.config.restModel.PRIMARY_SHORT[0];
             try {
-                request[pk] = (_a = response.data) === null || _a === void 0 ? void 0 : _a.created;
+                var created = (_c = (_b = response.data) === null || _b === void 0 ? void 0 : _b.created) !== null && _c !== void 0 ? _c : (_d = responseRows[0]) === null || _d === void 0 ? void 0 : _d[pk];
+                if (created !== undefined) {
+                    request[pk] = created;
+                }
             }
-            catch ( /* best-effort */_d) { /* best-effort */ }
+            catch ( /* best-effort */_g) { /* best-effort */ }
         }
         else if (isLocal()) {
             logWithLevel(LogLevel.ERROR, getLogContext(this.config, this.request), console.error, "C6 received unexpected results given the primary key length");
         }
-        (_b = this.config.reactBootstrap) === null || _b === void 0 ? void 0 : _b.updateRestfulObjectArrays({
+        (_e = this.config.reactBootstrap) === null || _e === void 0 ? void 0 : _e.updateRestfulObjectArrays({
             callback: callback,
             dataOrCallback: undefined !== request.dataInsertMultipleRows
                 ? request.dataInsertMultipleRows.map(function (row, index) {
                     var _a;
                     var normalizedRow = _this.stripTableNameFromKeys(row);
-                    return removeInvalidKeys(__assign(__assign({}, normalizedRow), (index === 0 ? (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.rest : {})), _this.config.C6.TABLES);
+                    return removeInvalidKeys(__assign(__assign({}, normalizedRow), ((_a = responseRows[index]) !== null && _a !== void 0 ? _a : {})), _this.config.C6.TABLES);
                 })
                 : [
-                    removeInvalidKeys(__assign(__assign({}, this.stripTableNameFromKeys(request)), (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c.rest), this.config.C6.TABLES)
+                    removeInvalidKeys(__assign(__assign({}, this.stripTableNameFromKeys(request)), ((_f = responseRows[0]) !== null && _f !== void 0 ? _f : {})), this.config.C6.TABLES)
                 ],
             stateKey: this.config.restModel.TABLE_NAME,
             uniqueObjectId: this.config.restModel.PRIMARY_SHORT
@@ -1281,7 +1288,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                         }
                         query = this.request;
                         apiRequest = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var _a, debug, _b, cacheResults, dataInsertMultipleRows, success, _c, fetchDependencies, _d, error, cachingConfirmed, cacheRequestData, evictFromCache, querySerialized, cachedRequest, cachedData, apiResponse, restRequestUri, needsConditionOrPrimaryCheck, TABLES, primaryKeyList, primaryKeyFullyQualified, primaryKey, whereVal, whereIsEmpty, providedPrimary, primaryVal, axiosActiveRequest_1;
+                            var _a, debug, _b, cacheResults, dataInsertMultipleRows, success, _c, fetchDependencies, _d, error, cachingConfirmed, cacheRequestData, cacheAllowListStatus, evictFromCache, querySerialized, cachedRequest, cachedData, apiResponse, restRequestUri, needsConditionOrPrimaryCheck, TABLES, primaryKeyList, primaryKeyFullyQualified, primaryKey, whereVal, whereIsEmpty, providedPrimary, primaryVal, axiosActiveRequest_1;
                             var _e;
                             var _this = this;
                             var _f, _g, _h, _j, _k, _l;
@@ -1311,13 +1318,16 @@ var HttpExecutor = /** @class */ (function (_super) {
                                             query[C6.PAGINATION][C6.LIMIT] = query[C6.PAGINATION][C6.LIMIT] || 100;
                                         }
                                         cacheRequestData = JSON.parse(JSON.stringify(query !== null && query !== void 0 ? query : {}));
+                                        cacheAllowListStatus = this.config.sqlAllowListPath
+                                            ? "allowed"
+                                            : "not verified";
                                         evictFromCache = requestMethod === GET && cacheResults
-                                            ? function () { return evictCacheEntry(requestMethod, tableName, cacheRequestData, logContext); }
+                                            ? function () { return evictCacheEntry(requestMethod, tableName, cacheRequestData, logContext, cacheAllowListStatus); }
                                             : undefined;
                                         querySerialized = sortAndSerializeQueryObject(tables, cacheRequestData !== null && cacheRequestData !== void 0 ? cacheRequestData : {});
                                         cachedRequest = false;
                                         if (cacheResults) {
-                                            cachedRequest = checkCache(requestMethod, tableName, cacheRequestData, logContext);
+                                            cachedRequest = checkCache(requestMethod, tableName, cacheRequestData, logContext, cacheAllowListStatus);
                                         }
                                         if (!cachedRequest) return [3 /*break*/, 2];
                                         return [4 /*yield*/, cachedRequest];
@@ -1441,6 +1451,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                 setCache(requestMethod, tableName, cacheRequestData, {
                                                     requestArgumentsSerialized: querySerialized,
                                                     request: axiosActiveRequest_1,
+                                                    allowListStatus: cacheAllowListStatus,
                                                 });
                                             }
                                             // returning the promise with this then is important for tests. todo - we could make that optional.
@@ -1458,6 +1469,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                         setCache(requestMethod, tableName, cacheRequestData, {
                                                                             requestArgumentsSerialized: querySerialized,
                                                                             request: axiosActiveRequest_1,
+                                                                            allowListStatus: cacheAllowListStatus,
                                                                             response: response,
                                                                             final: true,
                                                                         });
@@ -1474,6 +1486,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                     setCache(requestMethod, tableName, cacheRequestData, {
                                                                         requestArgumentsSerialized: querySerialized,
                                                                         request: axiosActiveRequest_1,
+                                                                        allowListStatus: cacheAllowListStatus,
                                                                         response: response,
                                                                     });
                                                                 }
@@ -1538,6 +1551,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                     setCache(requestMethod, tableName, cacheRequestData, {
                                                                         requestArgumentsSerialized: querySerialized,
                                                                         request: axiosActiveRequest_1,
+                                                                        allowListStatus: cacheAllowListStatus,
                                                                         response: response,
                                                                         final: !hasNext,
                                                                     });
@@ -1737,6 +1751,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                     setCache(requestMethod, tableName, cacheRequestData, {
                                                                         requestArgumentsSerialized: querySerialized,
                                                                         request: axiosActiveRequest_1,
+                                                                        allowListStatus: cacheAllowListStatus,
                                                                         response: response,
                                                                         final: true,
                                                                     });
@@ -3685,6 +3700,38 @@ var compileSqlAllowList = function (allowListPath, entries) { return __awaiter(v
 }); };
 
 var SQL_ALLOWLIST_BLOCKED_CODE = "SQL_ALLOWLIST_BLOCKED";
+var fillRandomBytes = function (bytes) {
+    var cryptoRef = globalThis.crypto;
+    if (!cryptoRef || typeof cryptoRef.getRandomValues !== "function") {
+        throw new Error("Secure random source unavailable: crypto.getRandomValues is required for UUID generation.");
+    }
+    cryptoRef.getRandomValues(bytes);
+};
+var generateUuidV7 = function () {
+    var bytes = new Uint8Array(16);
+    var random = new Uint8Array(10);
+    fillRandomBytes(random);
+    var timestampMs = Date.now();
+    bytes[0] = Math.floor(timestampMs / 1099511627776) & 0xff; // 2^40
+    bytes[1] = Math.floor(timestampMs / 4294967296) & 0xff; // 2^32
+    bytes[2] = Math.floor(timestampMs / 16777216) & 0xff; // 2^24
+    bytes[3] = Math.floor(timestampMs / 65536) & 0xff; // 2^16
+    bytes[4] = Math.floor(timestampMs / 256) & 0xff; // 2^8
+    bytes[5] = timestampMs & 0xff;
+    // RFC 9562 UUIDv7 layout
+    bytes[6] = 0x70 | (random[0] & 0x0f); // version 7 + rand_a high bits
+    bytes[7] = random[1]; // rand_a low bits
+    bytes[8] = 0x80 | (random[2] & 0x3f); // variant + rand_b high bits
+    bytes[9] = random[3];
+    bytes[10] = random[4];
+    bytes[11] = random[5];
+    bytes[12] = random[6];
+    bytes[13] = random[7];
+    bytes[14] = random[8];
+    bytes[15] = random[9];
+    var hex = Array.from(bytes, function (byte) { return byte.toString(16).padStart(2, "0"); }).join("");
+    return "".concat(hex.slice(0, 8), "-").concat(hex.slice(8, 12), "-").concat(hex.slice(12, 16), "-").concat(hex.slice(16, 20), "-").concat(hex.slice(20));
+};
 var createSqlAllowListBlockedError = function (args) {
     var _a, _b;
     var error = new Error("SQL statement is not permitted by allowlist (".concat(args.allowListPath, ")."));
@@ -3713,6 +3760,146 @@ var SqlExecutor = /** @class */ (function (_super) {
         })); };
         return _this;
     }
+    SqlExecutor.prototype.getPostRequestRows = function () {
+        var request = this.request;
+        if (!request)
+            return [];
+        if (Array.isArray(request)) {
+            return request;
+        }
+        if (Array.isArray(request.dataInsertMultipleRows)
+            && request.dataInsertMultipleRows.length > 0) {
+            return request.dataInsertMultipleRows;
+        }
+        var verb = C6Constants.REPLACE in request ? C6Constants.REPLACE : C6Constants.INSERT;
+        if (verb in request && request[verb] && typeof request[verb] === "object") {
+            return [request[verb]];
+        }
+        if (typeof request === "object") {
+            return [request];
+        }
+        return [];
+    };
+    SqlExecutor.prototype.getTypeValidationForColumn = function (shortKey, fullKey) {
+        var _a, _b;
+        var validation = (_a = this.config.restModel) === null || _a === void 0 ? void 0 : _a.TYPE_VALIDATION;
+        if (!validation || typeof validation !== "object")
+            return undefined;
+        return (_b = validation[shortKey]) !== null && _b !== void 0 ? _b : validation[fullKey];
+    };
+    SqlExecutor.prototype.isUuidLikePrimaryColumn = function (columnDef) {
+        var _a, _b;
+        if (!columnDef || typeof columnDef !== "object")
+            return false;
+        if (columnDef.AUTO_INCREMENT === true)
+            return false;
+        var mysqlType = String((_a = columnDef.MYSQL_TYPE) !== null && _a !== void 0 ? _a : "").toLowerCase();
+        var maxLength = String((_b = columnDef.MAX_LENGTH) !== null && _b !== void 0 ? _b : "").trim();
+        if (mysqlType.includes("uuid"))
+            return true;
+        var isBinary16 = mysqlType.includes("binary")
+            && (maxLength === "16" || /\b16\b/.test(mysqlType) || mysqlType === "binary");
+        var isUuidString = (mysqlType.includes("char") || mysqlType.includes("varchar"))
+            && (maxLength === "32" || maxLength === "36");
+        return isBinary16 || isUuidString;
+    };
+    SqlExecutor.prototype.hasDefinedValue = function (value) {
+        if (value === undefined || value === null)
+            return false;
+        if (typeof value === "string" && value.trim() === "")
+            return false;
+        return true;
+    };
+    SqlExecutor.prototype.generatePrimaryUuidValue = function (columnDef) {
+        var _a, _b;
+        var mysqlType = String((_a = columnDef.MYSQL_TYPE) !== null && _a !== void 0 ? _a : "").toLowerCase();
+        var maxLength = String((_b = columnDef.MAX_LENGTH) !== null && _b !== void 0 ? _b : "").trim();
+        var uuid = generateUuidV7();
+        // BINARY(16) and CHAR/VARCHAR(32) commonly persist UUIDs as 32-hex.
+        if (mysqlType.includes("binary") || maxLength === "32") {
+            return uuid.replace(/-/g, "").toUpperCase();
+        }
+        return uuid;
+    };
+    SqlExecutor.prototype.assignMissingPostPrimaryUuids = function () {
+        var _this = this;
+        var _a, _b;
+        if (this.config.requestMethod !== C6Constants.POST)
+            return;
+        var rows = this.getPostRequestRows();
+        if (rows.length === 0)
+            return;
+        var columns = this.config.restModel.COLUMNS;
+        var tableName = this.config.restModel.TABLE_NAME;
+        var primaryShorts = (_a = this.config.restModel.PRIMARY_SHORT) !== null && _a !== void 0 ? _a : [];
+        var primaryColumns = primaryShorts
+            .map(function (shortKey) {
+            var _a;
+            var fullKey = (_a = Object.keys(columns).find(function (key) { return columns[key] === shortKey; })) !== null && _a !== void 0 ? _a : "".concat(tableName, ".").concat(shortKey);
+            var columnDef = _this.getTypeValidationForColumn(shortKey, fullKey);
+            return { shortKey: shortKey, fullKey: fullKey, columnDef: columnDef };
+        })
+            .filter(function (_a) {
+            var columnDef = _a.columnDef;
+            return _this.isUuidLikePrimaryColumn(columnDef);
+        });
+        if (primaryColumns.length === 0)
+            return;
+        for (var _i = 0, rows_1 = rows; _i < rows_1.length; _i++) {
+            var row = rows_1[_i];
+            if (!row || typeof row !== "object")
+                continue;
+            var useQualifiedKeyByDefault = Object.keys(row).some(function (key) { return key.includes("."); });
+            for (var _c = 0, primaryColumns_1 = primaryColumns; _c < primaryColumns_1.length; _c++) {
+                var primaryColumn = primaryColumns_1[_c];
+                var existing = (_b = row[primaryColumn.shortKey]) !== null && _b !== void 0 ? _b : row[primaryColumn.fullKey];
+                if (this.hasDefinedValue(existing))
+                    continue;
+                var generated = this.generatePrimaryUuidValue(primaryColumn.columnDef);
+                if (Object.prototype.hasOwnProperty.call(row, primaryColumn.shortKey)) {
+                    row[primaryColumn.shortKey] = generated;
+                    continue;
+                }
+                if (Object.prototype.hasOwnProperty.call(row, primaryColumn.fullKey)) {
+                    row[primaryColumn.fullKey] = generated;
+                    continue;
+                }
+                row[useQualifiedKeyByDefault ? primaryColumn.fullKey : primaryColumn.shortKey] = generated;
+            }
+        }
+    };
+    SqlExecutor.prototype.buildPostResponseRows = function (insertId) {
+        var _this = this;
+        var _a;
+        var rows = this.getPostRequestRows();
+        if (rows.length === 0)
+            return [];
+        var columns = this.config.restModel.COLUMNS;
+        var validColumns = new Set(Object.values(columns));
+        var pkShorts = (_a = this.config.restModel.PRIMARY_SHORT) !== null && _a !== void 0 ? _a : [];
+        var now = new Date().toISOString();
+        return rows.map(function (row, index) {
+            var normalized = _this.normalizeRequestPayload(row !== null && row !== void 0 ? row : {});
+            if (validColumns.has("changed_at") && normalized.changed_at === undefined) {
+                normalized.changed_at = now;
+            }
+            if (validColumns.has("created_at") && normalized.created_at === undefined) {
+                normalized.created_at = now;
+            }
+            if (validColumns.has("updated_at") && normalized.updated_at === undefined) {
+                normalized.updated_at = now;
+            }
+            // When DB generated PK is numeric/autoincrement, expose it for the single-row insert.
+            if (index === 0
+                && insertId !== undefined
+                && insertId !== null
+                && pkShorts.length === 1
+                && !_this.hasDefinedValue(normalized[pkShorts[0]])) {
+                normalized[pkShorts[0]] = insertId;
+            }
+            return normalized;
+        });
+    };
     SqlExecutor.prototype.resolveSqlLogMethod = function (method, sql) {
         var _a;
         var token = (_a = sql.trim().split(/\s+/, 1)[0]) === null || _a === void 0 ? void 0 : _a.toUpperCase();
@@ -3751,6 +3938,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                             // Surface normalization errors early
                             throw e;
                         }
+                        this.assignMissingPostPrimaryUuids();
                         logContext = getLogContext(this.config, this.request);
                         logWithLevel(LogLevel.DEBUG, logContext, console.log, "[SQL EXECUTOR] \u25B6\uFE0F Executing ".concat(method, " on table \"").concat(TABLE_NAME, "\""));
                         logWithLevel(LogLevel.DEBUG, logContext, console.log, "[SQL EXECUTOR] \uD83E\uDDE9 Request:", this.request);
@@ -4100,7 +4288,7 @@ var SqlExecutor = /** @class */ (function (_super) {
     };
     SqlExecutor.prototype.runQuery = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var method, tableName, logContext, cacheResults, cacheRequestData, requestArgumentsSerialized, evictFromCache, cachedRequest, cachedData, sqlExecution, sqlMethod, queryPromise, cacheRequest, cacheResponse;
+            var method, tableName, logContext, cacheResults, cacheAllowListStatus, cacheRequestData, requestArgumentsSerialized, evictFromCache, cachedRequest, cachedData, sqlExecution, sqlMethod, queryPromise, cacheRequest, cacheResponse;
             var _this = this;
             var _a, _b;
             return __generator(this, function (_c) {
@@ -4111,6 +4299,9 @@ var SqlExecutor = /** @class */ (function (_super) {
                         logContext = getLogContext(this.config, this.request);
                         cacheResults = method === C6Constants.GET
                             && ((_a = this.request.cacheResults) !== null && _a !== void 0 ? _a : true);
+                        cacheAllowListStatus = this.config.sqlAllowListPath
+                            ? "allowed"
+                            : "not verified";
                         cacheRequestData = cacheResults
                             ? JSON.parse(JSON.stringify((_b = this.request) !== null && _b !== void 0 ? _b : {}))
                             : undefined;
@@ -4118,10 +4309,10 @@ var SqlExecutor = /** @class */ (function (_super) {
                             ? sortAndSerializeQueryObject(tableName, cacheRequestData !== null && cacheRequestData !== void 0 ? cacheRequestData : {})
                             : undefined;
                         evictFromCache = method === C6Constants.GET && cacheResults && cacheRequestData
-                            ? function () { return evictCacheEntry(method, tableName, cacheRequestData, logContext); }
+                            ? function () { return evictCacheEntry(method, tableName, cacheRequestData, logContext, cacheAllowListStatus); }
                             : undefined;
                         if (!cacheResults) return [3 /*break*/, 2];
-                        cachedRequest = checkCache(method, tableName, cacheRequestData, logContext);
+                        cachedRequest = checkCache(method, tableName, cacheRequestData, logContext, cacheAllowListStatus);
                         if (!cachedRequest) return [3 /*break*/, 2];
                         return [4 /*yield*/, cachedRequest];
                     case 1:
@@ -4157,6 +4348,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                         setCache(method, tableName, cacheRequestData, {
                             requestArgumentsSerialized: requestArgumentsSerialized,
                             request: cacheRequest,
+                            allowListStatus: cacheAllowListStatus,
                         });
                         return [4 /*yield*/, cacheRequest];
                     case 5:
@@ -4164,6 +4356,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                         setCache(method, tableName, cacheRequestData, {
                             requestArgumentsSerialized: requestArgumentsSerialized,
                             request: cacheRequest,
+                            allowListStatus: cacheAllowListStatus,
                             response: cacheResponse,
                             final: true,
                         });
@@ -4207,7 +4400,9 @@ var SqlExecutor = /** @class */ (function (_super) {
         return {
             affected: result.affectedRows,
             insertId: result.insertId,
-            rest: [],
+            rest: method === C6Constants.POST
+                ? this.buildPostResponseRows(result.insertId)
+                : [],
             sql: { sql: sqlExecution.sql, values: sqlExecution.values },
         };
     };