@nsshunt/stsdatamanagement 1.15.0 → 1.15.4

package/{databaseutils.js → databaseutils.ts}

@@ -1,38 +1,42 @@
-const prompts = require('prompts');
-require('colors');
-const goptions = require('@nsshunt/stsconfig').$options;
+const prompts = require('prompts')
 
-const { PGPoolManager } = require('./pgpoolmanager');
-const { PGAccessLayer } = require('./pgaccesslayer');
-const { PGUtils } = require('./pgutils');
-const { DataGenerator } = require('./datagenerator.js');
+import 'colors'
 
-class DatabaseUtils
+import { $Options } from '@nsshunt/stsconfig'
+const goptions = $Options()
+
+import { PGPoolManager } from './pgpoolmanager'
+import { PGAccessLayer } from './pgaccesslayer'
+import { PGUtils } from './pgutils'
+import { DataGenerator } from './datagenerator'
+
+import Debug from "debug";
+const debug = Debug(`proc:${process.pid}:DatabaseUtils`);
+
+export class DatabaseUtils
 {
-	#debug = null;
-	#ns = `proc:${process.pid}:DatabaseUtils`; // namespace for debug
-	#accessLayer = null;
+	private _accessLayer = null;
 
-	constructor(accessLayer)
+	constructor(accessLayer?: any)
 	{
-		this.#debug = require('debug')(this.#ns);
-		this.#accessLayer = accessLayer;
+		this._accessLayer = accessLayer;
 	}
 
 	// options ::= { start: <int>, entries: <int>, minextradata: <int>, maxextradata: <int>,
 	//		user: { name: <string>, password: <string>, email: <string> } }
 	CreateDatabase = async (options) =>
 	{
-		let fname = 'CreateDatabase';
+		const fname = 'CreateDatabase';
 		const { start, entries, minextradata, maxextradata } = options;
-		let builddbscript = `${goptions.databasescriptfolder}/builddb.sql`;
-		this.#debug(`Database Build Script: [${builddbscript}]`.yellow);
+		const builddbscript = `${goptions.databasescriptfolder}/builddb.sql`;
+		debug(`Database Build Script: [${builddbscript}]`.yellow);
 
+		let localAccesslayer = null;
 		try
 		{
 			try
 			{
-				this.#debug(`Dropping database.`.yellow);
+				debug(`Dropping database.`.yellow);
 				await PGUtils.dropdatabase();
 			} catch (error)
 			{
@@ -41,44 +45,47 @@ class DatabaseUtils
 			}
 
 			// Create a new empty database
-			this.#debug(`Creating new empty database.`.yellow);
+			debug(`Creating new empty database.`.yellow);
 			await PGUtils.createdatabase();
 
-			let localAccesslayer = new PGAccessLayer(new PGPoolManager());
+			localAccesslayer = new PGAccessLayer(new PGPoolManager());
 
 			// Build the database assets (tables, functions, etc.)
-			this.#debug(`Building database assets (tables, functions, etc.).`.yellow);
+			debug(`Building database assets (tables, functions, etc.).`.yellow);
 			await localAccesslayer.executedbscript(builddbscript);
 
 			//@@ make optional or move
 			if (typeof entries !== 'undefined') {
 				// Add new faker entries
-				this.#debug(`Adding test data.`.yellow);
-				let dg = new DataGenerator(localAccesslayer);
+				debug(`Adding test data.`.yellow);
+				const dg = new DataGenerator(localAccesslayer);
 				await dg.RunAddFakerBulkInsert(start, entries, minextradata, maxextradata);
 			}
 
-			await localAccesslayer.enddatabase();
-
 			//@@ double logging
-			this.#debug(`Database successfully initiailized.`.green);
+			debug(`Database successfully initiailized.`.green);
 			console.log(`Database successfully initiailized.`.green);
 		} catch (error)
 		{
 			console.error(`[${fname}]: Could not create fresh database: ${error}`);
-			this.#debug(`[${fname}]: Could not create fresh database: ${error}`);
+			debug(`[${fname}]: Could not create fresh database: ${error}`);
+		} finally {
+			if (localAccesslayer !== null) {
+				await localAccesslayer.enddatabase();
+			}
 		}
+
 	};
 
 	ResourceCount = async () =>
 	{
-		let retVal = await this.#accessLayer.getResourceCount();
+		const retVal = await this._accessLayer.getResourceCount();
 		return retVal;
 	};
 
 	ExecuteDatabaseScript = async (scriptfile) =>
 	{
-		let retVal = await this.#accessLayer.executedbscript(scriptfile);
+		const retVal = await this._accessLayer.executedbscript(scriptfile);
 		return retVal;
 	};
 
@@ -93,5 +100,3 @@ class DatabaseUtils
 		return this.ExecuteDatabaseScript(response.script);
 	};
 }
-
-module.exports = { DatabaseUtils };

package/{datagenerator.js → datagenerator.ts}

@@ -1,31 +1,35 @@
 // https://medium.com/netscape/a-guide-to-create-a-nodejs-command-line-package-c2166ad0452e
 // https://developer.okta.com/blog/2019/06/18/command-line-app-with-nodejs
-const goptions = require('@nsshunt/stsconfig').$options;
+import { $Options } from '@nsshunt/stsconfig'
+const goptions = $Options()
 
-let path = require('path');
+const path = require('path');
 global.appRoot = path.resolve(__dirname);
 
 const axios = require('axios');
 const cliProgress = require('cli-progress');
-var colors = require('colors');
+
+import colors from 'colors';
+
 const prompts = require('prompts');
 const { Worker } = require('worker_threads');
-const { Sleep } = require('@nsshunt/stsutils');
+
+import { Sleep } from '@nsshunt/stsutils';
 
 const userid = 'dbinitrunner';
 const resrandomuserprefix = 'RESRU-';
 
-class DataGenerator
+import Debug from "debug";
+const debug = Debug(`proc:${process.pid}:DataGenerator`);
+
+export class DataGenerator
 {
-	#debug = null;
-	#ns = `proc:${process.pid}:DataGenerator`; // namespace for debug
-	#accessLayer = null;
-	#useMultiBar = false;
+	private _accessLayer = null;
+	private _useMultiBar = false;
 
 	constructor(accessLayer)
 	{
-		this.#debug = require('debug')(this.#ns);
-		this.#accessLayer = accessLayer;
+		this._accessLayer = accessLayer;
 	}
 	
 	//@@ JSON to come from config file if bound to a K6 script - so each K6 script should also have a prompts JSON for configuration - make generic
@@ -83,9 +87,9 @@ class DataGenerator
 
 		for (let i=0; i < iterations; i++)
 		{
-			let pp = async() =>
+			const pp = async() =>
 			{
-				let retVal = await axios.get(`https://randomuser.me/api/?results=${blocksize}&nat=au,nz,us,gb`).catch(error => 
+				const retVal = await axios.get(`https://randomuser.me/api/?results=${blocksize}&nat=au,nz,us,gb`).catch(error => 
 				{
 					console.error(`Error in randomuser get: ${error}`);
 					if (error.response) {
@@ -107,11 +111,11 @@ class DataGenerator
 					console.error('Skipping this test as we cannot control the randomuser service.');
 					return;
 				}
-				let randomusers = retVal.data.results;
-				let allPromises = randomusers.map(async data => {
+				const randomusers = retVal.data.results;
+				const allPromises = randomusers.map(async data => {
 					totalDataSize += JSON.stringify(data).length;
-					let id = resrandomuserprefix + uuidv4();
-					await this.#accessLayer.createResource(userid, id, data);
+					const id = resrandomuserprefix + uuidv4();
+					await this._accessLayer.createResource(userid, id, data);
 					b1.increment({ totalDataSize: totalDataSize });
 				});
 				await Promise.all(allPromises); 
@@ -165,7 +169,7 @@ class DataGenerator
 	RunAddFakerBulkInsert = async(start, iterations, datamin, datamax) =>
 	{
 		let multibar = null;
-		if (this.#useMultiBar === true) {
+		if (this._useMultiBar === true) {
 			multibar = new cliProgress.MultiBar({
 				format: 'Faker |' + colors.cyan('{bar}') + '| {percentage}% || {value}/{total} Iterations || Avg Size: {avgDataSize} || Size: {totalDataSize} || Duration: {duration_formatted} || ETA: {eta_formatted}',
 				clearOnComplete: false,
@@ -174,22 +178,22 @@ class DataGenerator
 		}
 
 
-		let pa = [ ];
-		let numCPUs = goptions.useCPUs;
+		const pa = [ ];
+		const numCPUs = goptions.useCPUs;
 		//let numCPUs = require('os').cpus().length;
-		let blocksize = Math.floor(iterations / numCPUs);
-		let lastBlockSize = blocksize + (iterations % numCPUs);
+		const blocksize = Math.floor(iterations / numCPUs);
+		const lastBlockSize = blocksize + (iterations % numCPUs);
 
 		let count = 0;
 		if (start === -1)
 		{
-			let countresult = await this.#accessLayer.getResourceCount(`r.resname like 'RESFK-%'`);
+			const countresult = await this._accessLayer.getResourceCount(`r.resname like 'RESFK-%'`);
 			count = Number(countresult.detail.count);
 		} else {
 			count = start;
 		}
 
-		let bars = [ ];
+		const bars = [ ];
 		for (let i=0; i < numCPUs; i++)
 		{
 			const iterations = (i === numCPUs-1 ? lastBlockSize : blocksize); 
@@ -198,7 +202,7 @@ class DataGenerator
 				bar = multibar.create(iterations, 0);
 			}
 			if (typeof bar === 'undefined') {
-				this.#debug(this.#ns, `No TTY available for multi-bar progress.`.yellow);
+				debug(`No TTY available for multi-bar progress.`.yellow);
 				bar = null;
 			}
 			bars.push(bar);
@@ -206,27 +210,22 @@ class DataGenerator
 		}
 		await Promise.all(pa);
 
-		if (this.#useMultiBar === true) {
+		if (this._useMultiBar === true) {
 			multibar.stop();
 		}
 	};
 
 	StartWorkerThread = (start, iterations, datamin, datamax, bar) =>
 	{
-		this.#debug(this.#ns, `Starting worker thread.`.yellow);
 		return new Promise((resolve, reject) =>
 		{
 			const worker = new Worker(`${goptions.databasescriptfolder}/cliworker.js`, {
 				workerData: { start: start, iterations: iterations, datamin: datamin, datamax: datamax }
 			});
 
-			//this.#debug(this.#ns, `Worker: [${worker.process.pid}] thread started.`.yellow);
-			
 			worker.on('message', (data) => {
-				//this.#debug(this.#ns, `Received message [${data.command}] worker thread.`.grey);
 				if (data.command === 'done')
 				{
-					//this.#debug(this.#ns, `Terminating worker thread [${worker.process.pid}].`.yellow);
 					worker.terminate();
 					resolve(data.data);
 				} else
@@ -238,18 +237,13 @@ class DataGenerator
 			});
 			
 			worker.on('error', (error) => {
-				//this.#debug(this.#ns, `Worker [${worker.process.pid}] error: ${error}.`.red);
 				reject(error);
 			});
 			worker.on('exit', (code) => {
-				//this.#debug(this.#ns, `Worker [${worker.process.pid}] exiting. Exit code: ${code}.`.green);
 				if (code !== 0) {
-					//this.#debug(this.#ns, `Worker [${worker.process.pid}] exited in a non success state. Exit code: ${code}.`.red);
 					reject(new Error(`Worker stopped with exit code ${code}`));
 				}
 			});
 		});
 	};
 }
-
-module.exports = { DataGenerator };

package/db-scripts/{cliworker.js → cliworker.ts}

@@ -1,21 +1,23 @@
 //let faker = require('faker');
 const { parentPort, workerData } = require('worker_threads');
-let crypto = require('crypto');
-const { PGPoolManager } = require('./../pgpoolmanager.js');
-const { PGAccessLayer } = require('./../pgaccesslayer.js');
+const crypto = require('crypto');
+
+import { PGPoolManager } from './../pgpoolmanager'
+import { PGAccessLayer } from './../pgaccesslayer'
 
 const userid = 'dbinitrunner';
 const resfakerprefix = 'RESFK-';
 const rescopyprefix = 'RESCP-';
 
-let { start, iterations, datamin, datamax } = workerData;
+const { start, iterations, datamin } = workerData;
+let { datamax } = workerData;
 
 let fakerdataarray = [ ];
 let fakerdataarray2 = [ ];
 let count = start;
 let totalDataSize = 0;
 let avgDataSize = 0;
-let copybatchsize = 250;
+const copybatchsize = 250;
 
 (async () =>
 {
@@ -31,29 +33,29 @@ let copybatchsize = 250;
 		
 		const coreRecordSizeRange = crypto.randomInt(128, 192);
 		const coreRecordSize = Math.floor(coreRecordSizeRange / 2);
-		let randcard = crypto.randomBytes(coreRecordSize).toString('hex');
+		const randcard = crypto.randomBytes(coreRecordSize).toString('hex');
 
 		if (datamax > 0)
 		{
 			const n = crypto.randomInt(datamin, datamax);
 			const n2 = Math.floor(n / 2);
-			let rndid = crypto.randomBytes(n2).toString('hex');
+			const rndid = crypto.randomBytes(n2).toString('hex');
 			randcard.extradata = rndid;
 		}
 
-		let randcardstring = JSON.stringify(randcard);
+		const randcardstring = JSON.stringify(randcard);
 
 		totalDataSize += randcardstring.length;
 		avgDataSize = Math.floor(totalDataSize / (i+1));
 
-		let pn = ('' + count++).padStart(10, '0');
-		let id = resfakerprefix + pn;
-		let cpid = rescopyprefix + pn;
+		const pn = ('' + count++).padStart(10, '0');
+		const id = resfakerprefix + pn;
+		const cpid = rescopyprefix + pn;
 
-		let datanow = new Date().toISOString();
+		const datanow = new Date().toISOString();
 		//let datanow = new Date().toUTCString();
 
-		let fakerdata = 
+		const fakerdata = 
         { 
         	//oid: i
         	resname: id
@@ -66,7 +68,7 @@ let copybatchsize = 250;
         };
 
 		fakerdataarray.push(fakerdata);
-		let fakerdata2 = Object.assign({}, fakerdata);
+		const fakerdata2 = Object.assign({}, fakerdata);
 		fakerdata2.resname = cpid;
 		fakerdataarray2.push(fakerdata2);
 

package/dbaccess.js

@@ -1,5 +1,4 @@
 const { PGPoolManager } = require('./pgpoolmanager');
-const { L1Cache } = require('./l1cache');
 const { PGAccessLayer } = require('./pgaccesslayer');
 const { PGUtils } = require('./pgutils');
 const { DatabaseUtils } = require('./databaseutils');
@@ -12,7 +11,7 @@ const {
 
 module.exports = { 
 	// Utilities and Helpers
-	PGPoolManager, L1Cache, PGAccessLayer, PGUtils, DatabaseUtils, DataGenerator,
+	PGPoolManager, PGAccessLayer, PGUtils, DatabaseUtils, DataGenerator,
 	// Errors
 	STSDataManagementError, STSResourceNotFoundError, STSResourceMalformedError, 
 	STSDatabaseAccessError, STSInvalidCredentials, STSNotAuthorized,

package/{dberrors.js → dberrors.ts}

@@ -1,7 +1,10 @@
 import { StatusCodes } from 'http-status-codes';
 
 // https://rclayton.silvrback.com/custom-errors-in-node-js
-class STSDataManagementError extends Error {
+export class STSDataManagementError extends Error {
+	detail: any = null;
+	status: StatusCodes = StatusCodes.INTERNAL_SERVER_ERROR;
+
 	constructor(message) {
 		super(message);
 
@@ -12,13 +15,10 @@ class STSDataManagementError extends Error {
 		// It's not absolutely essential, but it does make the stack trace a little nicer.
 		//  @see Node.js reference (bottom)
 		Error.captureStackTrace(this, this.constructor);
-
-		this.detail = null;
-		this.status = StatusCodes.INTERNAL_SERVER_ERROR;
 	}
 }
 
-class STSResourceNotFoundError extends STSDataManagementError {
+export class STSResourceNotFoundError extends STSDataManagementError {
 	constructor(resource, resourceId) {
 		super(`Resource [${resource}] not found using ID: [${resourceId}]`);
 		this.detail = { 
@@ -29,7 +29,7 @@ class STSResourceNotFoundError extends STSDataManagementError {
 	}
 }
 
-class STSResourceMalformedError extends STSDataManagementError {
+export class STSResourceMalformedError extends STSDataManagementError {
 	constructor(resource, resourceId, resourceRaw, error, extraDetail) {
 		super(`Resource [${resource}:${resourceId}] is malformed.`);
 		this.detail = { 
@@ -43,7 +43,7 @@ class STSResourceMalformedError extends STSDataManagementError {
 	}
 }
 
-class STSDatabaseAccessError extends STSDataManagementError {
+export class STSDatabaseAccessError extends STSDataManagementError {
 	constructor(resource, resourceId, error) {
 		super(`Database access error reading resource: [${resource}:${resourceId}]`);
 		this.detail = { 
@@ -55,7 +55,7 @@ class STSDatabaseAccessError extends STSDataManagementError {
 	}
 }
 
-class STSInvalidCredentials extends STSDataManagementError {
+export class STSInvalidCredentials extends STSDataManagementError {
 	constructor(resource, resourceId) {
 		super(`Invalid credentials for resource: [${resource}:${resourceId}]`);
 		this.detail = { 
@@ -66,7 +66,7 @@ class STSInvalidCredentials extends STSDataManagementError {
 	}
 }
 
-class STSNotAuthorized extends STSDataManagementError {
+export class STSNotAuthorized extends STSDataManagementError {
 	constructor(clientId, audience) {
 		super(`Not Authorized: [${clientId}:${audience}]`);
 		this.detail = { 
@@ -76,8 +76,3 @@ class STSNotAuthorized extends STSDataManagementError {
 		this.status = StatusCodes.INTERNAL_SERVER_ERROR;
 	}
 }
-
-module.exports = {
-	STSDataManagementError, STSResourceNotFoundError, STSResourceMalformedError, 
-	STSDatabaseAccessError, STSInvalidCredentials, STSNotAuthorized
-}

package/dist/databaseutils.js

@@ -1,3 +1,4 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -7,76 +8,75 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _DatabaseUtils_debug, _DatabaseUtils_ns, _DatabaseUtils_accessLayer;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DatabaseUtils = void 0;
 const prompts = require('prompts');
-require('colors');
-const goptions = require('@nsshunt/stsconfig').$options;
-const { PGPoolManager } = require('./pgpoolmanager');
-const { PGAccessLayer } = require('./pgaccesslayer');
-const { PGUtils } = require('./pgutils');
-const { DataGenerator } = require('./datagenerator.js');
+require("colors");
+const stsconfig_1 = require("@nsshunt/stsconfig");
+const goptions = (0, stsconfig_1.$Options)();
+const pgpoolmanager_1 = require("./pgpoolmanager");
+const pgaccesslayer_1 = require("./pgaccesslayer");
+const pgutils_1 = require("./pgutils");
+const datagenerator_1 = require("./datagenerator");
+const debug_1 = __importDefault(require("debug"));
+const debug = (0, debug_1.default)(`proc:${process.pid}:DatabaseUtils`);
 class DatabaseUtils {
     constructor(accessLayer) {
-        _DatabaseUtils_debug.set(this, null);
-        _DatabaseUtils_ns.set(this, `proc:${process.pid}:DatabaseUtils`); // namespace for debug
-        _DatabaseUtils_accessLayer.set(this, null);
+        this._accessLayer = null;
         // options ::= { start: <int>, entries: <int>, minextradata: <int>, maxextradata: <int>,
         //		user: { name: <string>, password: <string>, email: <string> } }
         this.CreateDatabase = (options) => __awaiter(this, void 0, void 0, function* () {
-            let fname = 'CreateDatabase';
+            const fname = 'CreateDatabase';
             const { start, entries, minextradata, maxextradata } = options;
-            let builddbscript = `${goptions.databasescriptfolder}/builddb.sql`;
-            __classPrivateFieldGet(this, _DatabaseUtils_debug, "f").call(this, `Database Build Script: [${builddbscript}]`.yellow);
+            const builddbscript = `${goptions.databasescriptfolder}/builddb.sql`;
+            debug(`Database Build Script: [${builddbscript}]`.yellow);
+            let localAccesslayer = null;
             try {
                 try {
-                    __classPrivateFieldGet(this, _DatabaseUtils_debug, "f").call(this, `Dropping database.`.yellow);
-                    yield PGUtils.dropdatabase();
+                    debug(`Dropping database.`.yellow);
+                    yield pgutils_1.PGUtils.dropdatabase();
                 }
                 catch (error) {
                     console.error(`[${fname}]: Could not drop database: ${error}`);
                     // Do not re-throw. If there is no initial database, this will throw an error, ignore this.
                 }
                 // Create a new empty database
-                __classPrivateFieldGet(this, _DatabaseUtils_debug, "f").call(this, `Creating new empty database.`.yellow);
-                yield PGUtils.createdatabase();
-                let localAccesslayer = new PGAccessLayer(new PGPoolManager());
+                debug(`Creating new empty database.`.yellow);
+                yield pgutils_1.PGUtils.createdatabase();
+                localAccesslayer = new pgaccesslayer_1.PGAccessLayer(new pgpoolmanager_1.PGPoolManager());
                 // Build the database assets (tables, functions, etc.)
-                __classPrivateFieldGet(this, _DatabaseUtils_debug, "f").call(this, `Building database assets (tables, functions, etc.).`.yellow);
+                debug(`Building database assets (tables, functions, etc.).`.yellow);
                 yield localAccesslayer.executedbscript(builddbscript);
                 //@@ make optional or move
                 if (typeof entries !== 'undefined') {
                     // Add new faker entries
-                    __classPrivateFieldGet(this, _DatabaseUtils_debug, "f").call(this, `Adding test data.`.yellow);
-                    let dg = new DataGenerator(localAccesslayer);
+                    debug(`Adding test data.`.yellow);
+                    const dg = new datagenerator_1.DataGenerator(localAccesslayer);
                     yield dg.RunAddFakerBulkInsert(start, entries, minextradata, maxextradata);
                 }
-                yield localAccesslayer.enddatabase();
                 //@@ double logging
-                __classPrivateFieldGet(this, _DatabaseUtils_debug, "f").call(this, `Database successfully initiailized.`.green);
+                debug(`Database successfully initiailized.`.green);
                 console.log(`Database successfully initiailized.`.green);
             }
             catch (error) {
                 console.error(`[${fname}]: Could not create fresh database: ${error}`);
-                __classPrivateFieldGet(this, _DatabaseUtils_debug, "f").call(this, `[${fname}]: Could not create fresh database: ${error}`);
+                debug(`[${fname}]: Could not create fresh database: ${error}`);
+            }
+            finally {
+                if (localAccesslayer !== null) {
+                    yield localAccesslayer.enddatabase();
+                }
             }
         });
         this.ResourceCount = () => __awaiter(this, void 0, void 0, function* () {
-            let retVal = yield __classPrivateFieldGet(this, _DatabaseUtils_accessLayer, "f").getResourceCount();
+            const retVal = yield this._accessLayer.getResourceCount();
             return retVal;
         });
         this.ExecuteDatabaseScript = (scriptfile) => __awaiter(this, void 0, void 0, function* () {
-            let retVal = yield __classPrivateFieldGet(this, _DatabaseUtils_accessLayer, "f").executedbscript(scriptfile);
+            const retVal = yield this._accessLayer.executedbscript(scriptfile);
             return retVal;
         });
         this.ExecutedCustomScript = () => __awaiter(this, void 0, void 0, function* () {
@@ -88,10 +88,8 @@ class DatabaseUtils {
             });
             return this.ExecuteDatabaseScript(response.script);
         });
-        __classPrivateFieldSet(this, _DatabaseUtils_debug, require('debug')(__classPrivateFieldGet(this, _DatabaseUtils_ns, "f")), "f");
-        __classPrivateFieldSet(this, _DatabaseUtils_accessLayer, accessLayer, "f");
+        this._accessLayer = accessLayer;
     }
 }
-_DatabaseUtils_debug = new WeakMap(), _DatabaseUtils_ns = new WeakMap(), _DatabaseUtils_accessLayer = new WeakMap();
-module.exports = { DatabaseUtils };
+exports.DatabaseUtils = DatabaseUtils;
 //# sourceMappingURL=databaseutils.js.map

package/dist/databaseutils.js.map

@@ -1 +1 @@
-{"version":3,"file":"databaseutils.js","sourceRoot":"","sources":["../databaseutils.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAClB,MAAM,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC;AAExD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACrD,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACrD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACzC,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAExD,MAAM,aAAa;IAMlB,YAAY,WAAW;QAJvB,+BAAS,IAAI,EAAC;QACd,4BAAM,QAAQ,OAAO,CAAC,GAAG,gBAAgB,EAAC,CAAC,sBAAsB;QACjE,qCAAe,IAAI,EAAC;QAQpB,wFAAwF;QACxF,mEAAmE;QACnE,mBAAc,GAAG,CAAO,OAAO,EAAE,EAAE;YAElC,IAAI,KAAK,GAAG,gBAAgB,CAAC;YAC7B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;YAC/D,IAAI,aAAa,GAAG,GAAG,QAAQ,CAAC,oBAAoB,cAAc,CAAC;YACnE,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,2BAA2B,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC;YAEhE,IACA;gBACC,IACA;oBACC,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,oBAAoB,CAAC,MAAM,CAAC,CAAC;oBACzC,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;iBAC7B;gBAAC,OAAO,KAAK,EACd;oBACC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,+BAA+B,KAAK,EAAE,CAAC,CAAC;oBAC/D,2FAA2F;iBAC3F;gBAED,8BAA8B;gBAC9B,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,8BAA8B,CAAC,MAAM,CAAC,CAAC;gBACnD,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC;gBAE/B,IAAI,gBAAgB,GAAG,IAAI,aAAa,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;gBAE9D,sDAAsD;gBACtD,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,qDAAqD,CAAC,MAAM,CAAC,CAAC;gBAC1E,MAAM,gBAAgB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;gBAEtD,0BAA0B;gBAC1B,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;oBACnC,wBAAwB;oBACxB,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,mBAAmB,CAAC,MAAM,CAAC,CAAC;oBACxC,IAAI,EAAE,GAAG,IAAI,aAAa,CAAC,gBAAgB,CAAC,CAAC;oBAC7C,MAAM,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;iBAC3E;gBAED,MAAM,gBAAgB,CAAC,WAAW,EAAE,CAAC;gBAErC,mBAAmB;gBACnB,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,qCAAqC,CAAC,KAAK,CAAC,CAAC;gBACzD,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,KAAK,CAAC,CAAC;aACzD;YAAC,OAAO,KAAK,EACd;gBACC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,uCAAuC,KAAK,EAAE,CAAC,CAAC;gBACvE,uBAAA,IAAI,4BAAO,MAAX,IAAI,EAAQ,IAAI,KAAK,uCAAuC,KAAK,EAAE,CAAC,CAAC;aACrE;QACF,CAAC,CAAA,CAAC;QAEF,kBAAa,GAAG,GAAS,EAAE;YAE1B,IAAI,MAAM,GAAG,MAAM,uBAAA,IAAI,kCAAa,CAAC,gBAAgB,EAAE,CAAC;YACxD,OAAO,MAAM,CAAC;QACf,CAAC,CAAA,CAAC;QAEF,0BAAqB,GAAG,CAAO,UAAU,EAAE,EAAE;YAE5C,IAAI,MAAM,GAAG,MAAM,uBAAA,IAAI,kCAAa,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACjE,OAAO,MAAM,CAAC;QACf,CAAC,CAAA,CAAC;QAEF,yBAAoB,GAAG,GAAS,EAAE;YAEjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;gBAC9B,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,wCAAwC;gBACjD,OAAO,EAAE,4BAA4B;aACrC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC,CAAA,CAAC;QA5ED,uBAAA,IAAI,wBAAU,OAAO,CAAC,OAAO,CAAC,CAAC,uBAAA,IAAI,yBAAI,CAAC,MAAA,CAAC;QACzC,uBAAA,IAAI,8BAAgB,WAAW,MAAA,CAAC;IACjC,CAAC;CA2ED;;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"databaseutils.js","sourceRoot":"","sources":["../databaseutils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;AAElC,kBAAe;AAEf,kDAA6C;AAC7C,MAAM,QAAQ,GAAG,IAAA,oBAAQ,GAAE,CAAA;AAE3B,mDAA+C;AAC/C,mDAA+C;AAC/C,uCAAmC;AACnC,mDAA+C;AAE/C,kDAA0B;AAC1B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,QAAQ,OAAO,CAAC,GAAG,gBAAgB,CAAC,CAAC;AAEzD,MAAa,aAAa;IAIzB,YAAY,WAAiB;QAFrB,iBAAY,GAAG,IAAI,CAAC;QAO5B,wFAAwF;QACxF,mEAAmE;QACnE,mBAAc,GAAG,CAAO,OAAO,EAAE,EAAE;YAElC,MAAM,KAAK,GAAG,gBAAgB,CAAC;YAC/B,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;YAC/D,MAAM,aAAa,GAAG,GAAG,QAAQ,CAAC,oBAAoB,cAAc,CAAC;YACrE,KAAK,CAAC,2BAA2B,aAAa,GAAG,CAAC,MAAM,CAAC,CAAC;YAE1D,IAAI,gBAAgB,GAAG,IAAI,CAAC;YAC5B,IACA;gBACC,IACA;oBACC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;oBACnC,MAAM,iBAAO,CAAC,YAAY,EAAE,CAAC;iBAC7B;gBAAC,OAAO,KAAK,EACd;oBACC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,+BAA+B,KAAK,EAAE,CAAC,CAAC;oBAC/D,2FAA2F;iBAC3F;gBAED,8BAA8B;gBAC9B,KAAK,CAAC,8BAA8B,CAAC,MAAM,CAAC,CAAC;gBAC7C,MAAM,iBAAO,CAAC,cAAc,EAAE,CAAC;gBAE/B,gBAAgB,GAAG,IAAI,6BAAa,CAAC,IAAI,6BAAa,EAAE,CAAC,CAAC;gBAE1D,sDAAsD;gBACtD,KAAK,CAAC,qDAAqD,CAAC,MAAM,CAAC,CAAC;gBACpE,MAAM,gBAAgB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;gBAEtD,0BAA0B;gBAC1B,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;oBACnC,wBAAwB;oBACxB,KAAK,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;oBAClC,MAAM,EAAE,GAAG,IAAI,6BAAa,CAAC,gBAAgB,CAAC,CAAC;oBAC/C,MAAM,EAAE,CAAC,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC;iBAC3E;gBAED,mBAAmB;gBACnB,KAAK,CAAC,qCAAqC,CAAC,KAAK,CAAC,CAAC;gBACnD,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,KAAK,CAAC,CAAC;aACzD;YAAC,OAAO,KAAK,EACd;gBACC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,uCAAuC,KAAK,EAAE,CAAC,CAAC;gBACvE,KAAK,CAAC,IAAI,KAAK,uCAAuC,KAAK,EAAE,CAAC,CAAC;aAC/D;oBAAS;gBACT,IAAI,gBAAgB,KAAK,IAAI,EAAE;oBAC9B,MAAM,gBAAgB,CAAC,WAAW,EAAE,CAAC;iBACrC;aACD;QAEF,CAAC,CAAA,CAAC;QAEF,kBAAa,GAAG,GAAS,EAAE;YAE1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC;YAC1D,OAAO,MAAM,CAAC;QACf,CAAC,CAAA,CAAC;QAEF,0BAAqB,GAAG,CAAO,UAAU,EAAE,EAAE;YAE5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACnE,OAAO,MAAM,CAAC;QACf,CAAC,CAAA,CAAC;QAEF,yBAAoB,GAAG,GAAS,EAAE;YAEjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC;gBAC9B,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,wCAAwC;gBACjD,OAAO,EAAE,4BAA4B;aACrC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACpD,CAAC,CAAA,CAAC;QA/ED,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;IACjC,CAAC;CA+ED;AAtFD,sCAsFC"}