@dascompany/database 4.2.3 → 4.2.5

package/dist/ConnectionFactory.d.ts

@@ -1,10 +1,4 @@
-import DatabaseConfig from "./DatabaseConfig";
-import Connection from "./Connection";
+import Connection from './Connection';
 export default class ConnectionFactory {
-    private static configName;
-    private static configField;
-    private static configPath;
-    private static pool;
     static createConnection(): Promise<Connection>;
-    protected static getDatabaseConfig(): Promise<DatabaseConfig>;
 }

package/dist/ConnectionFactory.js

@@ -1,23 +1,8 @@
-import Database from "./Database";
-import Connection from "./Connection";
-import { readFile } from 'fs/promises';
+import Connection from './Connection';
+import PoolConnection from './PoolConnection';
 export default class ConnectionFactory {
-    static configName = 'config.json';
-    static configField = 'database';
-    static configPath = './server/';
-    static pool;
     static async createConnection() {
-        const databaseConfig = await this.getDatabaseConfig();
-        if (!this.pool || await this.pool.query('SELECT 1').catch(() => false))
-            this.pool = await Database.connect(databaseConfig);
-        const client = await this.pool.connect();
+        const client = await PoolConnection.getClient();
         return new Connection(client);
     }
-    static async getDatabaseConfig() {
-        let config = JSON.parse(await readFile(`${this.configPath}${this.configName}`, "utf8"));
-        if (this.configField) {
-            config = config[this.configField];
-        }
-        return config;
-    }
 }

package/dist/Pool.d.ts

@@ -0,0 +1,2 @@
+import pg from 'pg';
+export declare function getPool(): Promise<pg.Pool>;

package/dist/Pool.js

@@ -0,0 +1,17 @@
+import Database from './Database';
+import { readFile } from 'fs/promises';
+let pool = null;
+let poolPromise = null;
+export async function getPool() {
+    if (pool)
+        return pool;
+    if (!poolPromise) {
+        poolPromise = (async () => {
+            const raw = await readFile('./server/config.json', 'utf8');
+            const config = JSON.parse(raw).database;
+            return Database.connect(config);
+        })();
+    }
+    pool = await poolPromise;
+    return pool;
+}

package/dist/PoolConnection.d.ts

@@ -0,0 +1,13 @@
+import { PoolClient } from 'pg';
+export default class PoolConnection {
+    private static pool;
+    private static poolPromise;
+    private static readonly configName;
+    private static readonly configField;
+    private static readonly configPath;
+    static getClient(): Promise<PoolClient>;
+    private static getPool;
+    private static ensurePool;
+    private static init;
+    private static getDatabaseConfig;
+}

package/dist/PoolConnection.js

@@ -0,0 +1,36 @@
+import { readFile } from 'fs/promises';
+import Database from './Database';
+export default class PoolConnection {
+    static pool;
+    static poolPromise;
+    static configName = 'config.json';
+    static configField = 'database';
+    static configPath = './server/';
+    static async getClient() {
+        const pool = await this.getPool();
+        return pool.connect();
+    }
+    static async getPool() {
+        if (this.pool) {
+            return this.pool;
+        }
+        return this.pool = await this.ensurePool();
+    }
+    static async ensurePool() {
+        if (!this.poolPromise) {
+            this.poolPromise = this.init();
+        }
+        return this.poolPromise;
+    }
+    static async init() {
+        const config = await this.getDatabaseConfig();
+        return Database.connect(config);
+    }
+    static async getDatabaseConfig() {
+        let config = JSON.parse(await readFile(`${this.configPath}${this.configName}`, "utf8"));
+        if (this.configField) {
+            config = config[this.configField];
+        }
+        return config;
+    }
+}

package/dist/query/QueryOptions.d.ts

@@ -3,13 +3,11 @@ import OrderByI from "../types/OrderByI";
 import WhereOptionI from "../types/WhereOptionI";
 import ParameterI from "../types/ParameterI";
 import ConnectorE from "../types/ConnectorE";
-import QueryOptionsI from "../types/QueryOptionsI";
 export default class QueryOptions {
     private where;
     private orderBy;
     private limit;
     constructor();
-    static create(data: QueryOptionsI): QueryOptions;
     getWhere(): WhereOptionI | null;
     getOrderBy(): OrderByI[] | null;
     getLimit(): ResultLimitationI | null;

package/dist/query/QueryOptions.js

@@ -1,4 +1,4 @@
-import ConnectorE, { getFromValue } from "../types/ConnectorE";
+import ConnectorE from "../types/ConnectorE";
 export default class QueryOptions {
     where;
     orderBy;
@@ -8,20 +8,6 @@ export default class QueryOptions {
         this.orderBy = null;
         this.limit = null;
     }
-    static create(data) {
-        const queryOptions = new QueryOptions();
-        if (data.where) {
-            const connector = data.where.connector ? getFromValue(data.where.connector) : ConnectorE.and;
-            queryOptions.setWhere(data.where.parameters, connector);
-        }
-        if (data.orderBy) {
-            queryOptions.setOrderBy(data.orderBy);
-        }
-        if (data.limit) {
-            queryOptions.setLimit(data.limit.limit, data.limit.offset);
-        }
-        return queryOptions;
-    }
     getWhere() {
         return this.where;
     }

package/dist/query/QueryParams.js

@@ -31,8 +31,9 @@ export default class QueryParams {
     }
     static createOrderParams(sql, orderBy) {
         let sqlString = `ORDER BY `;
-        orderBy.forEach(item => {
-            sqlString += `${item.key} ${item.order} `;
+        orderBy.forEach((item, i) => {
+            sqlString += `${item.key} ${item.order}`;
+            sqlString += orderBy.length - 1 !== i ? ', ' : ' ';
         });
         sql = `${sql} ${sqlString}`;
         return sql;

package/dist/types/ConnectorE.d.ts

@@ -2,6 +2,4 @@ declare enum ConnectorE {
     or = "OR ",
     and = "AND "
 }
-declare function getFromValue(value: string): ConnectorE;
 export default ConnectorE;
-export { getFromValue };

package/dist/types/ConnectorE.js

@@ -3,14 +3,4 @@ var ConnectorE;
     ConnectorE["or"] = "OR ";
     ConnectorE["and"] = "AND ";
 })(ConnectorE || (ConnectorE = {}));
-function getFromValue(value) {
-    switch (value) {
-        case "OR ":
-            return ConnectorE.or;
-        case "AND ":
-        default:
-            return ConnectorE.and;
-    }
-}
 export default ConnectorE;
-export { getFromValue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/database",
-  "version": "4.2.3",
+  "version": "4.2.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/dist/types/QueryOptionsConfig.d.ts

@@ -1,13 +0,0 @@
-import OrderByI from "./OrderByI";
-import ParameterI from "./ParameterI";
-export default interface QueryOptionsConfig {
-    where: {
-        connector: string;
-        parameters: ParameterI[];
-    };
-    orderBy: OrderByI[];
-    limit: {
-        limit: number;
-        offset: number;
-    };
-}

package/dist/types/QueryOptionsConfig.js

@@ -1 +0,0 @@
-export {};