@bettercorp/service-base - npm Package Compare versions

Comparing version 8.4.35 to 8.4.36

lib/base/logFormatter.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogFormatter = void 0;
-const tools_1 = require("@bettercorp/tools");
+const Tools_1 = require("@bettercorp/tools/lib/Tools");
 class LogFormatter {
     isUnsafeLogData(value) {
-        return tools_1.Tools.isObject(value) && !tools_1.Tools.isNullOrUndefined(value.safeValue);
+        return Tools_1.Tools.isObject(value) && !Tools_1.Tools.isNullOrUndefined(value.safeValue);
     }
     getSafeData(data, key) {
-        if (tools_1.Tools.isNullOrUndefined(data))
+        if (Tools_1.Tools.isNullOrUndefined(data))
             return null;
@@ -19,12 +19,12 @@ const dataFromKeyVP = data[key];
         const referencedVar = this.getSafeData(meta, key);
-        if (tools_1.Tools.isNullOrUndefined(referencedVar))
+        if (Tools_1.Tools.isNullOrUndefined(referencedVar))
             return "*null/undefined*";
-        if (tools_1.Tools.isDate(referencedVar))
+        if (Tools_1.Tools.isDate(referencedVar))
             return referencedVar.toISOString();
-        if (tools_1.Tools.isString(referencedVar))
+        if (Tools_1.Tools.isString(referencedVar))
             return referencedVar;
-        if (tools_1.Tools.isArray(referencedVar))
+        if (Tools_1.Tools.isArray(referencedVar))
             return referencedVar
-                .map((x) => tools_1.Tools.isSimpleType(x)
-                ? tools_1.Tools.isString(x)
+                .map((x) => Tools_1.Tools.isSimpleType(x)
+                ? Tools_1.Tools.isString(x)
                     ? x
@@ -37,3 +37,3 @@ : x.toString()
     formatLog(message, meta) {
-        if (!tools_1.Tools.isObject(meta))
+        if (!Tools_1.Tools.isObject(meta))
             return message;
@@ -40,0 +40,0 @@ const dataToParse = message.split("{");

lib/plugins/config-default/plugin.js

@@ -32,3 +32,3 @@ "use strict";
 const plugins_1 = require("../../interfaces/plugins");
-const tools_1 = require("@bettercorp/tools");
+const Tools_1 = require("@bettercorp/tools/lib/Tools");
 const errorMessages_1 = require("../../base/errorMessages");
@@ -115,3 +115,3 @@ class Plugin extends config_1.BSBConfig {
             configKey = "logging";
-        return this._appConfig[this._deploymentProfile][configKey][plugin].config ?? null;
+        return (this._appConfig[this._deploymentProfile][configKey][plugin].config ?? null);
     }
@@ -127,7 +127,7 @@ dispose() {
     init() {
-        if (tools_1.Tools.isString(process.env.BSB_PROFILE) &&
+        if (Tools_1.Tools.isString(process.env.BSB_PROFILE) &&
             process.env.BSB_PROFILE.length > 2) {
             this._deploymentProfile = process.env.BSB_PROFILE;
         }
-        if (tools_1.Tools.isString(process.env.BSB_CONFIG_FILE) &&
+        if (Tools_1.Tools.isString(process.env.BSB_CONFIG_FILE) &&
             process.env.BSB_CONFIG_FILE.length > 2) {
@@ -153,3 +153,3 @@ this._secConfigFilePath = process.env.BSB_CONFIG_FILE;
         }
-        if (tools_1.Tools.isNullOrUndefined(this._appConfig[this._deploymentProfile])) {
+        if (Tools_1.Tools.isNullOrUndefined(this._appConfig[this._deploymentProfile])) {
             throw new errorMessages_1.BSBError("DEFAULT_CONFIG_SETUP_DEFINITION", "unknown deployment profile ({deploymentProfile}), please create it first.", {
@@ -156,0 +156,0 @@ deploymentProfile: this._deploymentProfile,

lib/serviceBase/config.js

@@ -6,4 +6,4 @@ "use strict";
 const PluginLogger_1 = require("../base/PluginLogger");
-const tools_1 = require("@bettercorp/tools");
 const functions_1 = require("../base/functions");
+const Tools_1 = require("@bettercorp/tools/lib/Tools");
 class SBConfig {
@@ -54,6 +54,6 @@ constructor(appId, mode, cwd, sbLogging, sbPlugins) {
     async init() {
-        if (tools_1.Tools.isString(process.env.BSB_LOGGER_PLUGIN) &&
+        if (Tools_1.Tools.isString(process.env.BSB_LOGGER_PLUGIN) &&
             process.env.BSB_LOGGER_PLUGIN.startsWith("config-")) {
             this.configPluginName = process.env.BSB_LOGGER_PLUGIN;
-            if (tools_1.Tools.isString(process.env.BSB_LOGGER_PLUGIN_PACKAGE)) {
+            if (Tools_1.Tools.isString(process.env.BSB_LOGGER_PLUGIN_PACKAGE)) {
                 this.configPackage = process.env.BSB_LOGGER_PLUGIN_PACKAGE;
@@ -60,0 +60,0 @@ }

lib/serviceBase/events.js

@@ -6,3 +6,2 @@ "use strict";
 const plugin_1 = require("../plugins/events-default/plugin");
-const tools_1 = require("@bettercorp/tools");
 const functions_1 = require("../base/functions");
@@ -12,2 +11,3 @@ const events_1 = require("../interfaces/events");
 const serviceBase_1 = require("./serviceBase");
+const Tools_1 = require("@bettercorp/tools/lib/Tools");
 class SBEvents {
@@ -32,5 +32,5 @@ constructor(appId, mode, cwd, sbPlugins, sbLogging) {
         return this.events.find((eventPlugin) => {
-            if (tools_1.Tools.isNullOrUndefined(eventPlugin.plugin))
+            if (Tools_1.Tools.isNullOrUndefined(eventPlugin.plugin))
                 return false;
-            if (tools_1.Tools.isNullOrUndefined(eventPlugin.on))
+            if (Tools_1.Tools.isNullOrUndefined(eventPlugin.on))
                 return true;
@@ -43,11 +43,11 @@ switch (eventPlugin.onTypeof) {
                 case "eventsState":
-                    if (tools_1.Tools.isNullOrUndefined(eventPlugin.on[event]))
+                    if (Tools_1.Tools.isNullOrUndefined(eventPlugin.on[event]))
                         return false;
                     return eventPlugin.on[event];
                 case "eventsPlugins":
-                    if (tools_1.Tools.isNullOrUndefined(eventPlugin.on[event]))
+                    if (Tools_1.Tools.isNullOrUndefined(eventPlugin.on[event]))
                         return false;
                     return eventPlugin.on[event].includes(plugin);
                 case "eventsDetailed":
-                    if (tools_1.Tools.isNullOrUndefined(eventPlugin.on[event]))
+                    if (Tools_1.Tools.isNullOrUndefined(eventPlugin.on[event]))
                         return false;
@@ -188,7 +188,10 @@ if (eventPlugin.on[event].enabled !== true)
         let pluginConfig = await sbConfig.getPluginConfig("events", plugin.name);
-        if (newPlugin.serviceConfig !== null) {
+        if (!Tools_1.Tools.isNullOrUndefined(newPlugin) &&
+            !Tools_1.Tools.isNullOrUndefined(newPlugin.serviceConfig) &&
+            Tools_1.Tools.isObject(newPlugin.serviceConfig) &&
+            !Tools_1.Tools.isNullOrUndefined(newPlugin.serviceConfig.validationSchema)) {
             pluginConfig =
                 newPlugin.serviceConfig.validationSchema.parse(pluginConfig);
         }
-        else if (pluginConfig === null) {
+        else if (Tools_1.Tools.isNullOrUndefined(pluginConfig)) {
             pluginConfig = {};
@@ -195,0 +198,0 @@ }

lib/serviceBase/logging.js

@@ -8,4 +8,4 @@ "use strict";
 const stream_1 = require("stream");
-const tools_1 = require("@bettercorp/tools");
 const functions_1 = require("../base/functions");
+const Tools_1 = require("@bettercorp/tools/lib/Tools");
 class SBLogging {
@@ -63,5 +63,5 @@ constructor(appId, mode, cwd, sbPlugins) {
         return this.loggers.filter((logger) => {
-            if (tools_1.Tools.isNullOrUndefined(logger.plugin))
+            if (Tools_1.Tools.isNullOrUndefined(logger.plugin))
                 return false;
-            if (tools_1.Tools.isNullOrUndefined(logger.on))
+            if (Tools_1.Tools.isNullOrUndefined(logger.on))
                 return true;
@@ -74,11 +74,11 @@ switch (logger.onTypeof) {
                 case "eventsState":
-                    if (tools_1.Tools.isNullOrUndefined(logger.on[log]))
+                    if (Tools_1.Tools.isNullOrUndefined(logger.on[log]))
                         return false;
                     return logger.on[log];
                 case "eventsPlugins":
-                    if (tools_1.Tools.isNullOrUndefined(logger.on[log]))
+                    if (Tools_1.Tools.isNullOrUndefined(logger.on[log]))
                         return false;
                     return logger.on[log].includes(plugin);
                 case "eventsDetailed":
-                    if (tools_1.Tools.isNullOrUndefined(logger.on[log]))
+                    if (Tools_1.Tools.isNullOrUndefined(logger.on[log]))
                         return false;
@@ -139,3 +139,3 @@ if (logger.on[log].enabled !== true)
         const pluginsListeningToAll = this.loggers.filter((logger) => {
-            if (tools_1.Tools.isNullOrUndefined(logger.on))
+            if (Tools_1.Tools.isNullOrUndefined(logger.on))
                 return false;
@@ -233,7 +233,10 @@ if (logger.onTypeof === "all")
         let pluginConfig = await sbConfig.getPluginConfig("logging", plugin.name);
-        if (newPlugin.serviceConfig !== null) {
+        if (!Tools_1.Tools.isNullOrUndefined(newPlugin) &&
+            !Tools_1.Tools.isNullOrUndefined(newPlugin.serviceConfig) &&
+            Tools_1.Tools.isObject(newPlugin.serviceConfig) &&
+            !Tools_1.Tools.isNullOrUndefined(newPlugin.serviceConfig.validationSchema)) {
             pluginConfig =
                 newPlugin.serviceConfig.validationSchema.parse(pluginConfig);
         }
-        else if (pluginConfig === null) {
+        else if (Tools_1.Tools.isNullOrUndefined(pluginConfig)) {
             pluginConfig = {};
@@ -240,0 +243,0 @@ }

lib/serviceBase/services.js

@@ -8,2 +8,3 @@ "use strict";
 const PluginEvents_1 = require("../base/PluginEvents");
+const Tools_1 = require("@bettercorp/tools/lib/Tools");
 class SBServices {
@@ -155,7 +156,10 @@ constructor(appId, mode, cwd, sbPlugins, sbLogging) {
         let pluginConfig = await sbConfig.getPluginConfig("service", plugin.name);
-        if (newPlugin.serviceConfig !== null) {
+        if (!Tools_1.Tools.isNullOrUndefined(newPlugin) &&
+            !Tools_1.Tools.isNullOrUndefined(newPlugin.serviceConfig) &&
+            Tools_1.Tools.isObject(newPlugin.serviceConfig) &&
+            !Tools_1.Tools.isNullOrUndefined(newPlugin.serviceConfig.validationSchema)) {
             pluginConfig =
                 newPlugin.serviceConfig.validationSchema.parse(pluginConfig);
         }
-        else if (pluginConfig === null) {
+        else if (Tools_1.Tools.isNullOrUndefined(pluginConfig)) {
             pluginConfig = {};
@@ -162,0 +166,0 @@ }

package.json

@@ -32,24 +32,3 @@ {
   "main": "lib/index.js",
-  "version": "8.4.35",
-  "devDependencies": {
-    "@types/assert": "^1.5.10",
-    "@types/chai": "^4.3.11",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^20.10.5",
-    "@types/yargs": "^17.0.32",
-    "@typescript-eslint/eslint-plugin": "^6.14.0",
-    "@typescript-eslint/parser": "^6.14.0",
-    "chai": "^4.3.10",
-    "eslint": "^8.56.0",
-    "mocha": "^10.2.0",
-    "nyc": "^15.1.0",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.3.3",
-    "yargs": "^17.5.1"
-  },
-  "dependencies": {
-    "@bettercorp/tools": "^2.0.20220714140658",
-    "yaml": "^2.3.1",
-    "zod": "^3.21.4"
-  },
+  "version": "8.4.36",
   "bsb_project": true,
@@ -121,3 +100,24 @@ "bsbInit": {
     ]
+  },
+  "devDependencies": {
+    "@types/assert": "^1.5.10",
+    "@types/chai": "^4.3.11",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.10.5",
+    "@types/yargs": "^17.0.32",
+    "@typescript-eslint/eslint-plugin": "^6.15.0",
+    "@typescript-eslint/parser": "^6.15.0",
+    "chai": "^4.3.10",
+    "eslint": "^8.56.0",
+    "mocha": "^10.2.0",
+    "nyc": "^15.1.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
+  },
+  "dependencies": {
+    "@bettercorp/tools": "^3.6.0",
+    "yaml": "^2.3.4",
+    "zod": "^3.22.4",
+    "yargs": "^17.7.2"
   }
 }

No alert changes

Improved metrics

Total package byte prevSize

438456

increased by0.34%

Dev dependency count

13

decreased by-7.14%

Lines of code

5422

increased by0.18%

Worsened metrics

Dependency count

4

increased by33.33%

Dependency changes

• + Addedyargs@^17.7.2

• + Added@bettercorp/tools@3.7.2(transitive)

• + Addedansi-regex@5.0.1(transitive)

• + Addedansi-styles@4.3.0(transitive)

• + Addedcliui@8.0.1(transitive)

• + Addedcolor-convert@2.0.1(transitive)

• + Addedcolor-name@1.1.4(transitive)

• + Addedemoji-regex@8.0.0(transitive)

• + Addedescalade@3.2.0(transitive)

• + Addedget-caller-file@2.0.5(transitive)

• + Addedis-fullwidth-code-point@3.0.0(transitive)

• + Addedrequire-directory@2.1.1(transitive)

• + Addedstring-width@4.2.3(transitive)

• + Addedstrip-ansi@6.0.1(transitive)

• + Addedwrap-ansi@7.0.0(transitive)

• + Addedy18n@5.0.8(transitive)

• + Addedyargs@17.7.2(transitive)

• + Addedyargs-parser@21.1.1(transitive)

• - Removed@bettercorp/tools@2.1.30(transitive)

• - Removed@types/node@18.19.75(transitive)

• - Removedundici-types@5.26.5(transitive)

• Updated@bettercorp/tools@^3.6.0

• Updatedyaml@^2.3.4

• Updatedzod@^3.22.4