@carbonorm/carbonnode 6.0.10 → 6.0.13

package/src/types/ormInterfaces.ts

@@ -1,4 +1,4 @@
-import type {AxiosInstance, AxiosPromise, AxiosResponse} from "axios";
+import type {AxiosInstance, AxiosResponse} from "axios";
 import type {Pool} from "mysql2/promise";
 import {eFetchDependencies} from "./dynamicFetching";
 import {Modify} from "./modifyTypes";
@@ -101,10 +101,22 @@ export type RequestQueryBody<
     ? iAPI<RequestGetPutDeleteBody<Modify<T, Overrides> & Custom>>
     : iAPI<RequestPostBody<Modify<T, Overrides> & Custom>>;
 
+export interface iCacheRequestConfig {
+    method?: string;
+    url?: string;
+    headers?: any;
+}
+
+export interface iCacheResponse<ResponseDataType = any> {
+    data: ResponseDataType;
+    config?: iCacheRequestConfig;
+    [key: string]: any;
+}
+
 export interface iCacheAPI<ResponseDataType = any> {
     requestArgumentsSerialized: string;
-    request: AxiosPromise<ResponseDataType>;
-    response?: AxiosResponse & {
+    request: Promise<iCacheResponse<ResponseDataType>>;
+    response?: iCacheResponse<ResponseDataType> & {
         __carbonTiming?: {
             start: number;
             end: number;
@@ -172,6 +184,19 @@ export type DetermineResponseDataType<
                     ? iDeleteC6RestResponse<RestTableInterface>
                     : never);
 
+export type iRestSqlExecutionContext = {
+    sql: string;
+    values: any[];
+};
+
+export type iRestLifecycleResponse<G extends OrmGenerics> =
+    AxiosResponse<DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>>
+    | {
+        data: {
+            success: boolean;
+        } & DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>;
+    };
+
 
 export type iRestWebsocketPayload = {
     REST: {
@@ -254,20 +279,21 @@ export type iRestReactiveLifecycle<G extends OrmGenerics> = {
         [key: string]: (args: {
             config: iRest<G['RestShortTableName'], G['RestTableInterface'], G['PrimaryKey']>;
             request: RequestQueryBody<G['RequestMethod'], G['RestTableInterface'], G['CustomAndRequiredFields'], G['RequestTableOverrides']>;
+            sqlExecution?: iRestSqlExecutionContext;
         }) => void | Promise<void>;
     };
     afterExecution?: {
         [key: string]: (args: {
             config: iRest<G['RestShortTableName'], G['RestTableInterface'], G['PrimaryKey']>;
             request: RequestQueryBody<G['RequestMethod'], G['RestTableInterface'], G['CustomAndRequiredFields'], G['RequestTableOverrides']>;
-            response: AxiosResponse<DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>>;
+            response: iRestLifecycleResponse<G>;
         }) => void | Promise<void>;
     };
     afterCommit?: {
         [key: string]: (args: {
             config: iRest<G['RestShortTableName'], G['RestTableInterface'], G['PrimaryKey']>;
             request: RequestQueryBody<G['RequestMethod'], G['RestTableInterface'], G['CustomAndRequiredFields'], G['RequestTableOverrides']>;
-            response: AxiosResponse<DetermineResponseDataType<G['RequestMethod'], G['RestTableInterface']>>;
+            response: iRestLifecycleResponse<G>;
         }) => void | Promise<void>;
     };
 };

package/src/utils/cacheManager.ts

@@ -1,5 +1,4 @@
-import type {AxiosPromise} from "axios";
-import type {iCacheAPI} from "../types/ormInterfaces";
+import type {iCacheAPI, iCacheResponse} from "../types/ormInterfaces";
 import {LogLevel, logWithLevel, shouldLog} from "./logLevel";
 
 // -----------------------------------------------------------------------------
@@ -61,13 +60,13 @@ export function checkCache<ResponseDataType = any>(
     method: string,
     tableName: string | string[],
     requestData: any,
-): AxiosPromise<ResponseDataType> | false {
+): Promise<iCacheResponse<ResponseDataType>> | false {
     const key = makeCacheKey(method, tableName, requestData);
     const cached = apiRequestCache.get(key);
 
     if (!cached) return false;
 
-    if (shouldLog(LogLevel.DEBUG, undefined)) {
+    if (shouldLog(LogLevel.INFO, undefined)) {
         console.groupCollapsed(
             `%c API cache hit for ${method} ${tableName}`,
             "color:#0c0",

package/src/utils/colorSql.ts

@@ -73,6 +73,23 @@ function collapseBinds(sql: string): string {
     );
 }
 
+/**
+ * ( ? ×9 ), ( ? ×9 ), ( ? ×9 )  ->  ( ? ×9 ) ×3
+ */
+function collapseRepeatedValueRows(sql: string): string {
+    const repeatedRowPattern =
+        /(\((?:\x1b\[[0-9;]*m)?\?\s*×\d+(?:\x1b\[[0-9;]*m)?\)|\(\s*(?:\?\s*,\s*)+\?\s*\))(?:\s*,\s*\1){2,}/g;
+
+    return sql.replace(repeatedRowPattern, (match, row: string) => {
+        const rowMatches = match.match(new RegExp(row.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "g"));
+        const count = rowMatches?.length ?? 1;
+        const normalizedRow = row.includes("×")
+            ? row
+            : `(${C.DIM}? ×${(row.match(/\?/g) ?? []).length}${RESET})`;
+        return `${normalizedRow} ${C.DIM}×${count}${RESET}`;
+    });
+}
+
 /* ---------- main formatter ---------- */
 
 export default function colorSql(sql: string): string {
@@ -80,6 +97,7 @@ export default function colorSql(sql: string): string {
 
     /* 1️⃣ collapse bind noise */
     s = collapseBinds(s);
+    s = collapseRepeatedValueRows(s);
 
     /* 2️⃣ table.column coloring (core visual grouping) */
     s = s.replace(