Merge pull request #3 from jaanauati/organize-modules

reorganize code into modules.
jaanauati · Jun 7, 2017 · 8914bc2 · 8914bc2
2 parents 5ada66b + d336fe4
commit 8914bc2
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 108 deletions.
diff --git a/README.md b/README.md
@@ -18,8 +18,6 @@ Usage:
 
 
 ## TODO:
-
-- Code lacks of organization, would be great to all the things splited in files (redurcers, ations, containers, etc)
 - case sensitive / insensite searchs.
 - regular expressions.
 

diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "hyper-search",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "text searhing support for hyper.js",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 0",
-    "eslint": "node_modules/eslint/bin/eslint.js ."
+    "eslint": "node_modules/eslint/bin/eslint.js src/*.js"
   },
   "repository": {
     "type": "git",

diff --git a/src/actionTypes.js b/src/actionTypes.js
@@ -0,0 +1,3 @@
+exports.TOGGLE_SEARCH_INPUT = 'HS_TOGGLE_SEARCH_INPUT';
+exports.UPDATE_SEARCH_TEXT = 'HS_UPDATE_SEARCH_TEXT';
+exports.CURRENT_MATCH = 'HS_CURRENT_MATCH';
diff --git a/src/actions.js b/src/actions.js
@@ -0,0 +1,19 @@
+const { CURRENT_MATCH, TOGGLE_SEARCH_INPUT, UPDATE_SEARCH_TEXT } = require('./actionTypes');
+
+module.exports.setCurrentMatch = function setCurrentMatch(uid, row, startIndex, endIndex) {
+  return (dispatch) => {
+    dispatch({ type: CURRENT_MATCH, data: { uid, row, startIndex, endIndex } });
+  };
+};
+
+module.exports.toggleSearchInput = function toggleSearchInput(uid) {
+  return (dispatch) => {
+    dispatch({ type: TOGGLE_SEARCH_INPUT, uid });
+  };
+};
+
+module.exports.updateSearchText = function updateSearchText(uid, text) {
+  return (dispatch) => {
+    dispatch({ type: UPDATE_SEARCH_TEXT, uid, text });
+  };
+};
diff --git a/src/constants.js b/src/constants.js
@@ -0,0 +1,5 @@
+module.exports.LEAD_KEY = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
+module.exports.EDIT = 'Edit';
+module.exports.ENTER = 'Enter';
+module.exports.DIRECTION_NEXT = 1;
+module.exports.DIRECTION_PREV = -1;
diff --git a/index.js → src/containers.js b/index.js → src/containers.js
@@ -1,102 +1,5 @@
-// some constants
-const prefix = process.platform === 'darwin' ? 'Cmd' : 'Ctrl';
-
-const EDIT = 'Edit';
-const ENTER = 'Enter';
-const DIRECTION_NEXT = 1;
-const DIRECTION_PREV = -1;
-
-// action types
-const TOGGLE_SEARCH_INPUT = 'HS_TOGGLE_SEARCH_INPUT';
-const UPDATE_SEARCH_TEXT = 'HS_UPDATE_SEARCH_TEXT';
-const CURRENT_MATCH = 'HS_CURRENT_MATCH';
-
-// action creators
-function setCurrentMatch(uid, row, startIndex, endIndex) {
-  return (dispatch) => {
-    dispatch({ type: CURRENT_MATCH, data: { uid, row, startIndex, endIndex } });
-  };
-}
-
-function toggleSearchInput(uid) {
-  return (dispatch) => {
-    dispatch({ type: TOGGLE_SEARCH_INPUT, uid });
-  };
-}
-
-function updateSearchText(uid, text) {
-  return (dispatch) => {
-    dispatch({ type: UPDATE_SEARCH_TEXT, uid, text });
-  };
-}
-
-// reducer
-exports.reduceUI = (state, action) => {
-  switch (action.type) {
-    case TOGGLE_SEARCH_INPUT: {
-      const uid = action.uid;
-      const { hyperSearchToggleInput = {} } = state;
-      return state.set(
-        'hyperSearchToggleInput',
-        Object.assign({}, hyperSearchToggleInput, { [uid]: !hyperSearchToggleInput[uid] })
-      );
-    }
-    case UPDATE_SEARCH_TEXT: {
-      const { hyperSearchInputText = {} } = state;
-      return state.set('hyperSearchInputText',
-        Object.assign({}, hyperSearchInputText, { [action.uid]: action.text }));
-    }
-    case CURRENT_MATCH: {
-      const { hyperSearchCurrentRow = {} } = state;
-      const { uid, row, startIndex, endIndex } = action.data;
-      return state.set('hyperSearchCurrentRow',
-        Object.assign({}, hyperSearchCurrentRow, { [uid]: { row, startIndex, endIndex } }));
-    }
-    default:
-      return state;
-  }
-};
-
-exports.decorateMenu = (menu) => {
-  for (const menuItem of menu) {
-    if (menuItem.label === EDIT) {
-      menuItem.submenu = menuItem.submenu.concat({
-        label: 'Find',
-        submenu: [
-          {
-            label: 'Toggle Find Bar',
-            accelerator: `${prefix}+F`,
-            click(item, focusedWindow) {
-              if (focusedWindow !== null) {
-                focusedWindow.rpc.emit('hyper-search:toggle:input', { focusedWindow });
-              }
-            },
-          },
-          {
-            label: 'Find Next',
-            accelerator: `${prefix}+G`,
-            click(item, focusedWindow) {
-              if (focusedWindow !== null) {
-                focusedWindow.rpc.emit('hyper-search:seach:next', { focusedWindow });
-              }
-            },
-          },
-          {
-            label: 'Find Previous',
-            accelerator: `${prefix}+Shift+G`,
-            click(item, focusedWindow) {
-              if (focusedWindow !== null) {
-                focusedWindow.rpc.emit('hyper-search:seach:prev', { focusedWindow });
-              }
-            },
-          },
-        ],
-      });
-      break;
-    }
-  }
-  return menu;
-};
+const { setCurrentMatch, toggleSearchInput, updateSearchText } = require('./actions');
+const { DIRECTION_NEXT, DIRECTION_PREV, ENTER } = require('./constants');
 
 exports.mapTermsState = (state, map) => (
   Object.assign(map, {
@@ -108,8 +11,7 @@ exports.mapTermsState = (state, map) => (
   })
 );
 
-
-const passProps = (uid, parentProps, props) => (
+exports.passProps = (uid, parentProps, props) => (
   Object.assign(props, {
     focussedSessionUid: parentProps.focussedSessionUid,
     hyperSearchToggleInput: parentProps.hyperSearchToggleInput,
@@ -119,8 +21,8 @@ const passProps = (uid, parentProps, props) => (
   })
 );
 
-exports.getTermGroupProps = passProps;
-exports.getTermProps = passProps;
+exports.getTermGroupProps = exports.passProps;
+exports.getTermProps = exports.passProps;
 
 exports.decorateTerm = (Term, { React }) => {
   class HyperSearchTerm extends React.Component {

diff --git a/src/index.js b/src/index.js
@@ -0,0 +1,12 @@
+
+const { decorateTerm, mapTermsState, passProps, getTermGroupProps, getTermProps } = require('./containers');
+const { decorateMenu } = require('./menu');
+const { reduceUI } = require('./reducers');
+
+exports.reduceUI = reduceUI;
+exports.decorateMenu = decorateMenu;
+exports.decorateTerm = decorateTerm;
+exports.mapTermsState = mapTermsState;
+exports.passProps = passProps;
+exports.getTermGroupProps = getTermGroupProps;
+exports.getTermProps = getTermProps;
diff --git a/src/menu.js b/src/menu.js
@@ -0,0 +1,42 @@
+const { EDIT, LEAD_KEY } = require('./constants');
+
+exports.decorateMenu = (menu) => {
+  for (const menuItem of menu) {
+    if (menuItem.label === EDIT) {
+      menuItem.submenu = menuItem.submenu.concat({
+        label: 'Find',
+        submenu: [
+          {
+            label: 'Toggle Find Bar',
+            accelerator: `${LEAD_KEY}+F`,
+            click(item, focusedWindow) {
+              if (focusedWindow !== null) {
+                focusedWindow.rpc.emit('hyper-search:toggle:input', { focusedWindow });
+              }
+            },
+          },
+          {
+            label: 'Find Next',
+            accelerator: `${LEAD_KEY}+G`,
+            click(item, focusedWindow) {
+              if (focusedWindow !== null) {
+                focusedWindow.rpc.emit('hyper-search:seach:next', { focusedWindow });
+              }
+            },
+          },
+          {
+            label: 'Find Previous',
+            accelerator: `${LEAD_KEY}+Shift+G`,
+            click(item, focusedWindow) {
+              if (focusedWindow !== null) {
+                focusedWindow.rpc.emit('hyper-search:seach:prev', { focusedWindow });
+              }
+            },
+          },
+        ],
+      });
+      break;
+    }
+  }
+  return menu;
+};
diff --git a/src/reducers.js b/src/reducers.js
@@ -0,0 +1,27 @@
+const { TOGGLE_SEARCH_INPUT, UPDATE_SEARCH_TEXT, CURRENT_MATCH } = require('./actionTypes');
+
+exports.reduceUI = (state, action) => {
+  switch (action.type) {
+    case TOGGLE_SEARCH_INPUT: {
+      const uid = action.uid;
+      const { hyperSearchToggleInput = {} } = state;
+      return state.set(
+        'hyperSearchToggleInput',
+        Object.assign({}, hyperSearchToggleInput, { [uid]: !hyperSearchToggleInput[uid] })
+      );
+    }
+    case UPDATE_SEARCH_TEXT: {
+      const { hyperSearchInputText = {} } = state;
+      return state.set('hyperSearchInputText',
+        Object.assign({}, hyperSearchInputText, { [action.uid]: action.text }));
+    }
+    case CURRENT_MATCH: {
+      const { hyperSearchCurrentRow = {} } = state;
+      const { uid, row, startIndex, endIndex } = action.data;
+      return state.set('hyperSearchCurrentRow',
+        Object.assign({}, hyperSearchCurrentRow, { [uid]: { row, startIndex, endIndex } }));
+    }
+    default:
+      return state;
+  }
+};