af-db-ts 2.0.73 → 2.0.75

package/dist/cjs/src/ms/query-ms.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryMs = void 0;
 const sql = __importStar(require("mssql"));
+const af_color_1 = require("af-color");
 const common_1 = require("../common");
 const pool_ms_1 = require("./pool-ms");
 const queryMs = async (connectionId, sqlText, throwError, prefix) => {
@@ -35,9 +36,17 @@ const queryMs = async (connectionId, sqlText, throwError, prefix) => {
             return;
         }
         const request = new sql.Request(pool);
-        return request.query(sqlText);
+        // noinspection UnnecessaryLocalVariableJS
+        const result = await request.query(sqlText);
+        return result;
     }
     catch (err) {
+        const { lineNumber } = err || {};
+        if (lineNumber) {
+            const sqlTextLines = sqlText.replace(/\r\n/, '\n').split(/\n/);
+            sqlTextLines[lineNumber - 1] = af_color_1.bg.yellow + sqlTextLines[lineNumber - 1] + af_color_1.rs + af_color_1.magenta;
+            sqlText = sqlTextLines.join('\n');
+        }
         (0, common_1.logSqlError)(err, !throwError, sqlText, prefix);
     }
 };

package/dist/cjs/src/ms/query-ms.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-ms.js","sourceRoot":"","sources":["../../../../src/ms/query-ms.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA6B;AAC7B,sCAAwC;AACxC,uCAA4D;AAErD,MAAM,OAAO,GAAG,KAAK,EAC1B,YAAoB,EACpB,OAAe,EACf,UAAoB,EACpB,MAAe,EACqC,EAAE;IACtD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAA,mBAAS,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,EAAE,SAAS,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC;YAC1C,MAAM,IAAA,8BAAoB,EAAC,YAAY,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,oBAAW,EAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC,CAAC;AAjBW,QAAA,OAAO,WAiBlB"}
+{"version":3,"file":"query-ms.js","sourceRoot":"","sources":["../../../../src/ms/query-ms.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2CAA6B;AAC7B,uCAA2C;AAC3C,sCAAwC;AACxC,uCAA4D;AAErD,MAAM,OAAO,GAAG,KAAK,EAC1B,YAAoB,EACpB,OAAe,EACf,UAAoB,EACpB,MAAe,EACqC,EAAE;IACtD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAA,mBAAS,EAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,EAAE,SAAS,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC;YAC1C,MAAM,IAAA,8BAAoB,EAAC,YAAY,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,0CAA0C;QAC1C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,GAAgB,EAAE,CAAC;QAC1B,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,IAAI,EAAE,CAAC;QACjC,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/D,YAAY,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,aAAE,CAAC,MAAM,GAAG,YAAY,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,aAAE,GAAG,kBAAO,CAAC;YACvF,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,IAAA,oBAAW,EAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC,CAAC;AAzBW,QAAA,OAAO,WAyBlB"}

package/dist/esm/src/ms/query-ms.js

@@ -1,4 +1,5 @@
 import * as sql from 'mssql';
+import { bg, magenta, rs } from 'af-color';
 import { logSqlError } from '../common';
 import { closeDbConnectionsMs, getPoolMs } from './pool-ms';
 export const queryMs = async (connectionId, sqlText, throwError, prefix) => {
@@ -9,9 +10,17 @@ export const queryMs = async (connectionId, sqlText, throwError, prefix) => {
             return;
         }
         const request = new sql.Request(pool);
-        return request.query(sqlText);
+        // noinspection UnnecessaryLocalVariableJS
+        const result = await request.query(sqlText);
+        return result;
     }
     catch (err) {
+        const { lineNumber } = err || {};
+        if (lineNumber) {
+            const sqlTextLines = sqlText.replace(/\r\n/, '\n').split(/\n/);
+            sqlTextLines[lineNumber - 1] = bg.yellow + sqlTextLines[lineNumber - 1] + rs + magenta;
+            sqlText = sqlTextLines.join('\n');
+        }
         logSqlError(err, !throwError, sqlText, prefix);
     }
 };

package/dist/esm/src/ms/query-ms.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-ms.js","sourceRoot":"","sources":["../../../../src/ms/query-ms.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE5D,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,YAAoB,EACpB,OAAe,EACf,UAAoB,EACpB,MAAe,EACqC,EAAE;IACtD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,EAAE,SAAS,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC;YAC1C,MAAM,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,WAAW,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"query-ms.js","sourceRoot":"","sources":["../../../../src/ms/query-ms.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE5D,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,YAAoB,EACpB,OAAe,EACf,UAAoB,EACpB,MAAe,EACqC,EAAE;IACtD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,EAAE,SAAS,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC;YAC1C,MAAM,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACzC,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,0CAA0C;QAC1C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,GAAgB,EAAE,CAAC;QAC1B,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,IAAI,EAAE,CAAC;QACjC,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/D,YAAY,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,YAAY,CAAC,UAAU,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;YACvF,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC;QACD,WAAW,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;AACH,CAAC,CAAC"}

package/dist/types/src/ms/query-ms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-ms.d.ts","sourceRoot":"","sources":["../../../../src/ms/query-ms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAKhC,eAAO,MAAM,OAAO,6CACJ,MAAM,WACX,MAAM,eACF,OAAO,WACX,MAAM,uDAahB,CAAC"}
+{"version":3,"file":"query-ms.d.ts","sourceRoot":"","sources":["../../../../src/ms/query-ms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAMhC,eAAO,MAAM,OAAO,6CACJ,MAAM,WACX,MAAM,eACF,OAAO,WACX,MAAM,uDAqBhB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "af-db-ts",
-  "version": "2.0.73",
+  "version": "2.0.75",
   "description": "A highly specialized function library",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",

package/src/ms/query-ms.ts

@@ -1,9 +1,10 @@
 import { IResult } from 'mssql';
 import * as sql from 'mssql';
+import { bg, magenta, rs } from 'af-color';
 import { logSqlError } from '../common';
 import { closeDbConnectionsMs, getPoolMs } from './pool-ms';
 
-export const queryMs = async <ColumnSetDescription = any>(
+export const queryMs = async <ColumnSetDescription = any> (
   connectionId: string,
   sqlText: string,
   throwError?: boolean,
@@ -16,8 +17,16 @@ export const queryMs = async <ColumnSetDescription = any>(
       return;
     }
     const request = new sql.Request(pool);
-    return request.query(sqlText);
-  } catch (err) {
+    // noinspection UnnecessaryLocalVariableJS
+    const result = await request.query(sqlText);
+    return result;
+  } catch (err: Error | any) {
+    const { lineNumber } = err || {};
+    if (lineNumber) {
+      const sqlTextLines = sqlText.replace(/\r\n/, '\n').split(/\n/);
+      sqlTextLines[lineNumber - 1] = bg.yellow + sqlTextLines[lineNumber - 1] + rs + magenta;
+      sqlText = sqlTextLines.join('\n');
+    }
     logSqlError(err, !throwError, sqlText, prefix);
   }
 };