@pi-r/oci 0.6.7 → 0.7.1

package/README.md

@@ -1,10 +1,7 @@
-# @pi-r/oci
+### @pi-r/oci
 
-## Documentation
+https://e-mc.readthedocs.io/en/latest/cloud/oci.html
 
-- [E-mc](https://e-mc.readthedocs.io/en/latest/cloud/oci.html)
-- [squared](https://squared.readthedocs.io)
-
-## LICENSE
+### LICENSE
 
 MIT

package/client/index.js

@@ -11,27 +11,25 @@ function validateStorage(credential) {
 }
 exports.validateStorage = validateStorage;
 function validateDatabase(credential, data) {
-    return !!(data.table && (credential.password && (credential.user || credential.username) && (credential.connectString || credential.connectionString) || credential.poolAlias));
+    return !!(data.table && (credential.user && credential.password && (credential.connectString || credential.connectionString) || credential.poolAlias));
 }
 exports.validateDatabase = validateDatabase;
 function setStorageCredential(credential) {
-    var _a;
     const { endpoint, namespace, region } = credential;
     if (endpoint) {
-        credential.region || (credential.region = (_a = /([^.]+)\.oraclecloud\.com$/.exec(endpoint)) === null || _a === void 0 ? void 0 : _a[1]);
+        credential.region ||= /([^.]+)\.oraclecloud\.com$/.exec(endpoint)?.[1];
     }
     else if (namespace && region) {
-        credential.endpoint || (credential.endpoint = `https://${namespace}.compat.objectstorage.${region}.oraclecloud.com`);
+        credential.endpoint ||= `https://${namespace}.compat.objectstorage.${region}.oraclecloud.com`;
+    }
+    if (namespace) {
+        delete credential.namespace;
     }
     credential.s3ForcePathStyle = true;
     credential.signatureVersion = 'v4';
 }
 exports.setStorageCredential = setStorageCredential;
 async function createDatabaseClient(credential) {
-    if (credential.username) {
-        credential.user || (credential.user = credential.username);
-        delete credential.username;
-    }
     oracle_1.initOracleClient.call(this, credential, this.logType.CLOUD);
     return oracledb.getConnection(credential);
 }
@@ -72,7 +70,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     let client;
     const createClient = async () => createDatabaseClient.call(this, credential);
-    const closeClient = async () => client === null || client === void 0 ? void 0 : client.close();
+    const closeClient = async () => client?.close();
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
         const { service, table = '', id, query, ignoreCache } = item;
@@ -98,7 +96,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         continue;
                     }
                 }
-                const db = await (client || (client = await createClient())).getSodaDatabase().openCollection(table);
+                const db = await (client ||= await createClient()).getSodaDatabase().openCollection(table);
                 if (!db) {
                     closeClient();
                     throw (0, util_1.formatError)(item, "Missing database table");
@@ -150,7 +148,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                         result[i] = rows;
                         continue;
                     }
-                    const db = await (client || (client = await createClient())).getSodaDatabase().openCollection(table);
+                    const db = await (client ||= await createClient()).getSodaDatabase().openCollection(table);
                     if (!db) {
                         closeClient();
                         throw (0, util_1.formatError)(item, "Missing database table");
@@ -185,14 +183,14 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                 }
                 else {
                     const { params, options } = item;
-                    if ((options === null || options === void 0 ? void 0 : options.maxRows) && isNaN(maxRows)) {
+                    if (options?.maxRows && isNaN(maxRows)) {
                         maxRows = options.maxRows;
                     }
                     if (queryString && (rows = getCache(queryString += query + Module.asString(params, true) + Module.asString(options, true) + (maxRows > 0 ? maxRows : '')))) {
                         result[i] = rows;
                         continue;
                     }
-                    client || (client = await createClient());
+                    client ||= await createClient();
                     const executeOptions = { ...options, outFormat: 4002, maxRows, resultSet: false, autoCommit: true };
                     if (item.streamRow) {
                         rows = [];
@@ -216,7 +214,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
                                 stream.destroy();
                             });
                         })
-                            .catch(err => {
+                            .catch((err) => {
                             closeClient();
                             throw (0, util_1.formatError)(item, err instanceof Error ? err.message : "Missing database query");
                         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/oci",
-  "version": "0.6.7",
+  "version": "0.7.1",
   "description": "Oracle (OCI) cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,12 +20,12 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.8",
-    "@e-mc/module": "^0.8.8",
-    "@e-mc/types": "^0.8.8",
-    "@pi-r/aws": "^0.6.7",
-    "@pi-r/oracle": "^0.6.7",
-    "aws-sdk": "^2.1591.0",
-    "oracledb": "^6.4.0"
+    "@e-mc/cloud": "^0.9.2",
+    "@e-mc/module": "^0.9.2",
+    "@e-mc/types": "^0.9.2",
+    "@pi-r/aws": "^0.7.1",
+    "@pi-r/oracle": "^0.7.1",
+    "aws-sdk": "^2.1628.0",
+    "oracledb": "^6.5.1"
   }
 }

package/types/index.d.ts

@@ -0,0 +1,19 @@
+import type { CloudDatabase, CloudStorage } from '@e-mc/types/lib/cloud';
+
+import type { BindParameters, ConnectionAttributes, ExecuteOptions, InitialiseOptions } from 'oracledb';
+import type { ConfigurationOptions } from 'aws-sdk/lib/core';
+
+export type OCIStorage = CloudStorage<OCIStorageCredential, "oci">;
+
+export interface OCIStorageCredential extends ConfigurationOptions {
+    namespace?: string;
+    endpoint?: string;
+}
+
+export interface OCIDatabaseQuery extends CloudDatabase<PlainObject | string, ExecuteOptions, StandardMap, BindParameters, OCIDatabaseCredential> {
+    source: "cloud";
+    service: "oci";
+    streamRow?: boolean;
+}
+
+export interface OCIDatabaseCredential extends ConnectionAttributes, InitialiseOptions {}