Merge pull request #9 from emartech/prtest

Test reqwrite and formatting

Author: sonicoder86

.eslintrc

@@ -10,16 +10,18 @@
       "impliedStrict": true
     }
   },
-  "globals": {
-    "expect": true
-  },
+  "plugins": ["@typescript-eslint", "prettier"],
   "rules": {
-    "security/detect-object-injection": 0,
     "security/detect-non-literal-regexp": 0,
     "no-unused-expressions": 0,
-    "func-style": 0
+    "@typescript-eslint/no-explicit-any": 0,
+    "@typescript-eslint/ban-types": 0,
+    "comma-dangle": 0
   },
   "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended",
     "emarsys"
   ]
 }

.npmignore

@@ -1,5 +1,8 @@
 *.spec.js
+*.spec.d.ts
 node_modules
 .idea
 examples
 src
+.eslintrc
+.prettierrc

.prettierrc

@@ -0,0 +1,10 @@
+{
+  "parser": "typescript",
+  "bracketSpacing": true,
+  "trailingComma": "all",
+  "singleQuote": true,
+  "semi": true,
+  "useTabs": false,
+  "tabWidth": 2,
+  "printWidth": 120
+}

README.md

@@ -10,6 +10,7 @@ npm install @emartech/json-logger
 ```
 
 
+
 ### Usage
 
 #### Script

package.json

@@ -3,9 +3,10 @@
   "description": "Tiny and fast json logger with namespace support",
   "main": "dist/index.js",
   "scripts": {
-    "test": "mocha --require ts-node/register ./src --recursive",
-    "test:watch": "mocha --require ts-node/register ./src --recursive --watch",
-    "lint": "eslint ./src/**/*.{ts,js}",
+    "test": "mocha --require ts-node/register --extension ts ./src --recursive",
+    "test:watch": "mocha --require ts-node/register --extension ts ./src --recursive --watch",
+    "lint": "eslint ./src/**/*.ts",
+    "lint:fix": "eslint ./src/**/*.ts --fix",
     "build": "rm -rf dist && tsc --project ./tsconfig.json",
     "release": "CI=true semantic-release",
     "example-js": "DEBUG=* node examples/index-js.js",
@@ -25,21 +26,31 @@
     "debug",
     "json"
   ],
-  "dependencies": {},
   "devDependencies": {
-    "@types/node": "18.7.14",
-    "@typescript-eslint/parser": "5.36.1",
+    "@types/chai": "4.3.3",
+    "@types/mocha": "10.0.0",
+    "@types/node": "18.7.23",
+    "@types/sinon": "10.0.13",
+    "@types/sinon-chai": "3.2.8",
+    "@typescript-eslint/eslint-plugin": "5.38.1",
+    "@typescript-eslint/parser": "5.38.1",
+    "axios": "0.27.2",
     "chai": "4.3.6",
-    "eslint": "8.23.0",
+    "eslint": "8.24.0",
     "eslint-config-emarsys": "5.1.0",
+    "eslint-config-prettier": "8.5.0",
     "eslint-plugin-no-only-tests": "3.0.0",
+    "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-security": "1.5.0",
+    "install": "0.13.0",
     "mocha": "10.0.0",
+    "npm": "8.19.2",
+    "prettier": "2.7.1",
     "semantic-release": "19.0.5",
     "sinon": "14.0.0",
     "sinon-chai": "3.7.0",
     "ts-node": "10.9.1",
-    "typescript": "4.8.3"
+    "typescript": "4.8.4"
   },
   "repository": {
     "type": "git",

src/enabled/enabled.spec.js

@@ -0,0 +1,35 @@
+import { isNamespaceEnabled } from './enabled';
+import { expect } from 'chai';
+
+describe('isNamespaceAvailable', () => {
+  it('should enable when variables only contain one', () => {
+    expect(isNamespaceEnabled('mongo', 'mongo')).to.eql(true);
+  });
+
+  it('should disable when not in availables', () => {
+    expect(isNamespaceEnabled('mongo', 'redis')).to.eql(false);
+  });
+
+  it('should enable when part of available and available contains *', () => {
+    expect(isNamespaceEnabled('mongo*', 'mongolab')).to.eql(true);
+  });
+
+  it('should allow multiple available namespaces', () => {
+    const availableNamespaces = 'mongo,redis';
+
+    expect(isNamespaceEnabled(availableNamespaces, 'mongo')).to.eql(true);
+    expect(isNamespaceEnabled(availableNamespaces, 'redis')).to.eql(true);
+  });
+
+  it('should disable names starting with -', () => {
+    expect(isNamespaceEnabled('mongo*,-*lab', 'mongolab')).to.eql(false);
+  });
+
+  it('should not work with empty strings', () => {
+    expect(isNamespaceEnabled('', '')).to.eql(false);
+  });
+
+  it('should enable everything for star', () => {
+    expect(isNamespaceEnabled('*', 'mongo')).to.eql(true);
+  });
+});

src/enabled/enabled.spec.ts

@@ -1,10 +1,10 @@
-export function isNamespaceEnabled(availableNamespace: string, namespace: string) {
+export const isNamespaceEnabled = (availableNamespace: string, namespace: string) => {
   const availableNamespaces = availableNamespace.split(/[\s,]+/);
   let enabled = false;
   const adds: RegExp[] = [];
   const skips: RegExp[] = [];
 
-  availableNamespaces.forEach(function(name) {
+  availableNamespaces.forEach((name) => {
     if (!name) {
       return;
     }
@@ -17,17 +17,17 @@ export function isNamespaceEnabled(availableNamespace: string, namespace: string
     }
   });
 
-  adds.forEach(function(addRegexp) {
+  adds.forEach((addRegexp) => {
     if (addRegexp.test(namespace)) {
       enabled = true;
     }
   });
 
-  skips.forEach(function(addRegexp) {
+  skips.forEach((addRegexp) => {
     if (addRegexp.test(namespace)) {
       enabled = false;
     }
   });
 
   return enabled;
-}
+};

src/enabled/enabled.ts

@@ -3,5 +3,5 @@ import { logentriesFormatter } from './logentries';
 
 export const formatter = {
   json: jsonFormatter,
-  logentries: logentriesFormatter
+  logentries: logentriesFormatter,
 };