@carbonorm/carbonnode 6.0.17 → 6.0.19

package/dist/index.cjs.js

@@ -954,7 +954,7 @@ function colorSql(sql) {
     return s;
 }
 
-var version = "6.0.17";
+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,6 +1141,24 @@ 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;
+    var key = makeCacheKey(method, tableName, requestData);
+    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) {
     var orderedQuery = Object.keys(query).sort().reduce(function (obj, key) {
@@ -1265,7 +1284,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                         }
                         query = this.request;
                         apiRequest = function () { return tslib.__awaiter(_this, void 0, void 0, function () {
-                            var _a, debug, _b, cacheResults, dataInsertMultipleRows, success, _c, fetchDependencies, _d, error, cachingConfirmed, cacheRequestData, querySerialized, cachedRequest, 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, 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;
@@ -1295,6 +1314,9 @@ 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 : {}));
+                                        evictFromCache = requestMethod === GET && cacheResults
+                                            ? function () { return evictCacheEntry(requestMethod, tableName, cacheRequestData, logContext); }
+                                            : undefined;
                                         querySerialized = sortAndSerializeQueryObject(tables, cacheRequestData !== null && cacheRequestData !== void 0 ? cacheRequestData : {});
                                         cachedRequest = false;
                                         if (cacheResults) {
@@ -1302,7 +1324,15 @@ var HttpExecutor = /** @class */ (function (_super) {
                                         }
                                         if (!cachedRequest) return [3 /*break*/, 2];
                                         return [4 /*yield*/, cachedRequest];
-                                    case 1: return [2 /*return*/, (_m.sent()).data];
+                                    case 1:
+                                        cachedData = (_m.sent()).data;
+                                        if (evictFromCache
+                                            && cachedData
+                                            && typeof cachedData === "object"
+                                            && Array.isArray(cachedData.rest)) {
+                                            cachedData.evictFromCache = evictFromCache;
+                                        }
+                                        return [2 /*return*/, cachedData];
                                     case 2:
                                         if (cacheResults) {
                                             cachingConfirmed = true;
@@ -1493,7 +1523,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                 else {
                                                                     callback();
                                                                 }
-                                                                if (!(C6.GET === requestMethod && this.isRestResponse(response))) return [3 /*break*/, 2];
+                                                                if (!(requestMethod === GET && this.isRestResponse(response))) return [3 /*break*/, 2];
                                                                 responseData_1 = response.data;
                                                                 pageLimit = (_a = query === null || query === void 0 ? void 0 : query[C6.PAGINATION]) === null || _a === void 0 ? void 0 : _a[C6.LIMIT];
                                                                 got = responseData_1.rest.length;
@@ -1504,6 +1534,9 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                                 else {
                                                                     responseData_1.next = undefined; // short page => done
                                                                 }
+                                                                if (cachingConfirmed && evictFromCache) {
+                                                                    responseData_1.evictFromCache = evictFromCache;
+                                                                }
                                                                 if (cachingConfirmed) {
                                                                     setCache(requestMethod, tableName, cacheRequestData, {
                                                                         requestArgumentsSerialized: querySerialized,
@@ -4070,7 +4103,7 @@ var SqlExecutor = /** @class */ (function (_super) {
     };
     SqlExecutor.prototype.runQuery = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var method, tableName, logContext, cacheResults, cacheRequestData, requestArgumentsSerialized, cachedRequest, sqlExecution, sqlMethod, queryPromise, cacheRequest, cacheResponse;
+            var method, tableName, logContext, cacheResults, cacheRequestData, requestArgumentsSerialized, evictFromCache, cachedRequest, cachedData, sqlExecution, sqlMethod, queryPromise, cacheRequest, cacheResponse;
             var _this = this;
             var _a, _b;
             return tslib.__generator(this, function (_c) {
@@ -4087,11 +4120,22 @@ var SqlExecutor = /** @class */ (function (_super) {
                         requestArgumentsSerialized = cacheResults
                             ? sortAndSerializeQueryObject(tableName, cacheRequestData !== null && cacheRequestData !== void 0 ? cacheRequestData : {})
                             : undefined;
+                        evictFromCache = method === C6Constants.GET && cacheResults && cacheRequestData
+                            ? function () { return evictCacheEntry(method, tableName, cacheRequestData, logContext); }
+                            : undefined;
                         if (!cacheResults) return [3 /*break*/, 2];
                         cachedRequest = checkCache(method, tableName, cacheRequestData, logContext);
                         if (!cachedRequest) return [3 /*break*/, 2];
                         return [4 /*yield*/, cachedRequest];
-                    case 1: return [2 /*return*/, (_c.sent()).data];
+                    case 1:
+                        cachedData = (_c.sent()).data;
+                        if (evictFromCache
+                            && cachedData
+                            && typeof cachedData === "object"
+                            && Array.isArray(cachedData.rest)) {
+                            cachedData.evictFromCache = evictFromCache;
+                        }
+                        return [2 /*return*/, cachedData];
                     case 2:
                         sqlExecution = this.buildSqlExecutionContext(method, tableName, logContext);
                         sqlMethod = this.resolveSqlLogMethod(method, sqlExecution.sql);
@@ -4105,6 +4149,12 @@ var SqlExecutor = /** @class */ (function (_super) {
                     case 3: return [2 /*return*/, _c.sent()];
                     case 4:
                         cacheRequest = queryPromise.then(function (data) {
+                            if (evictFromCache
+                                && data
+                                && typeof data === "object"
+                                && Array.isArray(data.rest)) {
+                                data.evictFromCache = evictFromCache;
+                            }
                             return _this.createCacheResponseEnvelope(method, tableName, data);
                         });
                         setCache(method, tableName, cacheRequestData, {
@@ -4576,6 +4626,7 @@ exports.derivedTable = derivedTable;
 exports.determineRuntimeJsType = determineRuntimeJsType;
 exports.distSphere = distSphere;
 exports.error = error;
+exports.evictCacheEntry = evictCacheEntry;
 exports.extractSqlEntries = extractSqlEntries;
 exports.fieldEq = fieldEq;
 exports.getEnv = getEnv;