@tryghost/limit-service 1.2.9 → 1.2.10

package/lib/limit-service.js

@@ -1,7 +1,9 @@
+const camelCase = require('lodash/camelCase');
+const has = require('lodash/has');
+const {IncorrectUsageError} = require('@tryghost/errors');
+
 const {MaxLimit, MaxPeriodicLimit, FlagLimit, AllowlistLimit} = require('./limit');
 const config = require('./config');
-const {IncorrectUsageError} = require('@tryghost/errors');
-const _ = require('lodash');
 
 const messages = {
     missingErrorsConfig: `Config Missing: 'errors' is required.`,
@@ -36,18 +38,18 @@ class LimitService {
         this.limits = {};
 
         Object.keys(limits).forEach((name) => {
-            name = _.camelCase(name);
+            name = camelCase(name);
 
             // NOTE: config module acts as an allowlist of supported config names, where each key is a name of supported config
             if (config[name]) {
                 /** @type LimitConfig */
                 let limitConfig = Object.assign({}, config[name], limits[name]);
 
-                if (_.has(limitConfig, 'allowlist')) {
+                if (has(limitConfig, 'allowlist')) {
                     this.limits[name] = new AllowlistLimit({name, config: limitConfig, helpLink, errors});
-                } else if (_.has(limitConfig, 'max')) {
+                } else if (has(limitConfig, 'max')) {
                     this.limits[name] = new MaxLimit({name: name, config: limitConfig, helpLink, db, errors});
-                } else if (_.has(limitConfig, 'maxPeriodic')) {
+                } else if (has(limitConfig, 'maxPeriodic')) {
                     if (subscription === undefined) {
                         throw new IncorrectUsageError({
                             message: messages.noSubscriptionParameter
@@ -64,7 +66,7 @@ class LimitService {
     }
 
     isLimited(limitName) {
-        return !!this.limits[_.camelCase(limitName)];
+        return !!this.limits[camelCase(limitName)];
     }
 
     /**
@@ -147,7 +149,7 @@ class LimitService {
 
     /**
      * Checks if any of the configured limits acceded
-     * 
+     *
      * @param {Object} [options] - limit parameters
      * @param {Object} [options.transacting] Transaction to run the count queries on (if required for the chosen limit)
      * @returns {Promise<boolean>}

package/lib/limit.js

@@ -1,8 +1,8 @@
-// run in context allows us to change the templateSettings without causing havoc
-const _ = require('lodash').runInContext();
+const lowerCase = require('lodash/lowerCase');
+const template = require('lodash/template');
 const {lastPeriodStart, SUPPORTED_INTERVALS} = require('./date-utils');
 
-_.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
+const interpolate = /{{([\s\S]+?)}}/g;
 
 class Limit {
     /**
@@ -65,7 +65,7 @@ class MaxLimit extends Limit {
         this.currentCountQueryFn = config.currentCountQuery;
         this.max = config.max;
         this.formatter = config.formatter;
-        this.fallbackMessage = `This action would exceed the ${_.lowerCase(this.name)} limit on your current plan.`;
+        this.fallbackMessage = `This action would exceed the ${lowerCase(this.name)} limit on your current plan.`;
     }
 
     /**
@@ -81,7 +81,7 @@ class MaxLimit extends Limit {
         if (this.error) {
             const formatter = this.formatter || Intl.NumberFormat().format;
             try {
-                errorObj.message = _.template(this.error)(
+                errorObj.message = template(this.error, {interpolate})(
                     {
                         max: formatter(this.max),
                         count: formatter(count),
@@ -101,7 +101,7 @@ class MaxLimit extends Limit {
     /**
      * @param {Object} [options]
      * @param {Object} [options.transacting] Transaction to run the count query on
-     * @returns 
+     * @returns
      */
     async currentCountQuery(options = {}) {
         return await this.currentCountQueryFn(options.transacting ?? this.db?.knex);
@@ -183,7 +183,7 @@ class MaxPeriodicLimit extends Limit {
         this.maxPeriodic = config.maxPeriodic;
         this.interval = config.interval;
         this.startDate = config.startDate;
-        this.fallbackMessage = `This action would exceed the ${_.lowerCase(this.name)} limit on your current plan.`;
+        this.fallbackMessage = `This action would exceed the ${lowerCase(this.name)} limit on your current plan.`;
     }
 
     generateError(count) {
@@ -193,7 +193,7 @@ class MaxPeriodicLimit extends Limit {
 
         if (this.error) {
             try {
-                errorObj.message = _.template(this.error)(
+                errorObj.message = template(this.error, {interpolate})(
                     {
                         max: Intl.NumberFormat().format(this.maxPeriodic),
                         count: Intl.NumberFormat().format(count),
@@ -213,7 +213,7 @@ class MaxPeriodicLimit extends Limit {
     /**
      * @param {Object} [options]
      * @param {Object} [options.transacting] Transaction to run the count query on
-     * @returns 
+     * @returns
      */
     async currentCountQuery(options = {}) {
         const lastPeriodStartDate = lastPeriodStart(this.startDate, this.interval);
@@ -271,7 +271,7 @@ class FlagLimit extends Limit {
         super({name, error: config.error || '', helpLink, db, errors});
 
         this.disabled = config.disabled;
-        this.fallbackMessage = `Your plan does not support ${_.lowerCase(this.name)}. Please upgrade to enable ${_.lowerCase(this.name)}.`;
+        this.fallbackMessage = `Your plan does not support ${lowerCase(this.name)}. Please upgrade to enable ${lowerCase(this.name)}.`;
     }
 
     generateError() {
@@ -323,7 +323,7 @@ class AllowlistLimit extends Limit {
         }
 
         this.allowlist = config.allowlist;
-        this.fallbackMessage = `This action would exceed the ${_.lowerCase(this.name)} limit on your current plan.`;
+        this.fallbackMessage = `This action would exceed the ${lowerCase(this.name)} limit on your current plan.`;
     }
 
     generateError() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/limit-service",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "repository": "https://github.com/TryGhost/SDK/tree/main/packages/limit-service",
   "author": "Ghost Foundation",
   "license": "MIT",
@@ -30,5 +30,5 @@
     "lodash": "^4.17.21",
     "luxon": "^1.26.0"
   },
-  "gitHead": "0d13f8dc53790a6a33280f7b0b709d7dc88d6d65"
+  "gitHead": "2ca4cf6106e708da5d7df4fd73ea2d9024ddd8ef"
 }