@carbonorm/carbonnode 6.0.18 → 6.0.19

package/dist/index.cjs.js

@@ -954,7 +954,7 @@ function colorSql(sql) {
     return s;
 }
 
-var version = "6.0.18";
+var version = "6.0.19";
 
 var DEFAULT_STEP = 8;
 function parseSemver(version) {
@@ -1040,6 +1040,8 @@ var cacheLabel = function (cacheStatus) {
     switch (cacheStatus) {
         case "hit":
             return "".concat(C.METHOD_COLORS.SELECT, "[CACHE HIT]").concat(C.RESET);
+        case "evicted":
+            return "".concat(C.WARN, "[CACHE EVICTED]").concat(C.RESET);
         case "ignored":
             return "".concat(C.WARN, "[CACHE IGNORED]").concat(C.RESET);
         default:
@@ -1117,7 +1119,6 @@ function checkCache(method, tableName, requestData, logContext) {
     var key = makeCacheKey(method, tableName, requestData);
     var cached = apiRequestCache.get(key);
     if (!cached) {
-        console.log('apiRequestCache.size', apiRequestCache.size);
         return false;
     }
     if (shouldLog(exports.LogLevel.INFO, logContext)) {
@@ -1140,9 +1141,23 @@ function setCache(method, tableName, requestData, cacheEntry) {
     var key = makeCacheKey(method, tableName, requestData);
     apiRequestCache.set(key, cacheEntry);
 }
-function evictCacheEntry(method, tableName, requestData) {
+function evictCacheEntry(method, tableName, requestData, logContext) {
+    var _a, _b, _c, _d, _e;
     var key = makeCacheKey(method, tableName, requestData);
-    return apiRequestCache.delete(key);
+    var cached = apiRequestCache.get(key);
+    var deleted = apiRequestCache.delete(key);
+    if (deleted && shouldLog(exports.LogLevel.INFO, 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",
+            cacheStatus: "evicted",
+            context: logContext,
+            method: sqlMethod,
+            sql: sql,
+        });
+    }
+    return deleted;
 }
 
 function sortAndSerializeQueryObject(tables, query) {
@@ -1300,7 +1315,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                         }
                                         cacheRequestData = JSON.parse(JSON.stringify(query !== null && query !== void 0 ? query : {}));
                                         evictFromCache = requestMethod === GET && cacheResults
-                                            ? function () { return evictCacheEntry(requestMethod, tableName, cacheRequestData); }
+                                            ? function () { return evictCacheEntry(requestMethod, tableName, cacheRequestData, logContext); }
                                             : undefined;
                                         querySerialized = sortAndSerializeQueryObject(tables, cacheRequestData !== null && cacheRequestData !== void 0 ? cacheRequestData : {});
                                         cachedRequest = false;
@@ -4106,7 +4121,7 @@ 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); }
+                            ? function () { return evictCacheEntry(method, tableName, cacheRequestData, logContext); }
                             : undefined;
                         if (!cacheResults) return [3 /*break*/, 2];
                         cachedRequest = checkCache(method, tableName, cacheRequestData, logContext);