@churchapps/apihelper 0.0.24 → 0.1.0
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.
- package/dist/helpers/DB.d.ts +2 -2
- package/dist/helpers/DB.d.ts.map +1 -1
- package/dist/helpers/DB.js.map +1 -1
- package/dist/helpers/Pool.d.ts +1 -1
- package/dist/helpers/Pool.d.ts.map +1 -1
- package/dist/helpers/Pool.js +2 -2
- package/dist/helpers/Pool.js.map +1 -1
- package/package.json +2 -3
- package/src/helpers/DB.ts +5 -5
- package/src/helpers/Pool.ts +2 -2
package/dist/helpers/DB.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { PoolConnection
|
|
1
|
+
import { PoolConnection } from "mysql2";
|
|
2
2
|
export declare class DB {
|
|
3
3
|
static getConnection(): Promise<PoolConnection>;
|
|
4
|
-
static getQuery(connection: PoolConnection, sql: string, params: any[]): Promise<
|
|
4
|
+
static getQuery(connection: PoolConnection, sql: string, params: any[]): Promise<any>;
|
|
5
5
|
static query(sql: string, params: any[]): Promise<any>;
|
|
6
6
|
static queryOne(sql: string, params: any[]): Promise<any>;
|
|
7
7
|
}
|
package/dist/helpers/DB.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DB.d.ts","sourceRoot":"","sources":["../../src/helpers/DB.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAc,
|
|
1
|
+
{"version":3,"file":"DB.d.ts","sourceRoot":"","sources":["../../src/helpers/DB.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAc,MAAM,QAAQ,CAAC;AAGpD,qBAAa,EAAE;WAGE,aAAa;WASb,QAAQ,CAAC,UAAU,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;WAWxD,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;WAShC,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE;CAI1D"}
|
package/dist/helpers/DB.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DB.js","sourceRoot":"","sources":["../../src/helpers/DB.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAE9B,mDAAgD;AAEhD,MAAa,EAAE;IAEX,mBAAmB;IACnB,MAAM,CAAC,KAAK,CAAC,aAAa;QACtB,MAAM,OAAO,GAA4B,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrE,WAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"DB.js","sourceRoot":"","sources":["../../src/helpers/DB.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAE9B,mDAAgD;AAEhD,MAAa,EAAE;IAEX,mBAAmB;IACnB,MAAM,CAAC,KAAK,CAAC,aAAa;QACtB,MAAM,OAAO,GAA4B,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrE,WAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAAqB,EAAE,IAAoB,EAAE,EAAE,GAAG,IAAI,EAAE;gBAAE,MAAM,CAAC,EAAE,CAAC,CAAC;;gBAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7H,CAAC,CAAC,CAAC;QAAA,CAAC;QACJ,MAAM,UAAU,GAAmB,MAAM,OAAO,CAAC;QACjD,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,mBAAmB;IACnB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAA0B,EAAE,GAAW,EAAE,MAAa;QACxE,MAAM,OAAO,GAAiB,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1D,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAqB,EAAE,IAAS,EAAE,EAAE;gBACrE,IAAI,EAAE,EAAE,CAAC;oBAAC,6BAAa,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;oBAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAAC,CAAC;qBACxD,CAAC;oBAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAAC,CAAC;YAC3B,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,GAAQ,MAAM,OAAO,CAAC;QACjC,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAW,EAAE,MAAa;QAChD,IAAI,MAAM,GAAQ,IAAI,CAAC;QACvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,IAAI,CAAC;YAAC,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAAC,CAAC;QAC9D,OAAO,EAAM,EAAE,CAAC;YAAC,6BAAa,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAAC,CAAC;gBAChD,CAAC;YAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAAC,CAAC;QACjC,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAW,EAAE,MAAa;QACnD,MAAM,MAAM,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChD,CAAC;CACJ;AApCD,gBAoCC"}
|
package/dist/helpers/Pool.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pool.d.ts","sourceRoot":"","sources":["../../src/helpers/Pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"Pool.d.ts","sourceRoot":"","sources":["../../src/helpers/Pool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,QAAQ,CAAC;AAK3B,qBAAa,IAAI;IACf,OAAc,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC;WAEpB,QAAQ;IA4BtB,OAAO,CAAC,MAAM,CAAC,SAAS,CAevB;CAEF"}
|
package/dist/helpers/Pool.js
CHANGED
|
@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Pool = void 0;
|
|
7
7
|
const dotenv_1 = __importDefault(require("dotenv"));
|
|
8
|
-
const
|
|
8
|
+
const mysql2_1 = __importDefault(require("mysql2"));
|
|
9
9
|
const _1 = require(".");
|
|
10
10
|
dotenv_1.default.config();
|
|
11
11
|
class Pool {
|
|
12
12
|
static initPool() {
|
|
13
13
|
const config = this.getConfig(_1.EnvironmentBase.connectionString);
|
|
14
|
-
Pool.current =
|
|
14
|
+
Pool.current = mysql2_1.default.createPool({
|
|
15
15
|
connectionLimit: 3,
|
|
16
16
|
host: config.host,
|
|
17
17
|
port: config.port,
|
package/dist/helpers/Pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pool.js","sourceRoot":"","sources":["../../src/helpers/Pool.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"Pool.js","sourceRoot":"","sources":["../../src/helpers/Pool.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,oDAA2B;AAC3B,wBAAoC;AAEpC,gBAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAa,IAAI;IAGR,MAAM,CAAC,QAAQ;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAe,CAAC,gBAAgB,CAAC,CAAC;QAEhE,IAAI,CAAC,OAAO,GAAG,gBAAK,CAAC,UAAU,CAAC;YAC9B,eAAe,EAAE,CAAC;YAClB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,IAAI,EAAE,MAAM,CAAC,QAAQ;YACrB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,kBAAkB,EAAE,IAAI;YACxB,kBAAkB,EAAE,IAAI;YACxB,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,SAAS;YAClB,QAAQ,EAAE,SAAS,SAAS,CAAC,KAAU,EAAE,qBAAgC;gBACvE,yBAAyB;gBACzB,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;oBACnD,IAAI,CAAC;wBACH,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;wBAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC1B,CAAC;oBAAC,MAAM,CAAC;wBAAC,OAAO,KAAK,CAAC;oBAAC,CAAC;gBAC3B,CAAC;gBACD,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC;YACnC,CAAC;SACF,CAAC,CAAC;IACL,CAAC;;AA5BH,oBAgDC;AAlBC,kBAAkB;AACH,cAAS,GAAG,CAAC,gBAAwB,EAAE,EAAE;IACtD,yCAAyC;IACzC,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE7B,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IACzB,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAErC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;AAErD,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@churchapps/apihelper",
|
|
3
|
-
"version": "0.0
|
|
3
|
+
"version": "0.1.0",
|
|
4
4
|
"description": "Library of helper functions not specific to any one ChurchApps project or framework.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"inversify-express-utils": "^6.5.0",
|
|
44
44
|
"jsonwebtoken": "^9.0.2",
|
|
45
45
|
"kind-of": "^6.0.3",
|
|
46
|
-
"
|
|
46
|
+
"mysql2": "^3.14.1",
|
|
47
47
|
"nodemailer": "^7.0.3",
|
|
48
48
|
"winston": "^3.17.0",
|
|
49
49
|
"winston-cloudwatch": "^6.3.0"
|
|
@@ -53,7 +53,6 @@
|
|
|
53
53
|
"@types/fs-extra": "^11.0.4",
|
|
54
54
|
"@types/jsonwebtoken": "^9.0.9",
|
|
55
55
|
"@types/kind-of": "^6.0.3",
|
|
56
|
-
"@types/mysql": "^2.15.27",
|
|
57
56
|
"@types/node": "^22.15.21",
|
|
58
57
|
"@types/nodemailer": "^6.4.17",
|
|
59
58
|
"@typescript-eslint/eslint-plugin": "^8.34.0",
|
package/src/helpers/DB.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Pool } from "./Pool";
|
|
2
|
-
import { PoolConnection,
|
|
2
|
+
import { PoolConnection, QueryError } from "mysql2";
|
|
3
3
|
import { LoggingHelper } from "./LoggingHelper";
|
|
4
4
|
|
|
5
5
|
export class DB {
|
|
@@ -7,7 +7,7 @@ export class DB {
|
|
|
7
7
|
// wraps in promise
|
|
8
8
|
static async getConnection() {
|
|
9
9
|
const promise: Promise<PoolConnection> = new Promise((resolve, reject) => {
|
|
10
|
-
Pool.current.getConnection((ex:
|
|
10
|
+
Pool.current.getConnection((ex: QueryError | null, conn: PoolConnection) => { if (ex) reject(ex); else resolve(conn); });
|
|
11
11
|
});;
|
|
12
12
|
const connection: PoolConnection = await promise;
|
|
13
13
|
return connection;
|
|
@@ -15,13 +15,13 @@ export class DB {
|
|
|
15
15
|
|
|
16
16
|
// wraps in promise
|
|
17
17
|
static async getQuery(connection: PoolConnection, sql: string, params: any[]) {
|
|
18
|
-
const promise: Promise<
|
|
19
|
-
connection.query(sql, params, async (ex, rows) => {
|
|
18
|
+
const promise: Promise<any> = new Promise((resolve, reject) => {
|
|
19
|
+
connection.query(sql, params, async (ex: QueryError | null, rows: any) => {
|
|
20
20
|
if (ex) { LoggingHelper.getCurrent().error(ex); reject(ex); }
|
|
21
21
|
else { resolve(rows); }
|
|
22
22
|
});
|
|
23
23
|
});
|
|
24
|
-
const query:
|
|
24
|
+
const query: any = await promise;
|
|
25
25
|
return query;
|
|
26
26
|
}
|
|
27
27
|
|
package/src/helpers/Pool.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import dotenv from "dotenv";
|
|
2
|
-
import mysql from "
|
|
2
|
+
import mysql from "mysql2";
|
|
3
3
|
import { EnvironmentBase } from ".";
|
|
4
4
|
|
|
5
5
|
dotenv.config();
|
|
@@ -21,7 +21,7 @@ export class Pool {
|
|
|
21
21
|
waitForConnections: true,
|
|
22
22
|
queueLimit: 9999,
|
|
23
23
|
charset: 'utf8mb4',
|
|
24
|
-
typeCast: function castField(field, useDefaultTypeCasting) {
|
|
24
|
+
typeCast: function castField(field: any, useDefaultTypeCasting: () => any) {
|
|
25
25
|
// convert bit(1) to bool
|
|
26
26
|
if ((field.type === "BIT") && (field.length === 1)) {
|
|
27
27
|
try {
|