@carbonorm/carbonnode 6.0.19 → 6.0.20

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.
Files changed (61) hide show
  1. package/dist/executors/SqlExecutor.d.ts +7 -0
  2. package/dist/index.cjs.js +215 -20
  3. package/dist/index.cjs.js.map +1 -1
  4. package/dist/index.esm.js +215 -20
  5. package/dist/index.esm.js.map +1 -1
  6. package/dist/types/ormInterfaces.d.ts +1 -0
  7. package/dist/utils/cacheManager.d.ts +3 -2
  8. package/package.json +1 -1
  9. package/src/__tests__/cacheManager.test.ts +28 -0
  10. package/src/__tests__/sakila-db/C6.js +1 -1
  11. package/src/__tests__/sakila-db/C6.mysqldump.json +1 -1
  12. package/src/__tests__/sakila-db/C6.mysqldump.sql +1 -1
  13. package/src/__tests__/sakila-db/C6.ts +1 -1
  14. package/src/__tests__/sakila-db/sqlResponses/C6.actor.post.json +11 -4
  15. package/src/__tests__/sakila-db/sqlResponses/C6.actor.post.latest.json +3 -3
  16. package/src/__tests__/sakila-db/sqlResponses/C6.actor.put.json +1 -1
  17. package/src/__tests__/sakila-db/sqlResponses/C6.actor.put.lookup.json +3 -3
  18. package/src/__tests__/sakila-db/sqlResponses/C6.address.post.json +18 -6
  19. package/src/__tests__/sakila-db/sqlResponses/C6.address.post.latest.json +5 -5
  20. package/src/__tests__/sakila-db/sqlResponses/C6.address.put.json +1 -1
  21. package/src/__tests__/sakila-db/sqlResponses/C6.address.put.lookup.json +5 -5
  22. package/src/__tests__/sakila-db/sqlResponses/C6.category.post.json +9 -3
  23. package/src/__tests__/sakila-db/sqlResponses/C6.category.post.latest.json +2 -2
  24. package/src/__tests__/sakila-db/sqlResponses/C6.category.put.json +1 -1
  25. package/src/__tests__/sakila-db/sqlResponses/C6.category.put.lookup.json +2 -2
  26. package/src/__tests__/sakila-db/sqlResponses/C6.city.post.json +10 -3
  27. package/src/__tests__/sakila-db/sqlResponses/C6.city.post.latest.json +2 -2
  28. package/src/__tests__/sakila-db/sqlResponses/C6.city.put.json +1 -1
  29. package/src/__tests__/sakila-db/sqlResponses/C6.city.put.lookup.json +2 -2
  30. package/src/__tests__/sakila-db/sqlResponses/C6.country.post.json +9 -3
  31. package/src/__tests__/sakila-db/sqlResponses/C6.country.post.latest.json +2 -2
  32. package/src/__tests__/sakila-db/sqlResponses/C6.country.put.json +1 -1
  33. package/src/__tests__/sakila-db/sqlResponses/C6.country.put.lookup.json +2 -2
  34. package/src/__tests__/sakila-db/sqlResponses/C6.customer.post.json +18 -6
  35. package/src/__tests__/sakila-db/sqlResponses/C6.customer.post.latest.json +5 -5
  36. package/src/__tests__/sakila-db/sqlResponses/C6.customer.put.json +1 -1
  37. package/src/__tests__/sakila-db/sqlResponses/C6.customer.put.lookup.json +5 -5
  38. package/src/__tests__/sakila-db/sqlResponses/C6.film.post.json +18 -3
  39. package/src/__tests__/sakila-db/sqlResponses/C6.film.post.latest.json +2 -2
  40. package/src/__tests__/sakila-db/sqlResponses/C6.film.put.json +1 -1
  41. package/src/__tests__/sakila-db/sqlResponses/C6.film.put.lookup.json +2 -2
  42. package/src/__tests__/sakila-db/sqlResponses/C6.inventory.post.json +9 -2
  43. package/src/__tests__/sakila-db/sqlResponses/C6.inventory.post.latest.json +1 -1
  44. package/src/__tests__/sakila-db/sqlResponses/C6.inventory.put.json +1 -1
  45. package/src/__tests__/sakila-db/sqlResponses/C6.inventory.put.lookup.json +1 -1
  46. package/src/__tests__/sakila-db/sqlResponses/C6.language.post.json +9 -3
  47. package/src/__tests__/sakila-db/sqlResponses/C6.language.post.latest.json +2 -2
  48. package/src/__tests__/sakila-db/sqlResponses/C6.language.put.json +1 -1
  49. package/src/__tests__/sakila-db/sqlResponses/C6.language.put.lookup.json +2 -2
  50. package/src/__tests__/sakila-db/sqlResponses/C6.payment.post.json +13 -3
  51. package/src/__tests__/sakila-db/sqlResponses/C6.payment.post.latest.json +2 -2
  52. package/src/__tests__/sakila-db/sqlResponses/C6.payment.put.lookup.json +2 -2
  53. package/src/__tests__/sakila-db/sqlResponses/C6.rental.post.json +14 -4
  54. package/src/__tests__/sakila-db/sqlResponses/C6.rental.post.latest.json +3 -3
  55. package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.json +1 -1
  56. package/src/__tests__/sakila-db/sqlResponses/C6.rental.put.lookup.json +3 -3
  57. package/src/__tests__/sqlExecutorPostUuid.test.ts +185 -0
  58. package/src/executors/HttpExecutor.ts +33 -5
  59. package/src/executors/SqlExecutor.ts +207 -3
  60. package/src/types/ormInterfaces.ts +1 -0
  61. package/src/utils/cacheManager.ts +6 -4
@@ -105,6 +105,7 @@ export interface iCacheResponse<ResponseDataType = any> {
105
105
  export interface iCacheAPI<ResponseDataType = any> {
106
106
  requestArgumentsSerialized: string;
107
107
  request: Promise<iCacheResponse<ResponseDataType>>;
108
+ allowListStatus?: "allowed" | "denied" | "not verified";
108
109
  response?: iCacheResponse<ResponseDataType> & {
109
110
  __carbonTiming?: {
110
111
  start: number;
@@ -1,10 +1,11 @@
1
1
  import type { iCacheAPI, iCacheResponse } from "../types/ormInterfaces";
2
2
  import { LogContext } from "./logLevel";
3
+ import { SqlAllowListStatus } from "./logSql";
3
4
  export declare const apiRequestCache: Map<string, iCacheAPI<any>>;
4
5
  export declare const userCustomClearCache: (() => void)[];
5
6
  export declare function clearCache(props?: {
6
7
  ignoreWarning?: boolean;
7
8
  }): void;
8
- export declare function checkCache<ResponseDataType = any>(method: string, tableName: string | string[], requestData: any, logContext: LogContext): Promise<iCacheResponse<ResponseDataType>> | false;
9
+ export declare function checkCache<ResponseDataType = any>(method: string, tableName: string | string[], requestData: any, logContext?: LogContext, allowListStatus?: SqlAllowListStatus): Promise<iCacheResponse<ResponseDataType>> | false;
9
10
  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, logContext?: LogContext): boolean;
11
+ export declare function evictCacheEntry(method: string, tableName: string | string[], requestData: any, logContext?: LogContext, allowListStatus?: SqlAllowListStatus): boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@carbonorm/carbonnode",
3
- "version": "6.0.19",
3
+ "version": "6.0.20",
4
4
  "browser": "dist/index.umd.js",
5
5
  "repository": {
6
6
  "type": "git",
@@ -79,14 +79,42 @@ describe("cacheManager with map storage", () => {
79
79
  },
80
80
  },
81
81
  } as any,
82
+ allowListStatus: "allowed",
82
83
  final: true,
83
84
  });
84
85
 
85
86
  expect(evictCacheEntry("GET", "table", requestData, { verbose: true })).toBe(true);
86
87
  expect(logSpy).toHaveBeenCalledTimes(1);
87
88
  expect(String(logSpy.mock.calls[0]?.[0] ?? "")).toContain("[CACHE EVICTED]");
89
+ expect(String(logSpy.mock.calls[0]?.[0] ?? "")).toContain("[VERIFIED]");
88
90
  expect(String(logSpy.mock.calls[0]?.[0] ?? "")).toContain("[SELECT]");
89
91
 
90
92
  logSpy.mockRestore();
91
93
  });
94
+
95
+ it("logs verified for cache hits when allowlist is provided", () => {
96
+ const logSpy = vi.spyOn(console, "log").mockImplementation(() => undefined);
97
+ const mockRequest = Promise.resolve({ data: { rest: [] } }) as AxiosPromise;
98
+
99
+ setCache("GET", "table", requestData, {
100
+ requestArgumentsSerialized: "serialized",
101
+ request: mockRequest,
102
+ response: {
103
+ data: {
104
+ sql: {
105
+ sql: "SELECT * FROM table WHERE id = 1",
106
+ },
107
+ },
108
+ } as any,
109
+ final: true,
110
+ });
111
+
112
+ const cached = checkCache("GET", "table", requestData, { verbose: true }, "allowed");
113
+ expect(cached).toBe(mockRequest);
114
+ expect(logSpy).toHaveBeenCalledTimes(1);
115
+ expect(String(logSpy.mock.calls[0]?.[0] ?? "")).toContain("[CACHE HIT]");
116
+ expect(String(logSpy.mock.calls[0]?.[0] ?? "")).toContain("[VERIFIED]");
117
+
118
+ logSpy.mockRestore();
119
+ });
92
120
  });
@@ -1342,7 +1342,7 @@ export const TABLES = {
1342
1342
  };
1343
1343
  export const C6 = {
1344
1344
  ...C6Constants,
1345
- C6VERSION: '6.0.19',
1345
+ C6VERSION: '6.0.20',
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