Merge pull request #6 from Bardigan/feature/split-config

Split Config into utils

Author: mjurczyk

package.json

@@ -13,7 +13,7 @@
     "lint:fix": "npm run lint -- --fix",
     "test": "cross-env BABEL_ENV=test npm run test:unit",
     "test:watch": "cross-env BABEL_ENV=test npm run test:unit -- -w -R dot",
-    "test:unit": "mocha --compilers js:babel-core/register './test/**/*.spec.js' --require babel-polyfill",
+    "test:unit": "mocha --compilers js:babel-core/register test/**/*.spec.js --require babel-polyfill",
     "test:live": "npm run test && npm run build && npm pack && npm install -g json-viewer-*.tgz",
     "coverage": "cross-env BABEL_ENV=test nyc --reporter=lcov npm run test:unit",
     "coverage:html": "cross-env BABEL_ENV=test nyc --reporter=html npm run test:unit"

src/config.js

@@ -1,5 +1,5 @@
 import { jsonViewer } from '@src/json-viewer';
-import { setUserConfig, getUserConfig } from '@src/config';
+import { setUserConfig, getUserConfig } from '@utils/config';
 import { getCliParams, getCliInput } from '@utils/cli';
 import { prettyPrint } from '@utils/console/pretty-print';
 

src/index.js

@@ -0,0 +1,3 @@
+import { defaultConfig } from '@utils/config';
+
+export const getDefaultConfig = () => defaultConfig;

src/utils/config/get-default-config.js

@@ -0,0 +1,11 @@
+import { readJsonFile } from '@utils/files';
+import { userConfigFile, defaultConfig } from '@utils/config';
+
+export const getUserConfig = (filepath = '') => {
+  const userConfig = readJsonFile(filepath || userConfigFile);
+
+  return {
+    ...defaultConfig,
+    ...userConfig
+  };
+};

src/utils/config/get-user-config.js

@@ -0,0 +1,11 @@
+import path from 'path';
+
+export const defaultConfig = {
+  color: false
+};
+
+export const userConfigFile = path.resolve(process.cwd(), '.user-config.json');
+
+export * from './get-default-config';
+export * from './get-user-config';
+export * from './set-user-config';

src/utils/config/index.js

@@ -0,0 +1,17 @@
+import { writeJsonFile } from '@utils/files';
+import { userConfigFile, defaultConfig } from '@utils/config';
+
+export const setUserConfig = (params = {}, userConfig = {}) => {
+  const paramsConfig = {
+    color: params.alwaysColor || userConfig.color || defaultConfig.color
+  };
+  const newConfig = {
+    ...defaultConfig,
+    ...userConfig,
+    ...paramsConfig
+  };
+
+  writeJsonFile(userConfigFile, newConfig);
+
+  return newConfig;
+};

src/utils/config/set-user-config.js

@@ -1,6 +1,6 @@
 import path from 'path';
 import { expect } from 'chai';
-import { defaultConfig, userConfigFile, getDefaultConfig, getUserConfig, setUserConfig } from '@src/config';
+import { defaultConfig, userConfigFile, getDefaultConfig, getUserConfig, setUserConfig } from '@utils/config';
 
 describe('config', () => {
   describe('userConfigFile', () => {