Merge pull request #61 from Olian04/dev

4.5.1
Olian04 · Oct 12, 2021 · b801acf · b801acf
2 parents 6e43a75 + adf51eb
commit b801acf
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 45 deletions.
diff --git a/.npmignore b/.npmignore
@@ -8,4 +8,6 @@ rollup.config.js
 tsconfig.json
 tslint.json
 .github
-.vscode
+.vscode
+.editorconfig
+docs
diff --git a/docs/index.rst b/docs/index.rst
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "better-logging",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "better-logging is a drop in replacement for the default logging methods of node.js",
   "main": "./index.js",
   "typings": "./dist/api.d.ts",
@@ -18,6 +18,9 @@
     "lint": "tslint --fix -c ./tslint.json 'src/**/*.ts'",
     "lint:nofix": "tslint -c ./tslint.json 'src/**/*.ts'"
   },
+  "engines": {
+    "node": ">=12"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Olian04/better-logging.git"
@@ -42,7 +45,7 @@
   "homepage": "https://github.com/Olian04/better-logging#readme",
   "dependencies": {
     "@olian/typescript-helpers": "^2.3.0",
-    "@types/node": "^14.14.35",
+    "@types/node": "^14.17.22",
     "chalk": "^4.1.0",
     "fast-safe-stringify": "^2.0.7"
   },

diff --git a/src/lib/config.ts b/src/lib/config.ts
@@ -57,7 +57,12 @@ export const resolveConfig = (config: PartialConfig) =>
       DefaultConfig.format,
       treatAsFalsy
     ),
-    saveToFile: useValueOrFallback(config, 'saveToFile', null, treatAsFalsy),
+    saveToFile: useValueOrFallback(
+      config,
+      'saveToFile',
+      DefaultConfig.saveToFile,
+      treatAsFalsy
+    ),
     color: !config.color
       ? DefaultConfig.color
       : {

diff --git a/src/lib/formatMessage.ts b/src/lib/formatMessage.ts
@@ -44,4 +44,4 @@ export const formatMessage = (logType: LogType, config: Config, args: unknown[])
   const formattingContext = constructFormattingContext(logType, config, rawMessage);
   const formattedMessage = config.format(formattingContext);
   return [formattedMessage, remainingArgs];
-}
+}
diff --git a/test/unit-tests/config.test.js b/test/unit-tests/config.test.js
@@ -10,4 +10,12 @@ describe('Config', () => {
 
     expect(config.format).to.equal(DefaultConfig.format);
   });
+
+  it('Null Format Function', () => {
+    const config = resolveConfig({
+      format: null,
+    });
+
+    expect(config.format).to.equal(DefaultConfig.format);
+  });
 });