@goweekdays/core 1.1.6 → 1.1.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @goweekdays/core
 
+## 1.1.7
+
+### Patch Changes
+
+- 8666ffe: Update dependencies
+
 ## 1.1.6
 
 ### Patch Changes

package/dist/index.d.ts

@@ -50,13 +50,13 @@ declare function useVerificationRepo(): {
         type?: string | string[] | undefined;
         email?: string | undefined;
         app?: string | undefined;
-    }) => Promise<{
+    }) => Promise<TVerification[] | {
         items: any[];
         pages: number;
         pageRange: string;
     }>;
     getById: (_id: ObjectId | string) => Promise<TVerification | null>;
-    getByIdByType: (type: string) => Promise<TVerification[][]>;
+    getByIdByType: (type: string) => Promise<TVerification[] | TVerification[][]>;
     updateStatusById: (_id: ObjectId | string, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
@@ -80,7 +80,7 @@ declare function useVerificationService(): {
         email?: string | undefined;
         limit?: number | undefined;
         app?: string | undefined;
-    }) => Promise<{
+    }) => Promise<TVerification[] | {
         items: any[];
         pages: number;
         pageRange: string;
@@ -1234,11 +1234,7 @@ declare function useMemberRepo(): {
         org?: string | ObjectId | undefined;
         type: string;
         status: string;
-    }) => Promise<{
-        items: any[];
-        pages: number;
-        pageRange: string;
-    } | TMember[]>;
+    }) => Promise<Record<string, any>>;
     getOrgsByUserId: ({ search, page, limit, sort, user, status, }?: {
         user: string | ObjectId;
         page: number;
@@ -1452,9 +1448,6 @@ declare const TInvoice: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     type: "organization-subscription" | "affiliate-subscription" | "one-time-payment" | "other";
     status: "pending" | "cancelled" | "paid" | "overdue";
-    amount: number;
-    invoiceNumber: string;
-    dueDate: Date;
     items: {
         description: string;
         unitPrice: number;
@@ -1462,6 +1455,9 @@ declare const TInvoice: z.ZodObject<{
         total: number;
         seats?: number | undefined;
     }[];
+    amount: number;
+    invoiceNumber: string;
+    dueDate: Date;
     _id?: ObjectId | undefined;
     updatedAt?: Date | undefined;
     createdAt?: Date | undefined;
@@ -1475,9 +1471,6 @@ declare const TInvoice: z.ZodObject<{
         billingCycle?: "monthly" | "yearly" | "quarterly" | undefined;
     } | undefined;
 }, {
-    amount: number;
-    invoiceNumber: string;
-    dueDate: Date;
     items: {
         description: string;
         unitPrice: number;
@@ -1485,6 +1478,9 @@ declare const TInvoice: z.ZodObject<{
         total: number;
         seats?: number | undefined;
     }[];
+    amount: number;
+    invoiceNumber: string;
+    dueDate: Date;
     type?: "organization-subscription" | "affiliate-subscription" | "one-time-payment" | "other" | undefined;
     status?: "pending" | "cancelled" | "paid" | "overdue" | undefined;
     _id?: string | ObjectId | undefined;
@@ -1506,9 +1502,6 @@ declare function useInvoiceModel(db: Db): {
     collection: Collection<{
         type: "organization-subscription" | "affiliate-subscription" | "one-time-payment" | "other";
         status: "pending" | "cancelled" | "paid" | "overdue";
-        amount: number;
-        invoiceNumber: string;
-        dueDate: Date;
         items: {
             description: string;
             unitPrice: number;
@@ -1516,6 +1509,9 @@ declare function useInvoiceModel(db: Db): {
             total: number;
             seats?: number | undefined;
         }[];
+        amount: number;
+        invoiceNumber: string;
+        dueDate: Date;
         _id?: ObjectId | undefined;
         updatedAt?: Date | undefined;
         createdAt?: Date | undefined;
@@ -1538,9 +1534,6 @@ declare function useInvoiceRepo(): {
     getByDueDate: (id: string | ObjectId, dueDate: Date, status?: TInvoice["status"]) => Promise<{
         type: "organization-subscription" | "affiliate-subscription" | "one-time-payment" | "other";
         status: "pending" | "cancelled" | "paid" | "overdue";
-        amount: number;
-        invoiceNumber: string;
-        dueDate: Date;
         items: {
             description: string;
             unitPrice: number;
@@ -1548,6 +1541,9 @@ declare function useInvoiceRepo(): {
             total: number;
             seats?: number | undefined;
         }[];
+        amount: number;
+        invoiceNumber: string;
+        dueDate: Date;
         _id?: ObjectId | undefined;
         updatedAt?: Date | undefined;
         createdAt?: Date | undefined;
@@ -1565,9 +1561,6 @@ declare function useInvoiceRepo(): {
     getOverdueInvoices: (BATCH_SIZE?: number) => Promise<{
         type: "organization-subscription" | "affiliate-subscription" | "one-time-payment" | "other";
         status: "pending" | "cancelled" | "paid" | "overdue";
-        amount: number;
-        invoiceNumber: string;
-        dueDate: Date;
         items: {
             description: string;
             unitPrice: number;
@@ -1575,6 +1568,9 @@ declare function useInvoiceRepo(): {
             total: number;
             seats?: number | undefined;
         }[];
+        amount: number;
+        invoiceNumber: string;
+        dueDate: Date;
         _id?: ObjectId | undefined;
         updatedAt?: Date | undefined;
         createdAt?: Date | undefined;
@@ -1602,9 +1598,6 @@ declare function useInvoiceRepo(): {
     getByNumber: (number: string) => Promise<{
         type: "organization-subscription" | "affiliate-subscription" | "one-time-payment" | "other";
         status: "pending" | "cancelled" | "paid" | "overdue";
-        amount: number;
-        invoiceNumber: string;
-        dueDate: Date;
         items: {
             description: string;
             unitPrice: number;
@@ -1612,6 +1605,9 @@ declare function useInvoiceRepo(): {
             total: number;
             seats?: number | undefined;
         }[];
+        amount: number;
+        invoiceNumber: string;
+        dueDate: Date;
         _id?: ObjectId | undefined;
         updatedAt?: Date | undefined;
         createdAt?: Date | undefined;
@@ -1628,9 +1624,6 @@ declare function useInvoiceRepo(): {
     getByTransactionId: (id: string) => Promise<{
         type: "organization-subscription" | "affiliate-subscription" | "one-time-payment" | "other";
         status: "pending" | "cancelled" | "paid" | "overdue";
-        amount: number;
-        invoiceNumber: string;
-        dueDate: Date;
         items: {
             description: string;
             unitPrice: number;
@@ -1638,6 +1631,9 @@ declare function useInvoiceRepo(): {
             total: number;
             seats?: number | undefined;
         }[];
+        amount: number;
+        invoiceNumber: string;
+        dueDate: Date;
         _id?: ObjectId | undefined;
         updatedAt?: Date | undefined;
         createdAt?: Date | undefined;

package/dist/index.js

@@ -9973,6 +9973,7 @@ var require_es_set_tostringtag = __commonJS({
 // node_modules/form-data/lib/populate.js
 var require_populate = __commonJS({
   "node_modules/form-data/lib/populate.js"(exports, module2) {
+    "use strict";
     module2.exports = function(dst, src) {
       Object.keys(src).forEach(function(prop) {
         dst[prop] = dst[prop] || src[prop];
@@ -9985,6 +9986,7 @@ var require_populate = __commonJS({
 // node_modules/form-data/lib/form_data.js
 var require_form_data = __commonJS({
   "node_modules/form-data/lib/form_data.js"(exports, module2) {
+    "use strict";
     var CombinedStream = require_combined_stream();
     var util3 = require("util");
     var path = require("path");
@@ -9996,9 +9998,8 @@ var require_form_data = __commonJS({
     var mime = require_mime_types();
     var asynckit = require_asynckit();
     var setToStringTag = require_es_set_tostringtag();
+    var hasOwn = require_hasown();
     var populate = require_populate();
-    module2.exports = FormData3;
-    util3.inherits(FormData3, CombinedStream);
     function FormData3(options) {
       if (!(this instanceof FormData3)) {
         return new FormData3(options);
@@ -10012,16 +10013,17 @@ var require_form_data = __commonJS({
         this[option] = options[option];
       }
     }
+    util3.inherits(FormData3, CombinedStream);
     FormData3.LINE_BREAK = "\r\n";
     FormData3.DEFAULT_CONTENT_TYPE = "application/octet-stream";
     FormData3.prototype.append = function(field, value, options) {
       options = options || {};
-      if (typeof options == "string") {
+      if (typeof options === "string") {
         options = { filename: options };
       }
       var append2 = CombinedStream.prototype.append.bind(this);
-      if (typeof value == "number") {
-        value = "" + value;
+      if (typeof value === "number" || value == null) {
+        value = String(value);
       }
       if (Array.isArray(value)) {
         this._error(new Error("Arrays are not supported."));
@@ -10037,7 +10039,7 @@ var require_form_data = __commonJS({
     FormData3.prototype._trackLength = function(header, value, options) {
       var valueLength = 0;
       if (options.knownLength != null) {
-        valueLength += +options.knownLength;
+        valueLength += Number(options.knownLength);
       } else if (Buffer.isBuffer(value)) {
         valueLength = value.length;
       } else if (typeof value === "string") {
@@ -10045,7 +10047,7 @@ var require_form_data = __commonJS({
       }
       this._valueLength += valueLength;
       this._overheadLength += Buffer.byteLength(header) + FormData3.LINE_BREAK.length;
-      if (!value || !value.path && !(value.readable && Object.prototype.hasOwnProperty.call(value, "httpVersion")) && !(value instanceof Stream)) {
+      if (!value || !value.path && !(value.readable && hasOwn(value, "httpVersion")) && !(value instanceof Stream)) {
         return;
       }
       if (!options.knownLength) {
@@ -10053,26 +10055,25 @@ var require_form_data = __commonJS({
       }
     };
     FormData3.prototype._lengthRetriever = function(value, callback) {
-      if (Object.prototype.hasOwnProperty.call(value, "fd")) {
+      if (hasOwn(value, "fd")) {
         if (value.end != void 0 && value.end != Infinity && value.start != void 0) {
           callback(null, value.end + 1 - (value.start ? value.start : 0));
         } else {
           fs.stat(value.path, function(err, stat) {
-            var fileSize;
             if (err) {
               callback(err);
               return;
             }
-            fileSize = stat.size - (value.start ? value.start : 0);
+            var fileSize = stat.size - (value.start ? value.start : 0);
             callback(null, fileSize);
           });
         }
-      } else if (Object.prototype.hasOwnProperty.call(value, "httpVersion")) {
-        callback(null, +value.headers["content-length"]);
-      } else if (Object.prototype.hasOwnProperty.call(value, "httpModule")) {
+      } else if (hasOwn(value, "httpVersion")) {
+        callback(null, Number(value.headers["content-length"]));
+      } else if (hasOwn(value, "httpModule")) {
         value.on("response", function(response) {
           value.pause();
-          callback(null, +response.headers["content-length"]);
+          callback(null, Number(response.headers["content-length"]));
         });
         value.resume();
       } else {
@@ -10080,7 +10081,7 @@ var require_form_data = __commonJS({
       }
     };
     FormData3.prototype._multiPartHeader = function(field, value, options) {
-      if (typeof options.header == "string") {
+      if (typeof options.header === "string") {
         return options.header;
       }
       var contentDisposition = this._getContentDisposition(value, options);
@@ -10092,12 +10093,12 @@ var require_form_data = __commonJS({
         // if no content type. allow it to be empty array
         "Content-Type": [].concat(contentType || [])
       };
-      if (typeof options.header == "object") {
+      if (typeof options.header === "object") {
         populate(headers, options.header);
       }
       var header;
       for (var prop in headers) {
-        if (Object.prototype.hasOwnProperty.call(headers, prop)) {
+        if (hasOwn(headers, prop)) {
           header = headers[prop];
           if (header == null) {
             continue;
@@ -10113,34 +10114,33 @@ var require_form_data = __commonJS({
       return "--" + this.getBoundary() + FormData3.LINE_BREAK + contents + FormData3.LINE_BREAK;
     };
     FormData3.prototype._getContentDisposition = function(value, options) {
-      var filename, contentDisposition;
+      var filename;
       if (typeof options.filepath === "string") {
         filename = path.normalize(options.filepath).replace(/\\/g, "/");
-      } else if (options.filename || value.name || value.path) {
-        filename = path.basename(options.filename || value.name || value.path);
-      } else if (value.readable && Object.prototype.hasOwnProperty.call(value, "httpVersion")) {
+      } else if (options.filename || value && (value.name || value.path)) {
+        filename = path.basename(options.filename || value && (value.name || value.path));
+      } else if (value && value.readable && hasOwn(value, "httpVersion")) {
         filename = path.basename(value.client._httpMessage.path || "");
       }
       if (filename) {
-        contentDisposition = 'filename="' + filename + '"';
+        return 'filename="' + filename + '"';
       }
-      return contentDisposition;
     };
     FormData3.prototype._getContentType = function(value, options) {
       var contentType = options.contentType;
-      if (!contentType && value.name) {
+      if (!contentType && value && value.name) {
         contentType = mime.lookup(value.name);
       }
-      if (!contentType && value.path) {
+      if (!contentType && value && value.path) {
         contentType = mime.lookup(value.path);
       }
-      if (!contentType && value.readable && Object.prototype.hasOwnProperty.call(value, "httpVersion")) {
+      if (!contentType && value && value.readable && hasOwn(value, "httpVersion")) {
         contentType = value.headers["content-type"];
       }
       if (!contentType && (options.filepath || options.filename)) {
         contentType = mime.lookup(options.filepath || options.filename);
       }
-      if (!contentType && typeof value == "object") {
+      if (!contentType && value && typeof value === "object") {
         contentType = FormData3.DEFAULT_CONTENT_TYPE;
       }
       return contentType;
@@ -10164,13 +10164,16 @@ var require_form_data = __commonJS({
         "content-type": "multipart/form-data; boundary=" + this.getBoundary()
       };
       for (header in userHeaders) {
-        if (Object.prototype.hasOwnProperty.call(userHeaders, header)) {
+        if (hasOwn(userHeaders, header)) {
           formHeaders[header.toLowerCase()] = userHeaders[header];
         }
       }
       return formHeaders;
     };
     FormData3.prototype.setBoundary = function(boundary) {
+      if (typeof boundary !== "string") {
+        throw new TypeError("FormData boundary must be a string");
+      }
       this._boundary = boundary;
     };
     FormData3.prototype.getBoundary = function() {
@@ -10241,8 +10244,10 @@ var require_form_data = __commonJS({
       });
     };
     FormData3.prototype.submit = function(params, cb) {
-      var request, options, defaults2 = { method: "post" };
-      if (typeof params == "string") {
+      var request;
+      var options;
+      var defaults2 = { method: "post" };
+      if (typeof params === "string") {
         params = parseUrl(params);
         options = populate({
           port: params.port,
@@ -10253,11 +10258,11 @@ var require_form_data = __commonJS({
       } else {
         options = populate(params, defaults2);
         if (!options.port) {
-          options.port = options.protocol == "https:" ? 443 : 80;
+          options.port = options.protocol === "https:" ? 443 : 80;
         }
       }
       options.headers = this.getHeaders(params.headers);
-      if (options.protocol == "https:") {
+      if (options.protocol === "https:") {
         request = https2.request(options);
       } else {
         request = http2.request(options);
@@ -10296,6 +10301,7 @@ var require_form_data = __commonJS({
       return "[object FormData]";
     };
     setToStringTag(FormData3, "FormData");
+    module2.exports = FormData3;
   }
 });
 
@@ -11460,7 +11466,22 @@ function useVerificationRepo() {
   if (!db) {
     throw new import_utils2.InternalServerError("Unable to connect to server.");
   }
-  const collection = db.collection("verifications");
+  const namespace_collection = "verifications";
+  const collection = db.collection(namespace_collection);
+  const { getCache, setCache, delNamespace } = (0, import_utils2.useCache)();
+  function delCachedData() {
+    delNamespace(namespace_collection).then(() => {
+      import_utils2.logger.log({
+        level: "info",
+        message: `Cache namespace cleared for ${namespace_collection}`
+      });
+    }).catch((err) => {
+      import_utils2.logger.log({
+        level: "error",
+        message: `Failed to clear cache namespace for ${namespace_collection}: ${err.message}`
+      });
+    });
+  }
   async function createIndex() {
     try {
       await collection.createIndex([
@@ -11502,6 +11523,7 @@ function useVerificationRepo() {
     value = new MVerification(value);
     try {
       const res = await collection.insertOne(value, { session });
+      delCachedData();
       return res.insertedId;
     } catch (error) {
       import_utils2.logger.log({ level: "error", message: `${error}` });
@@ -11524,7 +11546,30 @@ function useVerificationRepo() {
       throw new import_utils2.BadRequestError("Invalid ID.");
     }
     try {
-      return await collection.findOne({ _id });
+      const cacheKey = (0, import_utils2.makeCacheKey)(namespace_collection, {
+        id: _id.toString()
+      });
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        import_utils2.logger.log({
+          level: "info",
+          message: `Cache hit for getById verification: ${cacheKey}`
+        });
+        return cached;
+      }
+      const data = await collection.findOne({ _id });
+      setCache(cacheKey, data).then(() => {
+        import_utils2.logger.log({
+          level: "info",
+          message: `Cache set for verification by id: ${cacheKey}`
+        });
+      }).catch((err) => {
+        import_utils2.logger.log({
+          level: "error",
+          message: `Failed to set cache for verification by id: ${err.message}`
+        });
+      });
+      return data;
     } catch (error) {
       throw new import_utils2.InternalServerError(
         "Internal server error, failed to retrieve verification."
@@ -11543,20 +11588,36 @@ function useVerificationRepo() {
   } = {}) {
     page = page > 0 ? page - 1 : 0;
     const query = { status };
+    const cacheKeyOptions = { status, limit, page };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
+    cacheKeyOptions.sort = JSON.stringify(sort);
     if (app) {
       query["metadata.app"] = app;
+      cacheKeyOptions.app = app;
     }
     if (search) {
       query.$text = { $search: search };
+      cacheKeyOptions.search = search;
     }
     if (Array.isArray(type)) {
       query.type = { $in: type };
+      cacheKeyOptions.type = JSON.stringify(type);
     } else if (type) {
       query.type = type;
+      cacheKeyOptions.type = type;
     }
     if (email) {
       query.email = email;
+      cacheKeyOptions.email = email;
+    }
+    const cacheKey = (0, import_utils2.makeCacheKey)(namespace_collection, cacheKeyOptions);
+    const cached = await getCache(cacheKey);
+    if (cached) {
+      import_utils2.logger.log({
+        level: "info",
+        message: `Cache hit for getVerifications: ${cacheKey}`
+      });
+      return cached;
     }
     try {
       const items = await collection.aggregate([
@@ -11576,7 +11637,19 @@ function useVerificationRepo() {
         }
       ]).toArray();
       const length = await collection.countDocuments(query);
-      return (0, import_utils2.paginate)(items, page, limit, length);
+      const data = (0, import_utils2.paginate)(items, page, limit, length);
+      setCache(cacheKey, data).then(() => {
+        import_utils2.logger.log({
+          level: "info",
+          message: `Cache set for getVerifications: ${cacheKey}`
+        });
+      }).catch((err) => {
+        import_utils2.logger.log({
+          level: "error",
+          message: `Failed to set cache for getVerifications: ${err.message}`
+        });
+      });
+      return data;
     } catch (error) {
       import_utils2.logger.log({ level: "error", message: `${error}` });
       throw error;
@@ -11584,7 +11657,30 @@ function useVerificationRepo() {
   }
   async function getByIdByType(type) {
     try {
-      return await collection.find({ type }).toArray();
+      const cacheKey = (0, import_utils2.makeCacheKey)(namespace_collection, {
+        type
+      });
+      const cached = await getCache(cacheKey);
+      if (cached) {
+        import_utils2.logger.log({
+          level: "info",
+          message: `Cache hit for getByIdByType verification: ${cacheKey}`
+        });
+        return cached;
+      }
+      const data = await collection.find({ type }).toArray();
+      setCache(cacheKey, data).then(() => {
+        import_utils2.logger.log({
+          level: "info",
+          message: `Cache set for verification by type: ${cacheKey}`
+        });
+      }).catch((err) => {
+        import_utils2.logger.log({
+          level: "error",
+          message: `Failed to set cache for verification by type: ${err.message}`
+        });
+      });
+      return data;
     } catch (error) {
       return Promise.reject(error);
     }
@@ -11596,11 +11692,13 @@ function useVerificationRepo() {
       throw new import_utils2.BadRequestError("Invalid ID.");
     }
     try {
-      return await collection.updateOne(
+      const result = await collection.updateOne(
         { _id },
         { $set: { status, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
         { session }
       );
+      delCachedData();
+      return result;
     } catch (error) {
       throw new import_utils2.InternalServerError("Error updating verification status.");
     }
@@ -12298,8 +12396,8 @@ function useMemberRepo() {
     limit = limit > 0 ? limit : 10;
     search = search || "";
     page = page > 0 ? page - 1 : 0;
-    const query = { type, status, limit, page };
-    const cacheKeyOptions = { type, status };
+    const query = { type, status };
+    const cacheKeyOptions = { type, status, limit, page };
     if (user) {
       cacheKeyOptions.user = String(user);
       try {
@@ -12326,7 +12424,7 @@ function useMemberRepo() {
       message: `Cache key for getAll members: ${cacheKey}`
     });
     const cached = await getCache(cacheKey);
-    if (cached) {
+    if (cached && cached.items.length) {
       import_utils5.logger.log({
         level: "info",
         message: `Cache hit for getAll members: ${cacheKey}`
@@ -13752,6 +13850,9 @@ function toFormData(obj, formData, options) {
     if (utils_default.isDate(value)) {
       return value.toISOString();
     }
+    if (utils_default.isBoolean(value)) {
+      return value.toString();
+    }
     if (!useBlob && utils_default.isBlob(value)) {
       throw new AxiosError_default("Blob is not supported. Use a Buffer instead.");
     }
@@ -14538,7 +14639,7 @@ var import_follow_redirects = __toESM(require_follow_redirects(), 1);
 var import_zlib = __toESM(require("zlib"), 1);
 
 // node_modules/axios/lib/env/data.js
-var VERSION = "1.9.0";
+var VERSION = "1.10.0";
 
 // node_modules/axios/lib/helpers/parseProtocol.js
 function parseProtocol(url2) {
@@ -15953,7 +16054,7 @@ var fetch_default = isFetchSupported && (async (config2) => {
       duplex: "half",
       credentials: isCredentialsSupported ? withCredentials : void 0
     });
-    let response = await fetch(request);
+    let response = await fetch(request, fetchOptions);
     const isStreamResponse = supportsResponseStream && (responseType === "stream" || responseType === "response");
     if (supportsResponseStream && (onDownloadProgress || isStreamResponse && unsubscribe)) {
       const options = {};