@nsshunt/stsfhirpg 1.2.28 → 1.2.29

package/dist/index.mjs

@@ -13,7 +13,7 @@ import cluster from "cluster";
 import { Pool } from "pg";
 import { TinyEmitter } from "tiny-emitter";
 //#region \0rolldown/runtime.js
-var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 //#endregion
 //#region src/fhir-utils/fhirDateUtils.ts
 var FHIRDateUtils = class {
@@ -3245,7 +3245,8 @@ var HashUtils = class HashUtils {
 		return input.trim().replace(/\s+/g, " ").toLowerCase();
 	};
 	InitHash = async () => {
-		this.h64 = (await e()).h64;
+		const api = await e();
+		this.h64 = api.h64;
 	};
 	xxhash64Signed(input) {
 		if (this.h64) return BigInt.asIntN(64, this.h64(input, this.HASH_SEED));
@@ -4786,19 +4787,46 @@ var PGPoolManager = class extends TinyEmitter {
 	}
 };
 //#endregion
+//#region src/fhir-database/pg/pgfhirdbbase.ts
+var DBSTSFhirDBBase = class {
+	_options;
+	_poolManager;
+	constructor(options) {
+		this._options = options;
+		this._poolManager = options.poolManager;
+	}
+	async withClient(fname, fn) {
+		let client;
+		try {
+			client = await this._poolManager.connectReadWrite();
+		} catch (error) {
+			this._options.logger.error(`${fname}(): DB: Connection Error: [${error}]`);
+			throw error;
+		}
+		try {
+			return await fn(client);
+		} catch (error) {
+			this._options.logger.error(`${fname}(): DB: Query Error: [${error}]`);
+			throw error;
+		} finally {
+			client.release();
+		}
+	}
+};
+//#endregion
 //#region src/fhir-database/pg/pgfhirresource.ts
-var DBSTSResource = class {
-	#poolManager;
-	constructor(poolManager) {
-		this.#poolManager = poolManager;
+var DBSTSResource = class extends DBSTSFhirDBBase {
+	constructor(options) {
+		super(options);
 	}
 	async InsertResourceEx(client, data) {
 		try {
-			await client.query(`
+			return (await client.query(`
                 INSERT INTO stsresfhir (
                     PID, PARTITION_ID, PARTITION_DATE, RES_ID, RES_TYPE,
                     RES_VER, RES_VERSION, RES_PUBLISHED, RES_UPDATED
                 ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+                RETURNING RES_VER
                 `, [
 				data.PID,
 				data.PARTITION_ID,
@@ -4809,146 +4837,90 @@ var DBSTSResource = class {
 				data.RES_VERSION,
 				BigInt(data.RES_PUBLISHED),
 				BigInt(data.RES_UPDATED)
-			]);
+			])).rows[0]?.res_ver;
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:InsertResource(): Query Error: [${error}]`);
+			this._options.logger.error(`DBSTSResource:InsertResource(): Query Error: [${error}]`);
 			throw error;
 		}
 	}
 	async InsertResource(data) {
-		try {
-			const client = await this.#poolManager.connectReadWrite();
-			try {
-				await this.InsertResourceEx(client, data);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:InsertResource(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
-		} catch (error) {
-			defaultLogger.error(`DBSTSResource:InsertResource(): Connection Error: [${error}]`);
-		}
+		return this.withClient("InsertResource", ((client) => this.InsertResourceEx(client, data)));
 	}
 	async UpdateResourceRecordEx(client, data) {
 		try {
-			const res = await client.query(`
+			return (await client.query(`
                 UPDATE stsresfhir SET
                     RES_VER = RES_VER + 1,
                     RES_UPDATED = $1,
                     RES_DELETED_AT = NULL
                 WHERE RES_ID = $2 AND RES_TYPE = $3 AND RES_VER = $4
+                RETURNING RES_VER
                 `, [
 				BigInt(data.RES_UPDATED),
 				data.RES_ID,
 				data.RES_TYPE,
 				data.RES_VER
-			]);
-			return res.rowCount ? res.rowCount > 0 : false;
+			])).rows[0]?.res_ver;
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:UpdateResourceRecordEx(): Query Error: [${error}]`);
+			this._options.logger.error(`DBSTSResource:UpdateResourceRecordEx(): Query Error: [${error}]`);
 			throw error;
 		}
 	}
 	async UpdateResourceRecord(data) {
-		try {
-			const client = await this.#poolManager.connectReadWrite();
-			try {
-				return await this.UpdateResourceRecordEx(client, data);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:UpdateResourceRecord-1(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
-		} catch (error) {
-			defaultLogger.error(`DBSTSResource:UpdateResourceRecord-2(): Connection Error: [${error}]`);
-		}
+		return this.withClient("UpdateResourceRecord", ((client) => this.UpdateResourceRecordEx(client, data)));
 	}
 	async DeleteResourceRecordEx(client, data) {
 		try {
-			const res = await client.query(`
+			return (await client.query(`
                 UPDATE stsresfhir SET
                     RES_DELETED_AT = $1,
                     RES_VER = RES_VER + 1,
                     RES_UPDATED = $2
                 WHERE RES_ID = $3 AND RES_TYPE = $4 AND RES_VER = $5
+                RETURNING RES_VER
                 `, [
 				BigInt(data.RES_DELETED_AT),
 				BigInt(data.RES_UPDATED),
 				data.RES_ID,
 				data.RES_TYPE,
 				data.RES_VER
-			]);
-			return res.rowCount ? res.rowCount > 0 : false;
+			])).rows[0]?.res_ver;
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:DeleteResourceRecord(): Query Error: [${error}]`);
+			this._options.logger.error(`DBSTSResource:DeleteResourceRecord(): Query Error: [${error}]`);
 			throw error;
 		}
 	}
 	async DeleteResourceRecord(data) {
-		try {
-			const client = await this.#poolManager.connectReadWrite();
-			try {
-				return await this.DeleteResourceRecordEx(client, data);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:DeleteResourceRecord(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
-		} catch (error) {
-			defaultLogger.error(`DBSTSResource:DeleteResourceRecord(): Connection Error: [${error}]`);
-		}
+		return this.withClient("DeleteResourceRecord", ((client) => this.DeleteResourceRecordEx(client, data)));
 	}
 	async ReadResourceRecordEx(client, PID) {
 		try {
 			return (await client.query(`SELECT * FROM stsresfhir WHERE PID = $1`, [PID])).rows[0];
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
+			this._options.logger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
 			throw error;
 		}
 	}
 	async ReadResourceRecord(PID) {
-		try {
-			const client = await this.#poolManager.connectReadOnly();
-			try {
-				return await this.ReadResourceRecordEx(client, PID);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
-		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Connection Error: [${error}]`);
-		}
+		return this.withClient("ReadResourceRecord", ((client) => this.ReadResourceRecordEx(client, PID)));
 	}
 	async ReadAllResourceRecordsEx(client) {
 		try {
 			return (await client.query(`SELECT * FROM stsresfhir`)).rows;
 		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadAllResourceRecords(): Query Error: [${error}]`);
+			this._options.logger.error(`DBSTSResource:ReadAllResourceRecords(): Query Error: [${error}]`);
 			throw error;
 		}
 	}
 	async ReadAllResourceRecords() {
-		try {
-			const client = await this.#poolManager.connectReadOnly();
-			try {
-				return await this.ReadAllResourceRecordsEx(client);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResource:ReadAllResourceRecords(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
-		} catch (error) {
-			defaultLogger.error(`DBSTSResource:ReadAllResourceRecords(): Connection Error: [${error}]`);
-		}
+		return this.withClient("ReadAllResourceRecords", ((client) => this.ReadAllResourceRecordsEx(client)));
 	}
 };
 //#endregion
 //#region src/fhir-database/pg/pgfhirresourceversion.ts
-var DBSTSResourceVersion = class {
-	#poolManager;
-	constructor(poolManager) {
-		this.#poolManager = poolManager;
+var DBSTSResourceVersion = class extends DBSTSFhirDBBase {
+	constructor(options) {
+		super(options);
 	}
 	async InsertResourceVersionEx(client, data) {
 		const values = [
@@ -4962,81 +4934,49 @@ var DBSTSResourceVersion = class {
 			data.RES
 		];
 		try {
-			await client.query(`
+			return (await client.query(`
                 INSERT INTO stsresfhirver (
                     PID, PARTITION_ID, PARTITION_DATE,
                     RES_ID, RES_TYPE, RES_VER, OPERATION, RES
                 ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-                `, values);
+                RETURNING RES_VER
+                `, values)).rows[0]?.res_ver;
 		} catch (error) {
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): Query Error: [${error}]`);
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values PID: [${values[0]}]`);
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values PARTITION_ID: [${values[1]}]`);
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values PARTITION_DATE: [${values[2]}]`);
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values RES_ID: [${values[3]}]`);
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values RES_TYPE: [${values[4]}]`);
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values RES_VER: [${values[5]}]`);
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values OPERATION: [${values[6]}]`);
+			this._options.logger.error(`DBSTSResourceVersion:InsertResourceVersion(): Query Error: [${error}]`);
+			this._options.logger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values PID: [${values[0]}]`);
+			this._options.logger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values PARTITION_ID: [${values[1]}]`);
+			this._options.logger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values PARTITION_DATE: [${values[2]}]`);
+			this._options.logger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values RES_ID: [${values[3]}]`);
+			this._options.logger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values RES_TYPE: [${values[4]}]`);
+			this._options.logger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values RES_VER: [${values[5]}]`);
+			this._options.logger.error(`DBSTSResourceVersion:InsertResourceVersion(): --> Values OPERATION: [${values[6]}]`);
 			throw error;
 		}
 	}
 	async InsertResourceVersion(data) {
-		try {
-			const client = await this.#poolManager.connectReadWrite();
-			try {
-				await this.InsertResourceVersionEx(client, data);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
-		} catch (error) {
-			defaultLogger.error(`DBSTSResourceVersion:InsertResourceVersion(): Connection Error: [${error}]`);
-		}
+		return this.withClient("InsertResourceVersion", ((client) => this.InsertResourceVersionEx(client, data)));
 	}
 	async ReadResourceVersionRecordEx(client, PID, RES_VER) {
 		try {
 			return (await client.query(`SELECT * FROM stsresfhirver WHERE PID = $1 AND RES_VER = $2`, [PID, RES_VER])).rows[0];
 		} catch (error) {
-			defaultLogger.error(`DBSTSResourceVersion:ReadResourceVersionRecord(): Query Error: [${error}]`);
+			this._options.logger.error(`DBSTSResourceVersion:ReadResourceVersionRecord(): Query Error: [${error}]`);
 			throw error;
 		}
 	}
 	async ReadResourceVersionRecord(PID, RES_VER) {
-		try {
-			const client = await this.#poolManager.connectReadWrite();
-			try {
-				return await this.ReadResourceVersionRecordEx(client, PID, RES_VER);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResourceVersion:ReadResourceVersionRecord(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
-		} catch (error) {
-			defaultLogger.error(`DBSTSResourceVersion:ReadResourceVersionRecord(): Connection Error: [${error}]`);
-		}
+		return this.withClient("ReadResourceVersionRecord", ((client) => this.ReadResourceVersionRecordEx(client, PID, RES_VER)));
 	}
 	async ReadAllResourceVersionRecordsEx(client) {
 		try {
 			return (await client.query(`SELECT * FROM stsresfhirver`)).rows;
 		} catch (error) {
-			defaultLogger.error(`DBSTSResourceVersion:ReadAllResourceVersionRecords(): Query Error: [${error}]`);
+			this._options.logger.error(`DBSTSResourceVersion:ReadAllResourceVersionRecords(): Query Error: [${error}]`);
 			throw error;
 		}
 	}
 	async ReadAllResourceVersionRecords() {
-		try {
-			const client = await this.#poolManager.connectReadWrite();
-			try {
-				return await this.ReadAllResourceVersionRecordsEx(client);
-			} catch (error) {
-				defaultLogger.error(`DBSTSResourceVersion:ReadAllResourceVersionRecords(): Query Error: [${error}]`);
-			} finally {
-				client.release();
-			}
-		} catch (error) {
-			defaultLogger.error(`DBSTSResourceVersion:ReadAllResourceVersionRecords(): Connection Error: [${error}]`);
-		}
+		return this.withClient("ReadAllResourceVersionRecords", ((client) => this.ReadAllResourceVersionRecordsEx(client)));
 	}
 };
 //#endregion
@@ -5822,8 +5762,14 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			logger: this.#options.logger,
 			usedefaultdb: this.#options.usedefaultdb
 		});
-		this.#dbSTSResource = new DBSTSResource(this.#poolManager);
-		this.#dbSTSResourceVersion = new DBSTSResourceVersion(this.#poolManager);
+		this.#dbSTSResource = new DBSTSResource({
+			logger: this.#options.logger,
+			poolManager: this.#poolManager
+		});
+		this.#dbSTSResourceVersion = new DBSTSResourceVersion({
+			logger: this.#options.logger,
+			poolManager: this.#poolManager
+		});
 		this.#dbSearchIndex = DBSearchIndex.getInstance();
 		this.#dbSTSResourceLink = new DBSTSResourceLink();
 		this.#dbSTSString = new DBSTSString();
@@ -5834,6 +5780,16 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		this.#dbSTSUri = new DBSTSUri();
 		this.#dbSTSCombo = new DBSTSCombo();
 	}
+	GetOperationOutcome = (code, diagnostics) => {
+		return {
+			resourceType: "OperationOutcome",
+			issue: [{
+				severity: "error",
+				code,
+				diagnostics
+			}]
+		};
+	};
 	async StartDatabase() {
 		return true;
 	}
@@ -6019,14 +5975,14 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		return false;
 	};
 	CreateResource = async (resource, transactionHandle) => {
-		if (this.#poolManager) try {
-			let PK = randomUUID$1();
-			const RES_ID = resource.id;
-			const RES_TYPE = resource.resourceType;
-			const RES = JSON.stringify(resource);
-			const now = (/* @__PURE__ */ new Date()).getTime();
-			let client;
-			let useTransaction;
+		if (!this.#poolManager) {
+			const errorMessage = `CreateResource(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		let client;
+		let useTransaction;
+		try {
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6034,50 +5990,72 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadWrite();
 				useTransaction = true;
 			}
-			try {
-				if (useTransaction) await client.query("BEGIN");
-				await this.#dbSTSResource.InsertResourceEx(client, {
-					PID: PK,
-					PARTITION_ID: 0,
-					PARTITION_DATE: 0,
-					RES_ID,
-					RES_TYPE,
-					RES_VER: 1,
-					RES_VERSION: "r5",
-					RES_PUBLISHED: now,
-					RES_UPDATED: now
-				});
-				await this.#dbSTSResourceVersion.InsertResourceVersionEx(client, {
-					PID: randomUUID$1(),
-					PARTITION_ID: 0,
-					PARTITION_DATE: 0,
-					RES_ID,
-					RES_TYPE,
-					RES_VER: 1,
-					OPERATION: "POST",
-					RES
-				});
-				performance.now();
-				await this.UpdateIndexes(client, resource);
-				if (useTransaction) await client.query("COMMIT");
-				return resource;
-			} catch (error) {
-				if (useTransaction) await client.query("ROLLBACK");
-			} finally {
-				if (useTransaction) client.release();
-			}
 		} catch (error) {
-			defaultLogger.error(`PGFhirAccessLayer:CreateResource(): [${error}]`);
+			const errorMessage = `CreateResource(): Could not get connection: Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
 		}
-	};
-	UpdateResource = async (resource, RES_VER, operation, transactionHandle) => {
-		if (this.#poolManager) try {
+		try {
 			const RES_ID = resource.id;
 			const RES_TYPE = resource.resourceType;
-			const RES = JSON.stringify(resource);
 			const now = (/* @__PURE__ */ new Date()).getTime();
-			let client;
-			let useTransaction;
+			if (useTransaction) await client.query("BEGIN");
+			const newVersion = await this.#dbSTSResource.InsertResourceEx(client, {
+				PID: randomUUID$1(),
+				PARTITION_ID: 0,
+				PARTITION_DATE: 0,
+				RES_ID,
+				RES_TYPE,
+				RES_VER: 1,
+				RES_VERSION: "r5",
+				RES_PUBLISHED: now,
+				RES_UPDATED: now
+			});
+			if (newVersion === void 0) {
+				const errorMessage = `CreateResource(): Version Conflict. newVersion is undefined.`;
+				this.#options.logger.error(errorMessage);
+				throw new Error(errorMessage);
+			}
+			resource.meta ??= {};
+			resource.meta.versionId = String(newVersion);
+			resource.meta.lastUpdated = new Date(now).toISOString();
+			const RES = JSON.stringify(resource);
+			if (await this.#dbSTSResourceVersion.InsertResourceVersionEx(client, {
+				PID: randomUUID$1(),
+				PARTITION_ID: 0,
+				PARTITION_DATE: 0,
+				RES_ID,
+				RES_TYPE,
+				RES_VER: newVersion,
+				OPERATION: "POST",
+				RES
+			}) === void 0) {
+				const errorMessage = `CreateResource(): Version Conflict. resourceVersionRunResult is undefined.`;
+				this.#options.logger.error(errorMessage);
+				throw new Error(errorMessage);
+			}
+			performance.now();
+			await this.UpdateIndexes(client, resource);
+			if (useTransaction) await client.query("COMMIT");
+			return resource;
+		} catch (error) {
+			if (useTransaction) await client.query("ROLLBACK");
+			const errorMessage = `CreateResource(): Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
+		}
+	};
+	UpdateResource = async (resource, RES_VER, operation, transactionHandle) => {
+		if (!this.#poolManager) {
+			const errorMessage = `UpdateResource(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		let client;
+		let useTransaction;
+		try {
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6085,43 +6063,66 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadWrite();
 				useTransaction = true;
 			}
-			try {
-				if (useTransaction) await client.query("BEGIN");
-				await this.#dbSTSResource.UpdateResourceRecordEx(client, {
-					RES_TYPE,
-					RES_ID,
-					RES_VER,
-					RES_UPDATED: now
-				});
-				await this.#dbSTSResourceVersion.InsertResourceVersionEx(client, {
-					PID: randomUUID$1(),
-					PARTITION_ID: 0,
-					PARTITION_DATE: 0,
-					RES_ID,
-					RES_TYPE,
-					RES_VER: RES_VER + 1,
-					OPERATION: operation,
-					RES
-				});
-				await this.UpdateIndexes(client, resource);
-				if (useTransaction) await client.query("COMMIT");
-				return resource;
-			} catch (error) {
-				if (useTransaction) await client.query("ROLLBACK");
-			} finally {
-				if (useTransaction) client.release();
+		} catch (error) {
+			const errorMessage = `UpdateResource(): Could not get connection: Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			const RES_ID = resource.id;
+			const RES_TYPE = resource.resourceType;
+			const now = (/* @__PURE__ */ new Date()).getTime();
+			if (useTransaction) await client.query("BEGIN");
+			const newVersion = await this.#dbSTSResource.UpdateResourceRecordEx(client, {
+				RES_TYPE,
+				RES_ID,
+				RES_VER,
+				RES_UPDATED: now
+			});
+			if (newVersion === void 0) {
+				const errorMessage = `UpdateResource(): Version Conflict. newVersion is undefined. RES_VER: [${RES_VER}]`;
+				this.#options.logger.error(errorMessage);
+				throw new Error(errorMessage);
+			}
+			resource.meta ??= {};
+			resource.meta.versionId = String(newVersion);
+			resource.meta.lastUpdated = new Date(now).toISOString();
+			const RES = JSON.stringify(resource);
+			if (await this.#dbSTSResourceVersion.InsertResourceVersionEx(client, {
+				PID: randomUUID$1(),
+				PARTITION_ID: 0,
+				PARTITION_DATE: 0,
+				RES_ID,
+				RES_TYPE,
+				RES_VER: newVersion,
+				OPERATION: operation,
+				RES
+			}) === void 0) {
+				const errorMessage = `UpdateResource(): Version Conflict. resourceVersionRunResult is undefined. RES_VER: [${RES_VER}]`;
+				this.#options.logger.error(errorMessage);
+				throw new Error(errorMessage);
 			}
+			await this.UpdateIndexes(client, resource);
+			if (useTransaction) await client.query("COMMIT");
+			return resource;
 		} catch (error) {
-			defaultLogger.error(`PGFhirAccessLayer:UpdateResource(): [${error}]`);
+			if (useTransaction) await client.query("ROLLBACK");
+			const errorMessage = `UpdateResource(): Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
 		}
 	};
 	DeleteResource = async (resource, RES_VER, transactionHandle) => {
-		if (this.#poolManager) try {
-			const RES_ID = resource.id;
-			const RES_TYPE = resource.resourceType;
-			const now = new Date(DateTime.fromISO(resource.meta.lastUpdated).toJSDate()).getTime();
-			let client;
-			let useTransaction;
+		if (!this.#poolManager) {
+			const errorMessage = `DeleteResource(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		let client;
+		let useTransaction;
+		try {
 			if (transactionHandle && this.#transactions[transactionHandle]) {
 				client = this.#transactions[transactionHandle].client;
 				useTransaction = false;
@@ -6129,39 +6130,64 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 				client = await this.#poolManager.connectReadWrite();
 				useTransaction = true;
 			}
-			try {
-				if (useTransaction) await client.query("BEGIN");
-				await this.#dbSTSResource.DeleteResourceRecordEx(client, {
-					RES_ID,
-					RES_TYPE,
-					RES_VER,
-					RES_DELETED_AT: now,
-					RES_UPDATED: now
-				});
-				await this.#dbSTSResourceVersion.InsertResourceVersionEx(client, {
-					PID: randomUUID$1(),
-					PARTITION_ID: 0,
-					PARTITION_DATE: 0,
-					RES_ID,
-					RES_TYPE,
-					RES_VER: RES_VER + 1,
-					OPERATION: "DELETE",
-					RES: ""
-				});
-				await this.UpdateIndexes(client, resource);
-				if (useTransaction) await client.query("COMMIT");
-				return resource;
-			} catch (error) {
-				if (useTransaction) await client.query("ROLLBACK");
-			} finally {
-				if (useTransaction) client.release();
+		} catch (error) {
+			const errorMessage = `DeleteResource(): Could not get connection: Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
+			const RES_ID = resource.id;
+			const RES_TYPE = resource.resourceType;
+			const now = (/* @__PURE__ */ new Date()).getTime();
+			if (useTransaction) await client.query("BEGIN");
+			const newVersion = await this.#dbSTSResource.DeleteResourceRecordEx(client, {
+				RES_ID,
+				RES_TYPE,
+				RES_VER,
+				RES_DELETED_AT: now,
+				RES_UPDATED: now
+			});
+			if (newVersion === void 0) {
+				const errorMessage = `DeleteResource(): Version Conflict. newVersion is undefined. RES_VER: [${RES_VER}]`;
+				this.#options.logger.error(errorMessage);
+				throw new Error(errorMessage);
+			}
+			resource.meta ??= {};
+			resource.meta.versionId = String(newVersion);
+			resource.meta.lastUpdated = new Date(now).toISOString();
+			if (await this.#dbSTSResourceVersion.InsertResourceVersionEx(client, {
+				PID: randomUUID$1(),
+				PARTITION_ID: 0,
+				PARTITION_DATE: 0,
+				RES_ID,
+				RES_TYPE,
+				RES_VER: newVersion,
+				OPERATION: "DELETE",
+				RES: ""
+			}) === void 0) {
+				const errorMessage = `DeleteResource(): Version Conflict. resourceVersionRunResult is undefined. RES_VER: [${RES_VER}]`;
+				this.#options.logger.error(errorMessage);
+				throw new Error(errorMessage);
 			}
+			await this.UpdateIndexes(client, resource);
+			if (useTransaction) await client.query("COMMIT");
+			return resource;
 		} catch (error) {
-			defaultLogger.error(`PGFhirAccessLayer:DeleteResource(): [${error}]`);
+			if (useTransaction) await client.query("ROLLBACK");
+			const errorMessage = `DeleteResource(): Error: [${error}]`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		} finally {
+			if (useTransaction) client.release();
 		}
 	};
 	ReadResourceRecord = async (RES_TYPE, RES_ID, transactionHandle) => {
-		if (this.#poolManager) try {
+		if (!this.#poolManager) {
+			const errorMessage = `ReadResourceRecord(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
 			let client;
 			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
@@ -6173,19 +6199,19 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			}
 			try {
 				return (await client.query(`
-                        SELECT
-                            r.*, v.* FROM stsresfhir r
-                        JOIN 
-                            stsresfhirver v
-                        ON 
-                            r.RES_ID = v.RES_ID AND 
-                            r.RES_TYPE = v.RES_TYPE AND
-                            r.RES_VER = v.RES_VER
-                        WHERE
-                            r.RES_ID = $1 AND
-                            r.RES_TYPE = $2 AND
-                            r.RES_DELETED_AT IS NULL
-                    `, [RES_ID, RES_TYPE])).rows[0];
+                    SELECT
+                        r.*, v.* FROM stsresfhir r
+                    JOIN 
+                        stsresfhirver v
+                    ON 
+                        r.RES_ID = v.RES_ID AND 
+                        r.RES_TYPE = v.RES_TYPE AND
+                        r.RES_VER = v.RES_VER
+                    WHERE
+                        r.RES_ID = $1 AND
+                        r.RES_TYPE = $2 AND
+                        r.RES_DELETED_AT IS NULL
+                `, [RES_ID, RES_TYPE])).rows[0];
 			} catch (error) {
 				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
 			} finally {
@@ -6196,7 +6222,12 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		}
 	};
 	ReadResourceRecordWithVersion = async (RES_TYPE, RES_ID, RES_VER, transactionHandle) => {
-		if (this.#poolManager) try {
+		if (!this.#poolManager) {
+			const errorMessage = `ReadResourceRecordWithVersion(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
 			let client;
 			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
@@ -6208,18 +6239,18 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			}
 			try {
 				return (await client.query(`
-                        SELECT
-                            r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
-                        JOIN 
-                            stsresfhirver v
-                        ON 
-                            r.RES_ID = v.RES_ID AND 
-                            r.RES_TYPE = v.RES_TYPE
-                        WHERE
-                            r.RES_ID = $1 AND
-                            r.RES_TYPE = $2 AND
-                            v.RES_VER = $3
-                    `, [
+                    SELECT
+                        r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
+                    JOIN 
+                        stsresfhirver v
+                    ON 
+                        r.RES_ID = v.RES_ID AND 
+                        r.RES_TYPE = v.RES_TYPE
+                    WHERE
+                        r.RES_ID = $1 AND
+                        r.RES_TYPE = $2 AND
+                        v.RES_VER = $3
+                `, [
 					RES_ID,
 					RES_TYPE,
 					RES_VER
@@ -6234,7 +6265,12 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		}
 	};
 	ReadResourceInstanceWithAllVersions = async (RES_TYPE, RES_ID, transactionHandle) => {
-		if (this.#poolManager) try {
+		if (!this.#poolManager) {
+			const errorMessage = `ReadResourceInstanceWithAllVersions(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
 			let client;
 			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
@@ -6246,19 +6282,19 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			}
 			try {
 				return (await client.query(`
-                        SELECT
-                            r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
-                        JOIN 
-                            stsresfhirver v
-                        ON 
-                            r.RES_ID = v.RES_ID AND 
-                            r.RES_TYPE = v.RES_TYPE
-                        WHERE
-                            r.RES_ID = $1 AND
-                            r.RES_TYPE = $2
-                        ORDER BY
-                            v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
-                    `, [RES_ID, RES_TYPE])).rows;
+                    SELECT
+                        r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
+                    JOIN 
+                        stsresfhirver v
+                    ON 
+                        r.RES_ID = v.RES_ID AND 
+                        r.RES_TYPE = v.RES_TYPE
+                    WHERE
+                        r.RES_ID = $1 AND
+                        r.RES_TYPE = $2
+                    ORDER BY
+                        v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
+                `, [RES_ID, RES_TYPE])).rows;
 			} catch (error) {
 				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
 			} finally {
@@ -6269,7 +6305,12 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		}
 	};
 	ReadResourcesWithAllVersions = async (RES_TYPE, transactionHandle) => {
-		if (this.#poolManager) try {
+		if (!this.#poolManager) {
+			const errorMessage = `ReadResourcesWithAllVersions(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
 			let client;
 			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
@@ -6281,18 +6322,18 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			}
 			try {
 				return (await client.query(`
-                        SELECT
-                            r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
-                        JOIN 
-                            stsresfhirver v
-                        ON 
-                            r.RES_ID = v.RES_ID AND 
-                            r.RES_TYPE = v.RES_TYPE
-                        WHERE
-                            r.RES_TYPE = $1
-                        ORDER BY
-                            v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
-                    `, [RES_TYPE])).rows;
+                    SELECT
+                        r.*, v.*, r.res_ver as R_res_ver, v.res_ver as V_res_ver FROM stsresfhir r
+                    JOIN 
+                        stsresfhirver v
+                    ON 
+                        r.RES_ID = v.RES_ID AND 
+                        r.RES_TYPE = v.RES_TYPE
+                    WHERE
+                        r.RES_TYPE = $1
+                    ORDER BY
+                        v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
+                `, [RES_TYPE])).rows;
 			} catch (error) {
 				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
 			} finally {
@@ -6303,7 +6344,12 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		}
 	};
 	ReadAllResourcesWithVersions = async (transactionHandle) => {
-		if (this.#poolManager) try {
+		if (!this.#poolManager) {
+			const errorMessage = `ReadAllResourcesWithVersions(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
 			let client;
 			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
@@ -6315,16 +6361,16 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 			}
 			try {
 				return (await client.query(`
-                        SELECT
-                            r.*, v.* FROM stsresfhir r
-                        JOIN 
-                            stsresfhirver v
-                        ON 
-                            r.RES_ID = v.RES_ID AND 
-                            r.RES_TYPE = v.RES_TYPE AND
-                        ORDER BY
-                            v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
-                    `)).rows;
+                    SELECT
+                        r.*, v.* FROM stsresfhir r
+                    JOIN 
+                        stsresfhirver v
+                    ON 
+                        r.RES_ID = v.RES_ID AND 
+                        r.RES_TYPE = v.RES_TYPE AND
+                    ORDER BY
+                        v.RES_TYPE ASC, v.RES_ID ASC, v.RES_VER DESC
+                `)).rows;
 			} catch (error) {
 				defaultLogger.error(`DBSTSResource:ReadResourceRecord(): Query Error: [${error}]`);
 			} finally {
@@ -6338,7 +6384,12 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		return this.#dbSTSResourceVersion.ReadAllResourceVersionRecords();
 	};
 	ReadResourceIndexes = async (resource, transactionHandle) => {
-		if (this.#poolManager) try {
+		if (!this.#poolManager) {
+			const errorMessage = `ReadResourceIndexes(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
 			const resultSet = {
 				"stsresfhirlink": [],
 				"stsresfhirstring": [],
@@ -6378,7 +6429,12 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		}
 	};
 	ExecuteReadQuery = async (queryData, transactionHandle) => {
-		if (this.#poolManager) try {
+		if (!this.#poolManager) {
+			const errorMessage = `ExecuteReadQuery(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
 			let client;
 			let useTransaction;
 			if (transactionHandle && this.#transactions[transactionHandle]) {
@@ -6401,7 +6457,12 @@ var PGFhirAccessLayer = class extends TinyEmitter {
 		}
 	};
 	TruncateAll = async () => {
-		if (this.#poolManager) try {
+		if (!this.#poolManager) {
+			const errorMessage = `TruncateAll(): poolManager not set`;
+			this.#options.logger.error(errorMessage);
+			throw new Error(errorMessage);
+		}
+		try {
 			let client;
 			client = await this.#poolManager.connectReadWrite();
 			try {