gcf-common-lib 0.48.0 → 0.49.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "Common helpers for Google Cloud Functions: Pub/Sub publishing, Mongo helpers, and utilities for Node 20+ (TypeScript).",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -21,30 +21,28 @@
     "url": "git+https://github.com/TopTechnologies/gcf-common-lib.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^5.2.0",
-    "@google-cloud/storage": "^7.18.0",
-    "@types/bluebird": "^3.5.42",
-    "@types/lodash": "^4.17.21",
-    "bluebird": "^3.7.2",
-    "lodash": "^4.17.21",
+    "@google-cloud/pubsub": "^5.2.2",
+    "@google-cloud/storage": "^7.19.0",
+    "@types/lodash": "^4.17.23",
+    "lodash": "^4.17.23",
     "moment": "^2.30.1",
-    "mongodb": "^7.0.0",
+    "mongodb": "^7.1.0",
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@tsconfig/node20": "^20.1.8",
-    "@types/node": "^20.19.27",
+    "@tsconfig/node20": "^20.1.9",
+    "@types/node": "^20.19.33",
     "@eslint/js": "^9.21.0",
+    "c8": "^9.1.0",
     "eslint": "^9.21.0",
     "eslint-plugin-lodash": "^8.0.0",
     "eslint-plugin-promise": "^7.2.1",
-    "eslint-plugin-unicorn": "^62.0.0",
+    "eslint-plugin-unicorn": "^63.0.0",
     "globals": "^15.15.0",
-    "prettier": "^3.7.4",
-    "typescript-eslint": "^8.25.0",
-    "typescript": "^5.8.3",
+    "prettier": "^3.8.1",
     "tsx": "^4.16.2",
-    "c8": "^9.1.0"
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.25.0"
   },
   "author": "alert83@gmail.com",
   "license": "MIT"

package/src/mongo-helper.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoHelper = void 0;
 const mongodb_1 = require("mongodb");
-const bluebird_1 = __importDefault(require("bluebird"));
 let mongoClient;
 exports.MongoHelper = {
     async collectionExists(client, name) {
@@ -27,17 +23,15 @@ exports.MongoHelper = {
         return coll;
     },
     async withMongoClient(fn, url, mongoClientOptions) {
-        function withDisposer() {
-            return bluebird_1.default.method(async () => {
-                if (!mongoClient) {
-                    mongoClient = new mongodb_1.MongoClient(url, mongoClientOptions);
-                    await mongoClient.connect();
-                }
-                return mongoClient;
-            })().disposer((client, promise) => {
-                // client.close();
-            });
+        try {
+            if (!mongoClient) {
+                mongoClient = new mongodb_1.MongoClient(url, mongoClientOptions);
+                await mongoClient.connect();
+            }
+            return await fn(mongoClient);
+        }
+        finally {
+            // mongoClient.close();
         }
-        return bluebird_1.default.using(withDisposer(), client => fn(client));
     },
 };

package/src/mongo-helper.ts

@@ -1,6 +1,5 @@
 import { Collection, CreateCollectionOptions, MongoClient, MongoClientOptions } from 'mongodb';
 import { Document } from 'bson';
-import Bluebird from 'bluebird';
 
 let mongoClient: MongoClient;
 
@@ -35,18 +34,15 @@ export const MongoHelper = {
     url: string,
     mongoClientOptions?: MongoClientOptions,
   ) {
-    function withDisposer() {
-      return Bluebird.method(async () => {
-        if (!mongoClient) {
-          mongoClient = new MongoClient(url, mongoClientOptions);
-          await mongoClient.connect();
-        }
-        return mongoClient;
-      })().disposer((client, promise) => {
-        // client.close();
-      });
-    }
+    try {
+      if (!mongoClient) {
+        mongoClient = new MongoClient(url, mongoClientOptions);
+        await mongoClient.connect();
+      }
 
-    return Bluebird.using(withDisposer(), client => fn(client));
+      return await fn(mongoClient);
+    } finally {
+      // mongoClient.close();
+    }
   },
 };

package/src/utils.js

@@ -29,8 +29,7 @@ function ms(o) {
     return sec(o) * 1000;
 }
 function sec(o) {
-    const multiMap = {};
-    multiMap.s = 1;
+    const multiMap = { s: 1 };
     multiMap.m = multiMap.s * 60;
     multiMap.h = multiMap.m * 60;
     multiMap.d = multiMap.h * 24;
@@ -66,7 +65,7 @@ function colNumToA1(columnNumber) {
     }
     // Reverse the string and print result
     return charIdxArr
-        .reverse()
+        .toReversed()
         .map(n => chars[n])
         .join('');
 }

package/src/utils.ts

@@ -20,8 +20,7 @@ export function ms(o: { w?: number; d?: number; h?: number; m?: number; s?: numb
 }
 
 export function sec(o: { w?: number; d?: number; h?: number; m?: number; s?: number }) {
-  const multiMap: any = {};
-  multiMap.s = 1;
+  const multiMap: any = { s: 1 };
   multiMap.m = multiMap.s * 60;
   multiMap.h = multiMap.m * 60;
   multiMap.d = multiMap.h * 24;
@@ -64,7 +63,7 @@ export function colNumToA1(columnNumber: number) {
 
   // Reverse the string and print result
   return charIdxArr
-    .reverse()
+    .toReversed()
     .map(n => chars[n])
     .join('');
 }