@carbonorm/carbonnode 6.0.13 → 6.0.17

package/dist/index.cjs.js

@@ -517,8 +517,6 @@ var applyLogLevelDefaults = function (config, request) {
 };
 var getLogContext = function (config, request) {
     var _a, _b;
-    if (!config && !request)
-        return undefined;
     return {
         logLevel: (_a = config === null || config === void 0 ? void 0 : config.logLevel) !== null && _a !== void 0 ? _a : undefined,
         verbose: (_b = config === null || config === void 0 ? void 0 : config.verbose) !== null && _b !== void 0 ? _b : undefined,
@@ -865,6 +863,213 @@ function removeInvalidKeys(request, c6Tables) {
     return intersection;
 }
 
+/* eslint-disable no-control-regex */
+var RESET = "\x1b[0m";
+var C$1 = {
+    KEYWORD: "\x1b[94m", // blue
+    LIMIT: "\x1b[93m", // yellow
+    NUMBER: "\x1b[92m", // green
+    DIM: "\x1b[90m", // gray
+};
+/* ---------- ANSI helpers ---------- */
+var ansi256 = function (n) { return "\u001B[38;5;".concat(n, "m"); };
+/* ---------- hashing ---------- */
+function hashString$1(str) {
+    var hash = 0;
+    for (var i = 0; i < str.length; i++) {
+        hash = (hash * 31 + str.charCodeAt(i)) | 0;
+    }
+    return Math.abs(hash);
+}
+/* ---------- table color ---------- */
+function tableRGB(tableName) {
+    var name = tableName.replace(/[`"]/g, "").toLowerCase();
+    var hash = hashString$1(name);
+    // Stable hue bucket by first letter
+    var first = name.charCodeAt(0) || 97;
+    var hueBase = (first - 97) % 6;
+    var r = (hueBase + (hash % 3)) % 6;
+    var g = (hash >> 3) % 6;
+    var b = (hash >> 6) % 6;
+    return [r, g, Math.max(2, b)]; // avoid muddy dark blues
+}
+function tableColor(table) {
+    var _a = tableRGB(table), r = _a[0], g = _a[1], b = _a[2];
+    return ansi256(16 + 36 * r + 6 * g + b);
+}
+/* ---------- column color (same hue, lighter) ---------- */
+function columnColorFromTable(table) {
+    var _a = tableRGB(table), r = _a[0], g = _a[1], b = _a[2];
+    // Lift toward white, preserve hue
+    var lr = Math.min(5, r + 1);
+    var lg = Math.min(5, g + 1);
+    var lb = Math.min(5, b + 2);
+    return ansi256(16 + 36 * lr + 6 * lg + lb);
+}
+/* ---------- bind collapsing ---------- */
+/**
+ * ?, ?, ?, ?, ?, ?  →  ? ×6
+ * triggers at 4+
+ */
+function collapseBinds(sql) {
+    return sql.replace(/(\?\s*,\s*){3,}\?/g, function (match) {
+        var count = match.split("?").length - 1;
+        return "".concat(C$1.DIM, "? \u00D7").concat(count).concat(RESET);
+    });
+}
+/**
+ * ( ? ×9 ), ( ? ×9 ), ( ? ×9 )  ->  ( ? ×9 ) ×3
+ */
+function collapseRepeatedValueRows(sql) {
+    var repeatedRowPattern = /(\((?:\x1b\[[0-9;]*m)?\?\s*×\d+(?:\x1b\[[0-9;]*m)?\)|\(\s*(?:\?\s*,\s*)+\?\s*\))(?:\s*,\s*\1){2,}/g;
+    return sql.replace(repeatedRowPattern, function (match, row) {
+        var _a, _b;
+        var rowMatches = match.match(new RegExp(row.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "g"));
+        var count = (_a = rowMatches === null || rowMatches === void 0 ? void 0 : rowMatches.length) !== null && _a !== void 0 ? _a : 1;
+        var normalizedRow = row.includes("×")
+            ? row
+            : "(".concat(C$1.DIM, "? \u00D7").concat(((_b = row.match(/\?/g)) !== null && _b !== void 0 ? _b : []).length).concat(RESET, ")");
+        return "".concat(normalizedRow, " ").concat(C$1.DIM, "\u00D7").concat(count).concat(RESET);
+    });
+}
+/* ---------- main formatter ---------- */
+function colorSql(sql) {
+    var s = sql.trim();
+    /* 1️⃣ collapse bind noise */
+    s = collapseBinds(s);
+    s = collapseRepeatedValueRows(s);
+    /* 2️⃣ table.column coloring (core visual grouping) */
+    s = s.replace(/\b(`?\w+`?)\.(\w+)\b/g, function (_, table, column) {
+        return "".concat(tableColor(table)).concat(table).concat(RESET, ".") +
+            "".concat(columnColorFromTable(table)).concat(column).concat(RESET);
+    });
+    /* 3️⃣ FROM / JOIN tables */
+    s = s.replace(/\b(FROM|JOIN|UPDATE|INTO)\s+(`[^`]+`|\w+)/gi, function (_, kw, table) {
+        return "".concat(C$1.KEYWORD).concat(kw).concat(RESET, " ").concat(tableColor(table)).concat(table).concat(RESET);
+    });
+    /* 4️⃣ SQL keywords */
+    s = s.replace(/\b(SELECT|WHERE|AND|OR|ON|IN|BETWEEN|EXISTS|ORDER BY|GROUP BY|HAVING|SET|VALUES|INSERT|REPLACE|DELETE|UPDATE|DUPLICATE|KEY)\b/gi, "".concat(C$1.KEYWORD, "$1").concat(RESET));
+    /* 5️⃣ LIMIT */
+    s = s.replace(/\bLIMIT\s+(\d+)/gi, "".concat(C$1.LIMIT, "LIMIT").concat(RESET, " ").concat(C$1.NUMBER, "$1").concat(RESET));
+    return s;
+}
+
+var version = "6.0.17";
+
+var DEFAULT_STEP = 8;
+function parseSemver(version) {
+    var _a = version.trim().split("-"), core = _a[0], prerelease = _a[1];
+    var _b = core.split("."), majorRaw = _b[0], minorRaw = _b[1], patchRaw = _b[2];
+    var major = Number.parseInt(majorRaw !== null && majorRaw !== void 0 ? majorRaw : "0", 10);
+    var minor = Number.parseInt(minorRaw !== null && minorRaw !== void 0 ? minorRaw : "0", 10);
+    var patch = Number.parseInt(patchRaw !== null && patchRaw !== void 0 ? patchRaw : "0", 10);
+    var prereleaseParts = prerelease ? prerelease.split(".").filter(Boolean).length : 0;
+    return {
+        major: Number.isFinite(major) ? major : 0,
+        minor: Number.isFinite(minor) ? minor : 0,
+        patch: Number.isFinite(patch) ? patch : 0,
+        prereleaseParts: prereleaseParts,
+    };
+}
+function channelValue(n, step) {
+    var value = 255 - ((n * step) % 256);
+    return (value + 256) % 256;
+}
+function versionToRgb(version, step) {
+    if (step === void 0) { step = DEFAULT_STEP; }
+    var safeStep = Number.isFinite(step) && step > 0 ? Math.floor(step) : DEFAULT_STEP;
+    var _a = parseSemver(version), major = _a.major, minor = _a.minor, patch = _a.patch, prereleaseParts = _a.prereleaseParts;
+    var rotation = (major + minor + patch + prereleaseParts) % 3;
+    var base = [major, minor, patch];
+    var rotated = rotation === 1
+        ? [base[2], base[0], base[1]]
+        : rotation === 2
+            ? [base[1], base[2], base[0]]
+            : base;
+    return {
+        r: channelValue(rotated[0], safeStep),
+        g: channelValue(rotated[1], safeStep),
+        b: channelValue(rotated[2], safeStep),
+    };
+}
+
+var C = {
+    SSR: "\x1b[95m", // bright magenta
+    HTTP: "\x1b[94m", // bright blue
+    WARN: "\x1b[93m", // yellow
+    ORANGE: "\x1b[38;2;255;165;0m", // orange (truecolor)
+    ERROR: "\x1b[91m", // red
+    METHOD_COLORS: {
+        SELECT: "\x1b[92m", // green
+        INSERT: "\x1b[96m", // cyan
+        REPLACE: "\x1b[96m", // cyan
+        UPDATE: "\x1b[95m", // magenta
+        DELETE: "\x1b[38;2;255;179;179m", // very light red (truecolor)
+    },
+    METHOD_FALLBACK: [
+        "\x1b[92m", // green
+        "\x1b[93m", // yellow
+        "\x1b[95m", // magenta
+        "\x1b[96m", // cyan
+        "\x1b[94m", // blue
+        "\x1b[97m", // white
+    ],
+    GREY: "\x1b[90m", // light grey
+    RESET: "\x1b[0m",
+};
+var rgbAnsi = function (_a) {
+    var r = _a.r, g = _a.g, b = _a.b;
+    return "\u001B[38;2;".concat(r, ";").concat(g, ";").concat(b, "m");
+};
+function hashString(value) {
+    var hash = 0;
+    for (var i = 0; i < value.length; i++) {
+        hash = (hash * 31 + value.charCodeAt(i)) | 0;
+    }
+    return Math.abs(hash);
+}
+function methodColor(method) {
+    var key = method.toUpperCase();
+    if (key in C.METHOD_COLORS) {
+        return C.METHOD_COLORS[key];
+    }
+    var idx = hashString(key) % C.METHOD_FALLBACK.length;
+    return C.METHOD_FALLBACK[idx];
+}
+var cacheLabel = function (cacheStatus) {
+    switch (cacheStatus) {
+        case "hit":
+            return "".concat(C.METHOD_COLORS.SELECT, "[CACHE HIT]").concat(C.RESET);
+        case "ignored":
+            return "".concat(C.WARN, "[CACHE IGNORED]").concat(C.RESET);
+        default:
+            return "".concat(C.ORANGE, "[CACHE MISS]").concat(C.RESET);
+    }
+};
+var allowListLabel = function (status) {
+    switch (status) {
+        case "allowed":
+            return "".concat(C.METHOD_COLORS.SELECT, "[VERIFIED]").concat(C.RESET);
+        case "denied":
+            return "".concat(C.ERROR, "[DENIED]").concat(C.RESET);
+        default:
+            return "".concat(C.GREY, "[NOT VERIFIED]").concat(C.RESET);
+    }
+};
+function logSql(options) {
+    var method = options.method.toUpperCase();
+    if (!shouldLog(exports.LogLevel.INFO, options.context))
+        return;
+    var preText = getEnvBool("SSR", false)
+        ? "".concat(C.SSR, "[SSR]").concat(C.RESET, " ")
+        : "".concat(C.HTTP, "[API]").concat(C.RESET, " ");
+    var labelColor = methodColor(method);
+    var versionColor = rgbAnsi(versionToRgb(version));
+    var cacheText = cacheLabel(options.cacheStatus);
+    var allowListText = allowListLabel(options.allowListStatus);
+    console.log("".concat(versionColor, "[").concat(version, "]").concat(C.RESET, " ").concat(cacheText, " ").concat(allowListText, " ").concat(preText).concat(labelColor, "[").concat(method, "]").concat(C.RESET, " ").concat(colorSql(options.sql)));
+}
+
 // -----------------------------------------------------------------------------
 // Cache Storage
 // -----------------------------------------------------------------------------
@@ -907,15 +1112,24 @@ function clearCache(props) {
 // -----------------------------------------------------------------------------
 // Check Cache (dedupe via hashed key)
 // -----------------------------------------------------------------------------
-function checkCache(method, tableName, requestData) {
+function checkCache(method, tableName, requestData, logContext) {
+    var _a, _b, _c, _d, _e;
     var key = makeCacheKey(method, tableName, requestData);
     var cached = apiRequestCache.get(key);
-    if (!cached)
+    if (!cached) {
+        console.log('apiRequestCache.size', apiRequestCache.size);
         return false;
-    if (shouldLog(exports.LogLevel.INFO, undefined)) {
-        console.groupCollapsed("%c API cache hit for ".concat(method, " ").concat(tableName), "color:#0c0");
-        console.log("Request Data:", requestData);
-        console.groupEnd();
+    }
+    if (shouldLog(exports.LogLevel.INFO, logContext)) {
+        var sql = (_d = (_c = (_b = (_a = 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: "hit",
+            context: logContext,
+            method: sqlMethod,
+            sql: sql
+        });
     }
     return cached.request;
 }
@@ -1084,7 +1298,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                         querySerialized = sortAndSerializeQueryObject(tables, cacheRequestData !== null && cacheRequestData !== void 0 ? cacheRequestData : {});
                                         cachedRequest = false;
                                         if (cacheResults) {
-                                            cachedRequest = checkCache(requestMethod, tableName, cacheRequestData);
+                                            cachedRequest = checkCache(requestMethod, tableName, cacheRequestData, logContext);
                                         }
                                         if (!cachedRequest) return [3 /*break*/, 2];
                                         return [4 /*yield*/, cachedRequest];
@@ -1180,8 +1394,10 @@ var HttpExecutor = /** @class */ (function (_super) {
                                                         return [tslib.__assign(tslib.__assign({}, baseConfig), { params: query })];
                                                     case POST:
                                                         if (dataInsertMultipleRows !== undefined) {
+                                                            var convertedRows = dataInsertMultipleRows.map(convert);
+                                                            var convertedQuery = convert(query);
                                                             return [
-                                                                dataInsertMultipleRows.map(convert),
+                                                                tslib.__assign(tslib.__assign({}, convertedQuery), { dataInsertMultipleRows: convertedRows }),
                                                                 baseConfig
                                                             ];
                                                         }
@@ -2943,186 +3159,6 @@ var PaginationBuilder = /** @class */ (function (_super) {
     return PaginationBuilder;
 }(JoinBuilder));
 
-/* eslint-disable no-control-regex */
-var RESET = "\x1b[0m";
-var C$1 = {
-    KEYWORD: "\x1b[94m", // blue
-    LIMIT: "\x1b[93m", // yellow
-    NUMBER: "\x1b[92m", // green
-    DIM: "\x1b[90m", // gray
-};
-/* ---------- ANSI helpers ---------- */
-var ansi256 = function (n) { return "\u001B[38;5;".concat(n, "m"); };
-/* ---------- hashing ---------- */
-function hashString$1(str) {
-    var hash = 0;
-    for (var i = 0; i < str.length; i++) {
-        hash = (hash * 31 + str.charCodeAt(i)) | 0;
-    }
-    return Math.abs(hash);
-}
-/* ---------- table color ---------- */
-function tableRGB(tableName) {
-    var name = tableName.replace(/[`"]/g, "").toLowerCase();
-    var hash = hashString$1(name);
-    // Stable hue bucket by first letter
-    var first = name.charCodeAt(0) || 97;
-    var hueBase = (first - 97) % 6;
-    var r = (hueBase + (hash % 3)) % 6;
-    var g = (hash >> 3) % 6;
-    var b = (hash >> 6) % 6;
-    return [r, g, Math.max(2, b)]; // avoid muddy dark blues
-}
-function tableColor(table) {
-    var _a = tableRGB(table), r = _a[0], g = _a[1], b = _a[2];
-    return ansi256(16 + 36 * r + 6 * g + b);
-}
-/* ---------- column color (same hue, lighter) ---------- */
-function columnColorFromTable(table) {
-    var _a = tableRGB(table), r = _a[0], g = _a[1], b = _a[2];
-    // Lift toward white, preserve hue
-    var lr = Math.min(5, r + 1);
-    var lg = Math.min(5, g + 1);
-    var lb = Math.min(5, b + 2);
-    return ansi256(16 + 36 * lr + 6 * lg + lb);
-}
-/* ---------- bind collapsing ---------- */
-/**
- * ?, ?, ?, ?, ?, ?  →  ? ×6
- * triggers at 4+
- */
-function collapseBinds(sql) {
-    return sql.replace(/(\?\s*,\s*){3,}\?/g, function (match) {
-        var count = match.split("?").length - 1;
-        return "".concat(C$1.DIM, "? \u00D7").concat(count).concat(RESET);
-    });
-}
-/**
- * ( ? ×9 ), ( ? ×9 ), ( ? ×9 )  ->  ( ? ×9 ) ×3
- */
-function collapseRepeatedValueRows(sql) {
-    var repeatedRowPattern = /(\((?:\x1b\[[0-9;]*m)?\?\s*×\d+(?:\x1b\[[0-9;]*m)?\)|\(\s*(?:\?\s*,\s*)+\?\s*\))(?:\s*,\s*\1){2,}/g;
-    return sql.replace(repeatedRowPattern, function (match, row) {
-        var _a, _b;
-        var rowMatches = match.match(new RegExp(row.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), "g"));
-        var count = (_a = rowMatches === null || rowMatches === void 0 ? void 0 : rowMatches.length) !== null && _a !== void 0 ? _a : 1;
-        var normalizedRow = row.includes("×")
-            ? row
-            : "(".concat(C$1.DIM, "? \u00D7").concat(((_b = row.match(/\?/g)) !== null && _b !== void 0 ? _b : []).length).concat(RESET, ")");
-        return "".concat(normalizedRow, " ").concat(C$1.DIM, "\u00D7").concat(count).concat(RESET);
-    });
-}
-/* ---------- main formatter ---------- */
-function colorSql(sql) {
-    var s = sql.trim();
-    /* 1️⃣ collapse bind noise */
-    s = collapseBinds(s);
-    s = collapseRepeatedValueRows(s);
-    /* 2️⃣ table.column coloring (core visual grouping) */
-    s = s.replace(/\b(`?\w+`?)\.(\w+)\b/g, function (_, table, column) {
-        return "".concat(tableColor(table)).concat(table).concat(RESET, ".") +
-            "".concat(columnColorFromTable(table)).concat(column).concat(RESET);
-    });
-    /* 3️⃣ FROM / JOIN tables */
-    s = s.replace(/\b(FROM|JOIN|UPDATE|INTO)\s+(`[^`]+`|\w+)/gi, function (_, kw, table) {
-        return "".concat(C$1.KEYWORD).concat(kw).concat(RESET, " ").concat(tableColor(table)).concat(table).concat(RESET);
-    });
-    /* 4️⃣ SQL keywords */
-    s = s.replace(/\b(SELECT|WHERE|AND|OR|ON|IN|BETWEEN|EXISTS|ORDER BY|GROUP BY|HAVING|SET|VALUES|INSERT|REPLACE|DELETE|UPDATE|DUPLICATE|KEY)\b/gi, "".concat(C$1.KEYWORD, "$1").concat(RESET));
-    /* 5️⃣ LIMIT */
-    s = s.replace(/\bLIMIT\s+(\d+)/gi, "".concat(C$1.LIMIT, "LIMIT").concat(RESET, " ").concat(C$1.NUMBER, "$1").concat(RESET));
-    return s;
-}
-
-var version = "6.0.13";
-
-var DEFAULT_STEP = 8;
-function parseSemver(version) {
-    var _a = version.trim().split("-"), core = _a[0], prerelease = _a[1];
-    var _b = core.split("."), majorRaw = _b[0], minorRaw = _b[1], patchRaw = _b[2];
-    var major = Number.parseInt(majorRaw !== null && majorRaw !== void 0 ? majorRaw : "0", 10);
-    var minor = Number.parseInt(minorRaw !== null && minorRaw !== void 0 ? minorRaw : "0", 10);
-    var patch = Number.parseInt(patchRaw !== null && patchRaw !== void 0 ? patchRaw : "0", 10);
-    var prereleaseParts = prerelease ? prerelease.split(".").filter(Boolean).length : 0;
-    return {
-        major: Number.isFinite(major) ? major : 0,
-        minor: Number.isFinite(minor) ? minor : 0,
-        patch: Number.isFinite(patch) ? patch : 0,
-        prereleaseParts: prereleaseParts,
-    };
-}
-function channelValue(n, step) {
-    var value = 255 - ((n * step) % 256);
-    return (value + 256) % 256;
-}
-function versionToRgb(version, step) {
-    if (step === void 0) { step = DEFAULT_STEP; }
-    var safeStep = Number.isFinite(step) && step > 0 ? Math.floor(step) : DEFAULT_STEP;
-    var _a = parseSemver(version), major = _a.major, minor = _a.minor, patch = _a.patch, prereleaseParts = _a.prereleaseParts;
-    var rotation = (major + minor + patch + prereleaseParts) % 3;
-    var base = [major, minor, patch];
-    var rotated = rotation === 1
-        ? [base[2], base[0], base[1]]
-        : rotation === 2
-            ? [base[1], base[2], base[0]]
-            : base;
-    return {
-        r: channelValue(rotated[0], safeStep),
-        g: channelValue(rotated[1], safeStep),
-        b: channelValue(rotated[2], safeStep),
-    };
-}
-
-var C = {
-    SSR: "\x1b[95m", // bright magenta
-    HTTP: "\x1b[94m", // bright blue
-    METHOD_COLORS: {
-        SELECT: "\x1b[92m", // green
-        INSERT: "\x1b[96m", // cyan
-        REPLACE: "\x1b[96m", // cyan
-        UPDATE: "\x1b[95m", // magenta
-        DELETE: "\x1b[91m", // red
-    },
-    METHOD_FALLBACK: [
-        "\x1b[92m", // green
-        "\x1b[93m", // yellow
-        "\x1b[95m", // magenta
-        "\x1b[96m", // cyan
-        "\x1b[94m", // blue
-        "\x1b[97m", // white
-    ],
-    RESET: "\x1b[0m",
-};
-var rgbAnsi = function (_a) {
-    var r = _a.r, g = _a.g, b = _a.b;
-    return "\u001B[38;2;".concat(r, ";").concat(g, ";").concat(b, "m");
-};
-function hashString(value) {
-    var hash = 0;
-    for (var i = 0; i < value.length; i++) {
-        hash = (hash * 31 + value.charCodeAt(i)) | 0;
-    }
-    return Math.abs(hash);
-}
-function methodColor(method) {
-    var key = method.toUpperCase();
-    if (key in C.METHOD_COLORS) {
-        return C.METHOD_COLORS[key];
-    }
-    var idx = hashString(key) % C.METHOD_FALLBACK.length;
-    return C.METHOD_FALLBACK[idx];
-}
-function logSql(method, sql, context) {
-    if (!shouldLog(exports.LogLevel.INFO, context))
-        return;
-    var preText = getEnvBool("SSR", false)
-        ? "".concat(C.SSR, "[SSR]").concat(C.RESET, " ")
-        : "".concat(C.HTTP, "[API]").concat(C.RESET, " ");
-    var labelColor = methodColor(method);
-    var versionColor = rgbAnsi(versionToRgb(version));
-    console.log("".concat(versionColor, "[").concat(version, "]").concat(C.RESET, " ").concat(preText).concat(labelColor, "[").concat(method, "]").concat(C.RESET, " ").concat(colorSql(sql)));
-}
-
 var SelectQueryBuilder = /** @class */ (function (_super) {
     tslib.__extends(SelectQueryBuilder, _super);
     function SelectQueryBuilder() {
@@ -3174,7 +3210,6 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
         else if (!isSubSelect) {
             sql += " LIMIT 100";
         }
-        logSql("SELECT", sql, getLogContext(this.config, this.request));
         return { sql: sql, params: params };
     };
     return SelectQueryBuilder;
@@ -3199,7 +3234,6 @@ var DeleteQueryBuilder = /** @class */ (function (_super) {
         if (this.request.WHERE) {
             sql += this.buildWhereClause(this.request.WHERE, params);
         }
-        logSql("DELETE", sql, getLogContext(this.config, this.request));
         return { sql: sql, params: params };
     };
     return DeleteQueryBuilder;
@@ -3258,7 +3292,6 @@ var PostQueryBuilder = /** @class */ (function (_super) {
             var updateClause = updateData.map(function (k) { return "`".concat(k, "` = VALUES(`").concat(k, "`)"); }).join(', ');
             sql += " ON DUPLICATE KEY UPDATE ".concat(updateClause);
         }
-        logSql(verb, sql, getLogContext(this.config, this.request));
         return { sql: sql, params: params };
     };
     return PostQueryBuilder;
@@ -3310,7 +3343,6 @@ var UpdateQueryBuilder = /** @class */ (function (_super) {
         if (args.PAGINATION) {
             sql += this.buildPaginationClause(args.PAGINATION, params);
         }
-        logSql("UPDATE", sql, getLogContext(this.config, this.request));
         return { sql: sql, params: params };
     };
     return UpdateQueryBuilder;
@@ -3444,8 +3476,55 @@ function normalizeSingularRequest(requestMethod, request, restModel, removedPrim
 }
 
 var allowListCache = new Map();
+var ANSI_ESCAPE_REGEX = /\x1b\[[0-9;]*m/g;
+var COLLAPSED_BIND_ROW_REGEX = /\(\?\s*×\d+\)/g;
+function collapseBindGroups(sql) {
+    var normalized = sql.replace(/\(\s*(\?(?:\s*,\s*\?)*)\s*\)/g, function (_match, binds) {
+        var _a;
+        var bindCount = ((_a = binds.match(/\?/g)) !== null && _a !== void 0 ? _a : []).length;
+        return "(? \u00D7".concat(bindCount, ")");
+    });
+    normalized = normalized.replace(/(\(\?\s*×\d+\))(?:\s*,\s*\1)+/g, function (_match, row) { return "".concat(row, " \u00D7*"); });
+    normalized = normalized.replace(/\b(VALUES|VALUE)\s+(\(\?\s*×\d+\))(?:\s*×\d+|\s*×\*)?/gi, function (_match, keyword, row) { return "".concat(keyword, " ").concat(row, " \u00D7*"); });
+    normalized = normalized.replace(/\bIN\s*\(\?\s*×\d+\)/gi, "IN (? ×*)");
+    normalized = normalized.replace(/\(\?\s*×\d+\)\s*×\d+/g, function (match) {
+        var _a;
+        var row = (_a = match.match(COLLAPSED_BIND_ROW_REGEX)) === null || _a === void 0 ? void 0 : _a[0];
+        return row ? "".concat(row, " \u00D7*") : match;
+    });
+    return normalized;
+}
+function normalizeLimitOffset(sql) {
+    return sql
+        .replace(/\bLIMIT\s+\d+\s*,\s*\d+\b/gi, "LIMIT ?, ?")
+        .replace(/\bLIMIT\s+\d+\s+OFFSET\s+\d+\b/gi, "LIMIT ? OFFSET ?")
+        .replace(/\bLIMIT\s+\d+\b/gi, "LIMIT ?")
+        .replace(/\bOFFSET\s+\d+\b/gi, "OFFSET ?");
+}
+function normalizeGeomFromTextLiterals(sql) {
+    var normalized = sql.replace(/ST_GEOMFROMTEXT\(\s*'POINT\([^']*\)'\s*,\s*(?:\d+|\?)\s*\)/gi, "ST_GEOMFROMTEXT('POINT(? ?)', ?)");
+    normalized = normalized.replace(/ST_GEOMFROMTEXT\(\s*'POLYGON\(\([^']*\)\)'\s*,\s*(?:\d+|\?)\s*\)/gi, "ST_GEOMFROMTEXT('POLYGON((?))', ?)");
+    return normalized;
+}
+function normalizeGeoFunctionNames(sql) {
+    return sql
+        .replace(/\bST_DISTANCE_SPHERE\b/gi, "ST_DISTANCE_SPHERE")
+        .replace(/\bST_GEOMFROMTEXT\b/gi, "ST_GEOMFROMTEXT")
+        .replace(/\bMBRCONTAINS\b/gi, "MBRCONTAINS");
+}
+function normalizeTokenPunctuationSpacing(sql) {
+    return sql.replace(/`,\s*`/g, "`, `");
+}
 var normalizeSql = function (sql) {
-    return sql.replace(/\s+/g, " ").trim();
+    var normalized = sql.replace(ANSI_ESCAPE_REGEX, " ");
+    normalized = normalized.replace(/\s+/g, " ").trim();
+    normalized = normalizeGeoFunctionNames(normalized);
+    normalized = normalizeTokenPunctuationSpacing(normalized);
+    normalized = collapseBindGroups(normalized);
+    normalized = normalizeLimitOffset(normalized);
+    normalized = normalizeGeomFromTextLiterals(normalized);
+    normalized = normalized.replace(/;\s*$/, "");
+    return normalized.replace(/\s+/g, " ").trim();
 };
 var parseAllowList = function (raw, sourcePath) {
     var parsed;
@@ -3468,33 +3547,51 @@ var parseAllowList = function (raw, sourcePath) {
     return sqlEntries;
 };
 var loadSqlAllowList = function (allowListPath) { return tslib.__awaiter(void 0, void 0, void 0, function () {
-    var readFile, raw, sqlEntries, allowList;
-    return tslib.__generator(this, function (_a) {
-        switch (_a.label) {
+    var _a, readFile, stat, fileStat, cached, raw, sqlEntries, allowList;
+    return tslib.__generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
-                if (allowListCache.has(allowListPath)) {
-                    return [2 /*return*/, allowListCache.get(allowListPath)];
-                }
                 if (!isNode()) {
                     throw new Error("SQL allowlist validation requires a Node runtime.");
                 }
                 return [4 /*yield*/, import('node:fs/promises')];
             case 1:
-                readFile = (_a.sent()).readFile;
-                _a.label = 2;
+                _a = _b.sent(), readFile = _a.readFile, stat = _a.stat;
+                _b.label = 2;
             case 2:
-                _a.trys.push([2, 4, , 5]);
-                return [4 /*yield*/, readFile(allowListPath, "utf-8")];
+                _b.trys.push([2, 4, , 5]);
+                return [4 /*yield*/, stat(allowListPath)];
             case 3:
-                raw = _a.sent();
+                fileStat = _b.sent();
                 return [3 /*break*/, 5];
             case 4:
-                _a.sent();
+                _b.sent();
                 throw new Error("SQL allowlist file not found at ".concat(allowListPath, "."));
             case 5:
+                cached = allowListCache.get(allowListPath);
+                if (cached &&
+                    cached.mtimeMs === fileStat.mtimeMs &&
+                    cached.size === fileStat.size) {
+                    return [2 /*return*/, cached.allowList];
+                }
+                _b.label = 6;
+            case 6:
+                _b.trys.push([6, 8, , 9]);
+                return [4 /*yield*/, readFile(allowListPath, "utf-8")];
+            case 7:
+                raw = _b.sent();
+                return [3 /*break*/, 9];
+            case 8:
+                _b.sent();
+                throw new Error("SQL allowlist file not found at ".concat(allowListPath, "."));
+            case 9:
                 sqlEntries = parseAllowList(raw, allowListPath);
                 allowList = new Set(sqlEntries);
-                allowListCache.set(allowListPath, allowList);
+                allowListCache.set(allowListPath, {
+                    allowList: allowList,
+                    mtimeMs: fileStat.mtimeMs,
+                    size: fileStat.size,
+                });
                 return [2 /*return*/, allowList];
         }
     });
@@ -3557,6 +3654,25 @@ var compileSqlAllowList = function (allowListPath, entries) { return tslib.__awa
     });
 }); };
 
+var SQL_ALLOWLIST_BLOCKED_CODE = "SQL_ALLOWLIST_BLOCKED";
+var createSqlAllowListBlockedError = function (args) {
+    var _a, _b;
+    var error = new Error("SQL statement is not permitted by allowlist (".concat(args.allowListPath, ")."));
+    error.name = "SqlAllowListBlockedError";
+    error.code = SQL_ALLOWLIST_BLOCKED_CODE;
+    error.tableName = args.tableName;
+    error.method = args.method;
+    error.normalizedSql = args.normalizedSql;
+    error.allowListPath = args.allowListPath;
+    error.sqlAllowList = {
+        sql: args.normalizedSql,
+        table: (_a = args.tableName) !== null && _a !== void 0 ? _a : null,
+        method: (_b = args.method) !== null && _b !== void 0 ? _b : null,
+        allowListPath: args.allowListPath,
+        canAdd: true,
+    };
+    return error;
+};
 var SqlExecutor = /** @class */ (function (_super) {
     tslib.__extends(SqlExecutor, _super);
     function SqlExecutor() {
@@ -3567,6 +3683,22 @@ var SqlExecutor = /** @class */ (function (_super) {
         })); };
         return _this;
     }
+    SqlExecutor.prototype.resolveSqlLogMethod = function (method, sql) {
+        var _a;
+        var token = (_a = sql.trim().split(/\s+/, 1)[0]) === null || _a === void 0 ? void 0 : _a.toUpperCase();
+        if (token)
+            return token;
+        switch (method) {
+            case C6Constants.GET:
+                return "SELECT";
+            case C6Constants.POST:
+                return "INSERT";
+            case C6Constants.PUT:
+                return "UPDATE";
+            default:
+                return "DELETE";
+        }
+    };
     SqlExecutor.prototype.execute = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var TABLE_NAME, method, logContext, response, _a, rest, getResponse, restRows, result, result, result;
@@ -3938,7 +4070,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, queryPromise, cacheRequest, cacheResponse;
+            var method, tableName, logContext, cacheResults, cacheRequestData, requestArgumentsSerialized, cachedRequest, sqlExecution, sqlMethod, queryPromise, cacheRequest, cacheResponse;
             var _this = this;
             var _a, _b;
             return tslib.__generator(this, function (_c) {
@@ -3948,8 +4080,7 @@ var SqlExecutor = /** @class */ (function (_super) {
                         tableName = this.config.restModel.TABLE_NAME;
                         logContext = getLogContext(this.config, this.request);
                         cacheResults = method === C6Constants.GET
-                            && !this.config.sqlAllowListPath
-                            && ((_a = this.request) === null || _a === void 0 ? void 0 : _a.cacheResults) !== false;
+                            && ((_a = this.request.cacheResults) !== null && _a !== void 0 ? _a : true);
                         cacheRequestData = cacheResults
                             ? JSON.parse(JSON.stringify((_b = this.request) !== null && _b !== void 0 ? _b : {}))
                             : undefined;
@@ -3957,15 +4088,18 @@ var SqlExecutor = /** @class */ (function (_super) {
                             ? sortAndSerializeQueryObject(tableName, cacheRequestData !== null && cacheRequestData !== void 0 ? cacheRequestData : {})
                             : undefined;
                         if (!cacheResults) return [3 /*break*/, 2];
-                        cachedRequest = checkCache(method, tableName, cacheRequestData);
+                        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 2:
                         sqlExecution = this.buildSqlExecutionContext(method, tableName, logContext);
-                        queryPromise = this.withConnection(function (conn) { return tslib.__awaiter(_this, void 0, void 0, function () { return tslib.__generator(this, function (_a) {
-                            return [2 /*return*/, this.executeQueryWithLifecycle(conn, method, sqlExecution, logContext)];
-                        }); }); });
+                        sqlMethod = this.resolveSqlLogMethod(method, sqlExecution.sql);
+                        queryPromise = this.withConnection(function (conn) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                            return tslib.__generator(this, function (_a) {
+                                return [2 /*return*/, this.executeQueryWithLifecycle(conn, method, sqlExecution, logContext, sqlMethod)];
+                            });
+                        }); });
                         if (!(!cacheResults || !cacheRequestData || !requestArgumentsSerialized)) return [3 /*break*/, 4];
                         return [4 /*yield*/, queryPromise];
                     case 3: return [2 /*return*/, _c.sent()];
@@ -4043,9 +4177,9 @@ var SqlExecutor = /** @class */ (function (_super) {
             },
         };
     };
-    SqlExecutor.prototype.executeQueryWithLifecycle = function (conn, method, sqlExecution, logContext) {
+    SqlExecutor.prototype.executeQueryWithLifecycle = function (conn, method, sqlExecution, logContext, sqlMethod) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var useTransaction, committed, result, response, hookResponse, err_1, rollbackErr_1;
+            var useTransaction, committed, allowListStatus, error_2, result, response, hookResponse, err_1, rollbackErr_1;
             return tslib.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -4053,25 +4187,49 @@ var SqlExecutor = /** @class */ (function (_super) {
                         committed = false;
                         _a.label = 1;
                     case 1:
-                        _a.trys.push([1, 11, , 16]);
+                        _a.trys.push([1, 14, , 19]);
                         if (!useTransaction) return [3 /*break*/, 3];
                         logWithLevel(exports.LogLevel.DEBUG, logContext, console.log, "[SQL EXECUTOR] \uD83E\uDDFE Beginning transaction");
                         return [4 /*yield*/, conn.beginTransaction()];
                     case 2:
                         _a.sent();
                         _a.label = 3;
-                    case 3: return [4 /*yield*/, this.validateSqlAllowList(sqlExecution.sql)];
+                    case 3:
+                        allowListStatus = "not verified";
+                        _a.label = 4;
                     case 4:
-                        _a.sent();
+                        _a.trys.push([4, 6, , 7]);
+                        return [4 /*yield*/, this.validateSqlAllowList(sqlExecution.sql)];
+                    case 5:
+                        allowListStatus = _a.sent();
+                        return [3 /*break*/, 7];
+                    case 6:
+                        error_2 = _a.sent();
+                        logSql({
+                            method: sqlMethod,
+                            sql: sqlExecution.sql,
+                            context: logContext,
+                            cacheStatus: this.request.cacheResults === false ? "ignored" : "miss",
+                            allowListStatus: "denied",
+                        });
+                        throw error_2;
+                    case 7:
+                        logSql({
+                            method: sqlMethod,
+                            sql: sqlExecution.sql,
+                            context: logContext,
+                            cacheStatus: this.request.cacheResults === false ? "ignored" : "miss",
+                            allowListStatus: allowListStatus,
+                        });
                         return [4 /*yield*/, this.runLifecycleHooks("beforeExecution", {
                                 config: this.config,
                                 request: this.request,
                                 sqlExecution: sqlExecution,
                             })];
-                    case 5:
+                    case 8:
                         _a.sent();
                         return [4 /*yield*/, conn.query(sqlExecution.sql, sqlExecution.values)];
-                    case 6:
+                    case 9:
                         result = (_a.sent())[0];
                         response = this.createResponseFromQueryResult(method, result, sqlExecution, logContext);
                         hookResponse = this.createLifecycleHookResponse(response);
@@ -4080,40 +4238,40 @@ var SqlExecutor = /** @class */ (function (_super) {
                                 request: this.request,
                                 response: hookResponse,
                             })];
-                    case 7:
+                    case 10:
                         _a.sent();
-                        if (!useTransaction) return [3 /*break*/, 9];
+                        if (!useTransaction) return [3 /*break*/, 12];
                         return [4 /*yield*/, conn.commit()];
-                    case 8:
+                    case 11:
                         _a.sent();
                         committed = true;
                         logWithLevel(exports.LogLevel.DEBUG, logContext, console.log, "[SQL EXECUTOR] \uD83E\uDDFE Transaction committed");
-                        _a.label = 9;
-                    case 9: return [4 /*yield*/, this.runLifecycleHooks("afterCommit", {
+                        _a.label = 12;
+                    case 12: return [4 /*yield*/, this.runLifecycleHooks("afterCommit", {
                             config: this.config,
                             request: this.request,
                             response: hookResponse,
                         })];
-                    case 10:
+                    case 13:
                         _a.sent();
                         return [2 /*return*/, response];
-                    case 11:
+                    case 14:
                         err_1 = _a.sent();
-                        if (!(useTransaction && !committed)) return [3 /*break*/, 15];
-                        _a.label = 12;
-                    case 12:
-                        _a.trys.push([12, 14, , 15]);
+                        if (!(useTransaction && !committed)) return [3 /*break*/, 18];
+                        _a.label = 15;
+                    case 15:
+                        _a.trys.push([15, 17, , 18]);
                         return [4 /*yield*/, conn.rollback()];
-                    case 13:
+                    case 16:
                         _a.sent();
                         logWithLevel(exports.LogLevel.WARN, logContext, console.warn, "[SQL EXECUTOR] \uD83E\uDDFE Transaction rolled back");
-                        return [3 /*break*/, 15];
-                    case 14:
+                        return [3 /*break*/, 18];
+                    case 17:
                         rollbackErr_1 = _a.sent();
                         logWithLevel(exports.LogLevel.ERROR, logContext, console.error, "[SQL EXECUTOR] Rollback failed", rollbackErr_1);
-                        return [3 /*break*/, 15];
-                    case 15: throw err_1;
-                    case 16: return [2 /*return*/];
+                        return [3 /*break*/, 18];
+                    case 18: throw err_1;
+                    case 19: return [2 /*return*/];
                 }
             });
         });
@@ -4121,21 +4279,31 @@ var SqlExecutor = /** @class */ (function (_super) {
     SqlExecutor.prototype.validateSqlAllowList = function (sql) {
         return tslib.__awaiter(this, void 0, void 0, function () {
             var allowListPath, allowList, normalized;
-            return tslib.__generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return tslib.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         allowListPath = this.config.sqlAllowListPath;
                         if (!allowListPath) {
-                            return [2 /*return*/];
+                            return [2 /*return*/, "not verified"];
                         }
                         return [4 /*yield*/, loadSqlAllowList(allowListPath)];
                     case 1:
-                        allowList = _a.sent();
+                        allowList = _b.sent();
                         normalized = normalizeSql(sql);
                         if (!allowList.has(normalized)) {
-                            throw new Error("SQL statement is not permitted by allowlist (".concat(allowListPath, ")."));
+                            throw createSqlAllowListBlockedError({
+                                tableName: typeof ((_a = this.config.restModel) === null || _a === void 0 ? void 0 : _a.TABLE_NAME) === "string"
+                                    ? this.config.restModel.TABLE_NAME
+                                    : undefined,
+                                method: typeof this.config.requestMethod === "string"
+                                    ? this.config.requestMethod
+                                    : undefined,
+                                normalizedSql: normalized,
+                                allowListPath: allowListPath,
+                            });
                         }
-                        return [2 /*return*/];
+                        return [2 /*return*/, "allowed"];
                 }
             });
         });