@pi-r/atlas 0.6.6 → 0.7.0

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2024 An Pham
+Copyright 2023 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,10 +1,7 @@
-# @pi-r/atlas
+### @pi-r/atlas
 
-## Documentation
+https://e-mc.readthedocs.io/en/latest/cloud/atlas.html
 
-- [E-mc](https://e-mc.readthedocs.io/en/latest/cloud/atlas.html)
-- [squared](https://squared.readthedocs.io)
-
-## LICENSE
+### LICENSE
 
 MIT

package/client/index.js

@@ -4,11 +4,11 @@ const mongodb = require("mongodb");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/cloud/util");
 const mongodb_1 = require("@pi-r/mongodb");
-const Module = require("@e-mc/module");
+const Cloud = require("@e-mc/cloud");
 function sanitizeCredentials(credential) {
     const { username, password } = credential;
     if (username) {
-        credential.auth || (credential.auth = password ? { username, password } : { username });
+        credential.auth ||= password ? { username, password } : { username };
         delete credential.username;
     }
     if (password) {
@@ -17,7 +17,7 @@ function sanitizeCredentials(credential) {
 }
 function validateDatabase(credential, data) {
     const auth = credential.auth;
-    return !!(data.table && Module.isURL(data.uri) && (auth?.username || credential.username || (0, util_1.hasBasicAuth)(data.uri)));
+    return !!(data.table && Cloud.isURL(data.uri) && (auth?.username || credential.username || (0, util_1.hasBasicAuth)(data.uri)));
 }
 exports.validateDatabase = validateDatabase;
 function createDatabaseClient(credential, data) {
@@ -37,8 +37,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
     const coercing = this.hasCoerce("atlas", 'options');
     const cacheValue = { value: this.valueOfKey(credential, 'cache'), sessionKey };
     const createClient = async (item, options) => {
-        var _a;
-        return clients[_a = item.uri + Module.asString(options, true)] || (clients[_a] = await createDatabaseClient.call(this, options, item).connect());
+        return clients[item.uri + Cloud.asString(options, true)] ||= await createDatabaseClient.call(this, options, item).connect();
     };
     const closeClient = () => {
         for (const key in clients) {
@@ -58,7 +57,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
             limit = 1;
         }
         const options = item.options ? length === 1 ? Object.assign(item.options, credential) : { ...item.options, ...credential } : length === 1 ? credential : { ...credential };
-        let rows, queryString = caching && ignoreCache !== true ? (name || '') + '_' + table + '_' + limit + Module.asString(options, true) + (sort ? Module.asString(sort, true) : '') + (client ? Module.asString(client, true) : '') : '', auth, pipeline;
+        let rows, queryString = caching && ignoreCache !== true ? (name || '') + '_' + table + '_' + limit + Cloud.asString(options, true) + (sort ? Cloud.asString(sort, true) : '') + (client ? Cloud.asString(client, true) : '') : '', auth, pipeline;
         if (queryString) {
             sanitizeCredentials(options);
             auth = { uri: item.uri, options };
@@ -101,7 +100,7 @@ async function executeBatchQuery(credential, batch, sessionKey) {
         }
         if (pipeline || query) {
             if (queryString) {
-                queryString += Module.asString(aggregate || query, true);
+                queryString += Cloud.asString(aggregate || query, true);
                 if ((aggregate || !update) && (rows = getCache())) {
                     result[i] = rows;
                     continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/atlas",
-  "version": "0.6.6",
+  "version": "0.7.0",
   "description": "MongoDB Atlas cloud functions for E-mc.",
   "main": "client/index.js",
   "publishConfig": {
@@ -20,11 +20,11 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/cloud": "^0.8.7",
-    "@e-mc/db": "^0.8.7",
-    "@e-mc/module": "^0.8.7",
-    "@e-mc/types": "^0.8.7",
-    "@pi-r/mongodb": "^0.6.6",
+    "@e-mc/cloud": "^0.9.0",
+    "@e-mc/db": "^0.9.0",
+    "@e-mc/module": "^0.9.0",
+    "@e-mc/types": "^0.9.0",
+    "@pi-r/mongodb": "^0.7.0",
     "mongodb": "^6.5.0"
   }
 }

package/types/index.d.ts

@@ -0,0 +1,14 @@
+import type { CloudDatabase } from '@e-mc/types/lib/cloud';
+
+import type { MongoDBClientDBOptions, MongoDBFilterValue } from '@pi-r/mongodb/types';
+
+import type { Document, Filter, MongoClientOptions, OptionalUnlessRequiredId, UpdateFilter } from 'mongodb';
+
+export interface AtlasDatabaseQuery extends CloudDatabase<Filter<Document> | MongoDBFilterValue, MongoClientOptions, UpdateFilter<Document> | OptionalUnlessRequiredId<unknown>[], AtlasDatabaseCredential>, MongoDBClientDBOptions {
+    source: "cloud";
+    service: "atlas";
+    uri: string;
+    updateType?: 0 | 1 | 2 | 3;
+}
+
+export interface AtlasDatabaseCredential extends AuthValue, MongoClientOptions {}