@dascompany/database 2.0.0 → 2.1.1

package/dist/ConnectionFactory.d.ts

@@ -0,0 +1,14 @@
+import DatabaseConfig from "./DatabaseConfig";
+import Connection from "./Connection";
+export default class ConnectionFactory {
+    private static connections;
+    private static configName;
+    private static configField;
+    private static configPath;
+    private static defaultDatabaseName;
+    static create(name?: string): Promise<Connection>;
+    static isCreated(name?: string): boolean;
+    static get(name?: string): Connection;
+    private static createConnection;
+    protected static getDatabaseConfig(): Promise<DatabaseConfig>;
+}

package/dist/ConnectionFactory.js

@@ -0,0 +1,47 @@
+import Database from "./Database";
+import Connection from "./Connection";
+import { readFile } from 'fs/promises';
+export default class ConnectionFactory {
+    static connections = new Map();
+    static configName = 'config.json';
+    static configField = 'database';
+    static configPath = './server/';
+    static defaultDatabaseName = 'defaultDatabaseName';
+    static async create(name) {
+        name = name || this.defaultDatabaseName;
+        let connection = this.connections.get(name);
+        if (!connection) {
+            connection = await this.createConnection();
+            this.connections.set(name, connection);
+        }
+        else
+            throw new Error(`Connection for name: ${name} is already created! `);
+        return connection;
+    }
+    static isCreated(name) {
+        name = name || this.defaultDatabaseName;
+        let connection = this.connections.get(name);
+        if (!connection)
+            return false;
+        else
+            return true;
+    }
+    static get(name) {
+        name = name || this.defaultDatabaseName;
+        const connection = this.connections.get(name);
+        if (!connection)
+            throw new Error(`Connection with name: ${name} is not create! `);
+        return connection;
+    }
+    static async createConnection() {
+        const databaseConfig = await this.getDatabaseConfig();
+        const pgClient = await Database.connect(databaseConfig);
+        return new Connection(pgClient);
+    }
+    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/index.d.ts

@@ -1,4 +1,4 @@
-import DatabaseConnection from "./DatabaseConnection";
+import ConnectionFactory from "./ConnectionFactory";
 import StockObject from "./types/StockObject";
 import StockObjectMapper from "./types/StockObjectMapper";
 import Table from "./Table";
@@ -9,8 +9,8 @@ import ParameterI from './types/ParameterI';
 import QueryOptionsI from './types/QueryOptionsI';
 import ResultLimitationI from './types/ResultLimitationI';
 import Parameters from './utils/Parameters';
-import OrderByI from "./utils/OrderByI";
+import OrderByI from "./types/OrderByI";
 import QueryOptions from './query/QueryOptions';
 import ConnectorE from "./types/ConnectorE";
 import Connection from "./Connection";
-export { DatabaseConnection, StockObject, StockObjectMapper, Table, Query, ParameterType, ParameterFilter, ConnectorE, ParameterI, QueryOptionsI, ResultLimitationI, Parameters, OrderByI, QueryOptions, Connection };
+export { ConnectionFactory, StockObject, StockObjectMapper, Table, Query, ParameterType, ParameterFilter, ConnectorE, ParameterI, QueryOptionsI, ResultLimitationI, Parameters, OrderByI, QueryOptions, Connection };

package/dist/index.js

@@ -1,4 +1,4 @@
-import DatabaseConnection from "./DatabaseConnection";
+import ConnectionFactory from "./ConnectionFactory";
 import StockObject from "./types/StockObject";
 import Table from "./Table";
 import Query from "./query/Query";
@@ -7,4 +7,4 @@ import Parameters from './utils/Parameters';
 import QueryOptions from './query/QueryOptions';
 import ConnectorE from "./types/ConnectorE";
 import Connection from "./Connection";
-export { DatabaseConnection, StockObject, Table, Query, ParameterType, ConnectorE, Parameters, QueryOptions, Connection };
+export { ConnectionFactory, StockObject, Table, Query, ParameterType, ConnectorE, Parameters, QueryOptions, Connection };

package/dist/query/QueryOptions.d.ts

@@ -1,5 +1,5 @@
 import ResultLimitationI from "../types/ResultLimitationI";
-import OrderByI from "../utils/OrderByI";
+import OrderByI from "../types/OrderByI";
 export default class QueryOptions {
     static correctingSorting(querySortBy: any): OrderByI[];
     static correctingLimitation(queryLimit: any, queryOffset: any): ResultLimitationI;

package/dist/types/QueryOptionsI.d.ts

@@ -1,4 +1,4 @@
-import OrderByI from "../utils/OrderByI";
+import OrderByI from "./OrderByI";
 import ParameterI from "./ParameterI";
 import ResultLimitationI from "./ResultLimitationI";
 import WhereOptionI from "./WhereOptionI";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dascompany/database",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "main": "dist/index.js",
   "scripts": {
     "test": "vitest",
@@ -18,10 +18,10 @@
   "devDependencies": {
     "types": "^0.1.1",
     "typescript": "^5.7.3",
-    "vitest": "^3.0.2"
+    "vitest": "^3.0.6"
   },
   "dependencies": {
-    "@types/pg": "^8.11.10",
-    "pg": "^8.13.1"
+    "@types/pg": "^8.11.11",
+    "pg": "^8.13.3"
   }
 }

package/dist/DatabaseConnection.d.ts

@@ -1,11 +0,0 @@
-import DatabaseConfig from "./DatabaseConfig";
-import Connection from "./Connection";
-export default class DatabaseConnection {
-    private static connection;
-    private static configName;
-    private static configField;
-    private static configPath;
-    static get(): Connection;
-    static create(): Promise<Connection>;
-    static getDatabaseConfig(): Promise<DatabaseConfig>;
-}

package/dist/DatabaseConnection.js

@@ -1,28 +0,0 @@
-import Database from "./Database";
-import Connection from "./Connection";
-import { readFile } from 'fs/promises';
-export default class DatabaseConnection {
-    static connection;
-    static configName = 'config.json';
-    static configField = 'database';
-    static configPath = './server/';
-    static get() {
-        if (!this.connection)
-            throw Error('Connection not created!');
-        return this.connection;
-    }
-    static async create() {
-        if (!this.connection) {
-            const databaseConfig = await this.getDatabaseConfig();
-            const pgClient = await Database.connect(databaseConfig);
-            this.connection = new Connection(pgClient);
-        }
-        return this.connection;
-    }
-    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/utils/calculateNetToGrossPrice.d.ts

@@ -1 +0,0 @@
-export default function calculateNetToGrossPrice(netPrice: number, vatPercentage: number): number;

package/dist/utils/calculateNetToGrossPrice.js

@@ -1,7 +0,0 @@
-export default function calculateNetToGrossPrice(netPrice, vatPercentage) {
-    const netPriceInPenny = Math.round(netPrice * 100);
-    const vatPriceInPenny = Math.round((netPriceInPenny * vatPercentage) / 100);
-    const grossPriceInPenny = netPriceInPenny + vatPriceInPenny;
-    const grossPrice = (grossPriceInPenny / 100).toFixed(2);
-    return Number(grossPrice);
-}

package/dist/utils/correctPhoneNumber.d.ts

@@ -1 +0,0 @@
-export default function correctPhoneNumber(phoneNumber: any): string;

package/dist/utils/correctPhoneNumber.js

@@ -1,14 +0,0 @@
-export default function correctPhoneNumber(phoneNumber) {
-    let phoneStr = String(phoneNumber);
-    phoneStr = phoneStr.replaceAll(' ', '');
-    phoneStr = phoneStr.replaceAll('-', '');
-    if (phoneStr.startsWith('48') && phoneStr.length == 11)
-        phoneStr = `+${phoneStr}`;
-    else if (phoneStr.startsWith('+48') && phoneStr.length == 12)
-        phoneStr = phoneStr;
-    else if (phoneStr.length == 9)
-        phoneStr = `+48${phoneStr}`;
-    else
-        phoneStr = phoneStr;
-    return phoneStr;
-}