@carbonorm/carbonnode 6.0.18 → 6.0.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs.js +21 -6
- package/dist/index.cjs.js.map +1 -1
- package/dist/index.esm.js +21 -6
- package/dist/index.esm.js.map +1 -1
- package/dist/utils/cacheManager.d.ts +1 -1
- package/dist/utils/logSql.d.ts +1 -1
- package/package.json +1 -1
- package/src/__tests__/cacheManager.test.ts +27 -1
- package/src/__tests__/logSql.test.ts +16 -0
- package/src/__tests__/sakila-db/C6.js +1 -1
- package/src/__tests__/sakila-db/C6.mysqldump.json +1 -1
- package/src/__tests__/sakila-db/C6.mysqldump.sql +1 -1
- package/src/__tests__/sakila-db/C6.ts +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.actor.post.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.actor.post.latest.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.actor.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.actor.put.lookup.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.address.post.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.address.post.latest.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.address.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.address.put.lookup.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.category.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.category.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.category.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.category.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.city.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.city.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.city.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.city.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.country.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.country.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.country.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.country.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.customer.post.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.customer.post.latest.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.customer.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.customer.put.lookup.json +5 -5
- package/src/__tests__/sakila-db/sqlResponses/C6.film.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.film.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.film.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.film.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.inventory.post.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.inventory.post.latest.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.inventory.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.inventory.put.lookup.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.language.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.language.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.language.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.language.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.payment.post.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.payment.post.latest.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.payment.put.lookup.json +2 -2
- package/src/__tests__/sakila-db/sqlResponses/C6.rental.post.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.rental.post.latest.json +3 -3
- package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.json +1 -1
- package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.lookup.json +3 -3
- package/src/executors/HttpExecutor.ts +1 -1
- package/src/executors/SqlExecutor.ts +1 -1
- package/src/utils/cacheManager.ts +17 -2
- package/src/utils/logSql.ts +3 -1
|
@@ -7,4 +7,4 @@ export declare function clearCache(props?: {
|
|
|
7
7
|
}): void;
|
|
8
8
|
export declare function checkCache<ResponseDataType = any>(method: string, tableName: string | string[], requestData: any, logContext: LogContext): Promise<iCacheResponse<ResponseDataType>> | false;
|
|
9
9
|
export declare function setCache<ResponseDataType = any>(method: string, tableName: string | string[], requestData: any, cacheEntry: iCacheAPI<ResponseDataType>): void;
|
|
10
|
-
export declare function evictCacheEntry(method: string, tableName: string | string[], requestData: any): boolean;
|
|
10
|
+
export declare function evictCacheEntry(method: string, tableName: string | string[], requestData: any, logContext?: LogContext): boolean;
|
package/dist/utils/logSql.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { LogContext } from "./logLevel";
|
|
2
2
|
export type SqlAllowListStatus = "allowed" | "denied" | "not verified";
|
|
3
|
-
export type SqlCacheStatus = "hit" | "miss" | "ignored";
|
|
3
|
+
export type SqlCacheStatus = "hit" | "miss" | "ignored" | "evicted";
|
|
4
4
|
export type LogSqlContextOptions = {
|
|
5
5
|
cacheStatus: SqlCacheStatus;
|
|
6
6
|
allowListStatus: SqlAllowListStatus;
|
package/package.json
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import type { AxiosPromise } from "axios";
|
|
2
|
-
import {
|
|
2
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
3
3
|
import {
|
|
4
4
|
apiRequestCache,
|
|
5
5
|
checkCache,
|
|
6
6
|
clearCache,
|
|
7
|
+
evictCacheEntry,
|
|
7
8
|
setCache,
|
|
8
9
|
} from "../utils/cacheManager";
|
|
9
10
|
import { checkAllRequestsComplete } from "../utils/testHelpers";
|
|
@@ -63,4 +64,29 @@ describe("cacheManager with map storage", () => {
|
|
|
63
64
|
|
|
64
65
|
(global as any).document = originalDocument;
|
|
65
66
|
});
|
|
67
|
+
|
|
68
|
+
it("logs SQL details when evicting a cached entry", () => {
|
|
69
|
+
const logSpy = vi.spyOn(console, "log").mockImplementation(() => undefined);
|
|
70
|
+
const mockRequest = Promise.resolve({ data: { rest: [] } }) as AxiosPromise;
|
|
71
|
+
|
|
72
|
+
setCache("GET", "table", requestData, {
|
|
73
|
+
requestArgumentsSerialized: "serialized",
|
|
74
|
+
request: mockRequest,
|
|
75
|
+
response: {
|
|
76
|
+
data: {
|
|
77
|
+
sql: {
|
|
78
|
+
sql: "SELECT * FROM table WHERE id = 1",
|
|
79
|
+
},
|
|
80
|
+
},
|
|
81
|
+
} as any,
|
|
82
|
+
final: true,
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
expect(evictCacheEntry("GET", "table", requestData, { verbose: true })).toBe(true);
|
|
86
|
+
expect(logSpy).toHaveBeenCalledTimes(1);
|
|
87
|
+
expect(String(logSpy.mock.calls[0]?.[0] ?? "")).toContain("[CACHE EVICTED]");
|
|
88
|
+
expect(String(logSpy.mock.calls[0]?.[0] ?? "")).toContain("[SELECT]");
|
|
89
|
+
|
|
90
|
+
logSpy.mockRestore();
|
|
91
|
+
});
|
|
66
92
|
});
|
|
@@ -107,6 +107,22 @@ describe("logSql", () => {
|
|
|
107
107
|
const message = stripAnsi(String(spy.mock.calls[0][0]));
|
|
108
108
|
expect(message).toContain("[CACHE HIT]");
|
|
109
109
|
});
|
|
110
|
+
|
|
111
|
+
it("supports cache-evicted indicators", () => {
|
|
112
|
+
process.env[SSR_ENV_KEY] = "false";
|
|
113
|
+
process.env[LOG_LEVEL_KEY] = "DEBUG";
|
|
114
|
+
const spy = vi.spyOn(console, "log").mockImplementation(() => {});
|
|
115
|
+
|
|
116
|
+
logSql({
|
|
117
|
+
method: "SELECT",
|
|
118
|
+
sql: "SELECT * FROM `users`",
|
|
119
|
+
cacheStatus: "evicted",
|
|
120
|
+
allowListStatus: "allowed",
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
const message = stripAnsi(String(spy.mock.calls[0][0]));
|
|
124
|
+
expect(message).toContain("[CACHE EVICTED]");
|
|
125
|
+
});
|
|
110
126
|
});
|
|
111
127
|
|
|
112
128
|
describe("colorSql", () => {
|
|
@@ -1342,7 +1342,7 @@ export const TABLES = {
|
|
|
1342
1342
|
};
|
|
1343
1343
|
export const C6 = {
|
|
1344
1344
|
...C6Constants,
|
|
1345
|
-
C6VERSION: '6.0.
|
|
1345
|
+
C6VERSION: '6.0.19',
|
|
1346
1346
|
IMPORT: async (tableName) => {
|
|
1347
1347
|
tableName = tableName.toLowerCase();
|
|
1348
1348
|
// if tableName is not a key in the TABLES object then throw an error
|