@pi-r/oracle 0.5.2 → 0.5.4

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Wit Studio
+Copyright 2024 An Pham
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,6 +1,6 @@
 # @pi-r/oracle
 
-PEP 402 - Forever Vivy
+PEP 402 - Forever
 
 ## LICENSE
 

package/client/index.js

@@ -43,11 +43,13 @@ function removePoolProperties(credential) {
     return credential;
 }
 function getPoolKey(credential) {
+    var _a;
     if (credential.connectString && (credential.user && credential.password || credential.externalAuth)) {
-        return credential.connectString + '_' + (credential.externalAuth ? 'external' : credential.user + '_' + credential.password) + '_' + (credential.edition || '') + '_' + (credential.tag ? credential.tag + '#' + (credential.matchAny ? '1' : '0') : '') + '_' + (credential.privilege ?? '') + '_' + Db.asString(credential.shardingKey) + '_' + Db.asString(credential.superShardingKey);
+        return credential.connectString + '_' + (credential.externalAuth ? 'external' : credential.user + '_' + credential.password) + '_' + (credential.edition || '') + '_' + (credential.tag ? credential.tag + '#' + (credential.matchAny ? '1' : '0') : '') + '_' + ((_a = credential.privilege) !== null && _a !== void 0 ? _a : '') + '_' + Db.asString(credential.shardingKey) + '_' + Db.asString(credential.superShardingKey);
     }
 }
 async function setCredential(item) {
+    var _a, _b, _c, _d, _e, _f;
     let credential = this.getCredential(item), hostname, port, username, database;
     if (credential) {
         ({ hostname, port, username } = (0, util_1.parseServerAuth)(credential));
@@ -130,22 +132,22 @@ async function setCredential(item) {
                 if (config) {
                     const { min, max, idle, queue_max, queue_idle, timeout } = config;
                     if (min >= 0) {
-                        credential.poolMin ?? (credential.poolMin = min);
+                        (_a = credential.poolMin) !== null && _a !== void 0 ? _a : (credential.poolMin = min);
                     }
                     if (max > 0) {
-                        credential.poolMax ?? (credential.poolMax = max);
+                        (_b = credential.poolMax) !== null && _b !== void 0 ? _b : (credential.poolMax = max);
                     }
                     if (idle >= 0) {
-                        credential.poolTimeout ?? (credential.poolTimeout = idle / 1000);
+                        (_c = credential.poolTimeout) !== null && _c !== void 0 ? _c : (credential.poolTimeout = idle / 1000);
                     }
                     if (queue_max >= 0) {
-                        credential.queueMax ?? (credential.queueMax = queue_max);
+                        (_d = credential.queueMax) !== null && _d !== void 0 ? _d : (credential.queueMax = queue_max);
                     }
                     if (queue_idle >= 0) {
-                        credential.queueTimeout ?? (credential.queueTimeout = queue_idle);
+                        (_e = credential.queueTimeout) !== null && _e !== void 0 ? _e : (credential.queueTimeout = queue_idle);
                     }
                     if (timeout >= 0) {
-                        credential.connectTimeout ?? (credential.connectTimeout = idle / 1000);
+                        (_f = credential.connectTimeout) !== null && _f !== void 0 ? _f : (credential.connectTimeout = idle / 1000);
                     }
                 }
                 new OraclePool(await oracledb.createPool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oracle",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Oracle client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.7.2",
-    "@e-mc/types": "^0.7.2",
-    "oracledb": "^6.3.0"
+    "@e-mc/db": "^0.7.5",
+    "@e-mc/types": "^0.7.5",
+    "oracledb": "^6.4.0"
   }
 }

package/types/index.d.ts

@@ -2,6 +2,7 @@ import type { DbDataSource } from '@e-mc/types/lib/squared';
 
 import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
 
+// @ts-ignore
 import type { BindParameters, ConnectionAttributes, ExecuteOptions, PoolAttributes } from 'oracledb';
 
 export interface OracleDataSource extends DbDataSource<string, ExecuteOptions, unknown, string | OracleCredential, string>, ExecuteAction<BindParameters> {