@carbonorm/carbonnode 6.0.5 → 6.0.7

package/dist/index.cjs.js

@@ -434,24 +434,70 @@ var isNode = function () {
     return typeof process !== 'undefined' && !!((_a = process.versions) === null || _a === void 0 ? void 0 : _a.node);
 };
 
-function getEnvVar(key, fallback) {
-    if (fallback === void 0) { fallback = ''; }
-    // Vite-style injection
-    // @ts-ignore
-    if (typeof ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs.js', document.baseURI).href)) }) !== 'undefined' && undefined && key in undefined) {
-        // @ts-ignore
-        return undefined[key];
+/** biome-ignore-all lint/suspicious/noExplicitAny: working with global browser objects */
+function getRuntimeEnv(key) {
+    var _a;
+    return typeof window !== "undefined" && ((_a = window.__ENV__) === null || _a === void 0 ? void 0 : _a[key]);
+}
+// Do not import anything here
+function getViteEnv(key) {
+    var _a;
+    // @ts-expect-error
+    return typeof ({ url: (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index.cjs.js', document.baseURI).href)) }) !== "undefined" && ((_a = undefined) === null || _a === void 0 ? void 0 : _a[key]);
+}
+function getEnv(key, fallback) {
+    var _a;
+    try {
+        var viteEnv = getViteEnv(key);
+        if (viteEnv !== undefined)
+            return viteEnv;
     }
-    // Node or SSR
-    if (typeof process !== 'undefined' && process.env && key in process.env) {
+    catch (_b) { }
+    var runtimeEnv = getRuntimeEnv(key);
+    if (runtimeEnv !== undefined)
+        return runtimeEnv;
+    if (typeof process !== "undefined" && ((_a = process.env) === null || _a === void 0 ? void 0 : _a[key]) !== undefined) {
         return process.env[key];
     }
-    return fallback;
+    if (fallback !== undefined)
+        return fallback;
+    throw new Error("Missing environment variable: ".concat(key));
+}
+function getEnvBool(key, fallback) {
+    if (fallback === void 0) { fallback = false; }
+    var raw = getEnv(key, fallback);
+    var v = String(raw).trim().toLowerCase();
+    return (v === "true" ||
+        v === "1" ||
+        v === "yes" ||
+        v === "y" ||
+        v === "on" ||
+        v === "enabled");
+}
+function getEnvDebug(key, fallback) {
+    var _a;
+    try {
+        var viteEnv = getViteEnv(key);
+        if (viteEnv !== undefined) {
+            return { key: key, value: viteEnv, source: "vite" };
+        }
+    }
+    catch (_b) { }
+    var runtimeEnv = getRuntimeEnv(key);
+    if (runtimeEnv !== undefined) {
+        return { key: key, value: runtimeEnv, source: "runtime" };
+    }
+    if (typeof process !== "undefined" && ((_a = process.env) === null || _a === void 0 ? void 0 : _a[key]) !== undefined) {
+        return { key: key, value: process.env[key], source: "process" };
+    }
+    if (fallback !== undefined) {
+        return { key: key, value: fallback, source: "fallback" };
+    }
+    return { key: key, value: undefined, source: "missing" };
 }
 
 function isVerbose () {
-    var envVerbose = getEnvVar('VERBOSE') || getEnvVar('REACT_APP_VERBOSE') || getEnvVar('VITE_VERBOSE') || '';
-    return ['true', '1', 'yes', 'on'].includes(envVerbose.toLowerCase());
+    return getEnvBool('VERBOSE', false) || getEnvBool('REACT_APP_VERBOSE', false) || getEnvBool('VITE_VERBOSE', false);
 }
 
 /**
@@ -467,13 +513,21 @@ function restRequest(configX) {
                 case 0:
                     config = typeof configX === "function" ? configX() : configX;
                     (_a = config.verbose) !== null && _a !== void 0 ? _a : (config.verbose = isVerbose()); // Default to env-driven verbosity if not set
-                    if (!(isNode() && config.mysqlPool)) return [3 /*break*/, 2];
+                    if (!config.mysqlPool && !config.axios) {
+                        throw new Error("No execution method available: neither mysqlPool nor axios instance provided in config.");
+                    }
+                    if (!config.mysqlPool) return [3 /*break*/, 2];
+                    config.verbose && console.log("Using SQL Executor");
                     return [4 /*yield*/, Promise.resolve().then(function () { return SqlExecutor$1; })];
                 case 1:
                     SqlExecutor = (_b.sent()).SqlExecutor;
                     executor = new SqlExecutor(config, request);
                     return [2 /*return*/, executor.execute()];
-                case 2: return [4 /*yield*/, Promise.resolve().then(function () { return HttpExecutor$1; })];
+                case 2:
+                    config.verbose && console.log("Using HTTP Executor", {
+                        isNode: isNode(),
+                    });
+                    return [4 /*yield*/, Promise.resolve().then(function () { return HttpExecutor$1; })];
                 case 3:
                     HttpExecutor = (_b.sent()).HttpExecutor;
                     http = new HttpExecutor(config, request);
@@ -563,13 +617,13 @@ var Executor = /** @class */ (function () {
 }());
 
 function isLocal () {
-    return getEnvVar('NODE_ENV', '') === 'development';
+    return getEnv('NODE_ENV', '') === 'development';
 }
 
 function isTest () {
-    return getEnvVar('JEST_WORKER_ID') || getEnvVar('NODE_ENV') === 'test'
-        || getEnvVar('REACT_APP_TEST') === 'true' || getEnvVar('VITE_TEST') === 'true'
-        || getEnvVar('MODE') === 'test' || getEnvVar('VITE_TEST_MODE') === 'true';
+    return getEnv('JEST_WORKER_ID', null) || getEnv('NODE_ENV', "") === 'test'
+        || getEnvBool('REACT_APP_TEST', false) || getEnvBool('VITE_TEST', false)
+        || getEnv('MODE', '') === 'test' || getEnvBool('VITE_TEST_MODE', false);
 }
 
 exports.eFetchDependencies = void 0;
@@ -1279,7 +1333,7 @@ var HttpExecutor = /** @class */ (function (_super) {
                                             console.error(throwableError);
                                             console.trace();
                                             console.groupEnd();
-                                            throw new Error(JSON.stringify(throwableError));
+                                            throw throwableError;
                                         }
                                         return [2 /*return*/];
                                 }
@@ -2671,6 +2725,89 @@ 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(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(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);
+    });
+}
+/* ---------- main formatter ---------- */
+function colorSql(sql) {
+    var s = sql.trim();
+    /* 1️⃣ collapse bind noise */
+    s = collapseBinds(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)\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.7";
+
+var C = {
+    SSR: "\x1b[95m", // bright magenta
+    HTTP: "\x1b[94m", // bright blue
+    SQL: "\x1b[96m", // bright cyan (your SELECT teal)
+    RESET: "\x1b[0m",
+};
 var SelectQueryBuilder = /** @class */ (function (_super) {
     tslib.__extends(SelectQueryBuilder, _super);
     function SelectQueryBuilder() {
@@ -2722,7 +2859,8 @@ var SelectQueryBuilder = /** @class */ (function (_super) {
         else if (!isSubSelect) {
             sql += " LIMIT 100";
         }
-        console.log("[SELECT] ".concat(sql.trim()));
+        var preText = getEnvBool("SSR", false) ? "".concat(C.SSR, "[SSR]").concat(C.RESET, " ") : "".concat(C.HTTP, "[API]").concat(C.RESET, " ");
+        console.log("[".concat(version, "] ").concat(preText).concat(C.SQL, "[SELECT]").concat(C.RESET, " ").concat(colorSql(sql)));
         return { sql: sql, params: params };
     };
     return SelectQueryBuilder;
@@ -3127,6 +3265,13 @@ var SqlExecutor = /** @class */ (function (_super) {
                     case 1: return [4 /*yield*/, this.runQuery()];
                     case 2:
                         rest = _b.sent();
+                        if (this.config.reactBootstrap) {
+                            this.config.reactBootstrap.updateRestfulObjectArrays({
+                                dataOrCallback: rest.rest,
+                                stateKey: this.config.restModel.TABLE_NAME,
+                                uniqueObjectId: this.config.restModel.PRIMARY_SHORT,
+                            });
+                        }
                         return [2 /*return*/, rest];
                     case 3: return [4 /*yield*/, this.runQuery()];
                     case 4:
@@ -3772,6 +3917,7 @@ exports.checkAllRequestsComplete = checkAllRequestsComplete;
 exports.checkCache = checkCache;
 exports.clearCache = clearCache;
 exports.collectSqlAllowListEntries = collectSqlAllowListEntries;
+exports.colorSql = colorSql;
 exports.compileSqlAllowList = compileSqlAllowList;
 exports.convertForRequestBody = convertForRequestBody;
 exports.convertHexIfBinary = convertHexIfBinary;
@@ -3781,7 +3927,9 @@ exports.distSphere = distSphere;
 exports.error = error;
 exports.extractSqlEntries = extractSqlEntries;
 exports.fieldEq = fieldEq;
-exports.getEnvVar = getEnvVar;
+exports.getEnv = getEnv;
+exports.getEnvBool = getEnvBool;
+exports.getEnvDebug = getEnvDebug;
 exports.getPrimaryKeyTypes = getPrimaryKeyTypes;
 exports.group = group;
 exports.info = info;