lodash refactor and typings

Author: ShMcK

lib/actions/alert.js

@@ -1,14 +1,13 @@
 "use strict";
 var store_1 = require('../store/store');
 var actionTypes_1 = require('./actionTypes');
-var _ = require('lodash');
 function toggleAlert(alert) {
     var isOpen = store_1.store.getState().alert.open;
     if (!alert) {
         alert = { message: '', action: '', open: false };
     }
     else {
-        alert = _.assign(alert, { open: !isOpen });
+        alert = Object.assign({}, { open: !isOpen }, alert);
     }
     return { type: actionTypes_1.TOGGLE_ALERT, payload: { alert: alert } };
 }

lib/actions/page-actions.js

@@ -2,15 +2,15 @@
 var actionTypes_1 = require('./actionTypes');
 var store_1 = require('../store/store');
 var package_1 = require('../services/package');
-var flatten = require('lodash').flatten;
+var lodash_1 = require('lodash');
 function setPage(selectedPosition) {
     if (selectedPosition === void 0) { selectedPosition = { chapter: 0, page: 0 }; }
     if (selectedPosition.completed) {
         return { type: actionTypes_1.SET_ROUTE, payload: { route: 'final' } };
     }
     var page = package_1.default.getPage(selectedPosition);
     var tasks = package_1.default.getTasks(selectedPosition);
-    var taskTests = flatten(tasks.map(function (task) { return task.tests || []; }));
+    var taskTests = lodash_1.flatten(tasks.map(function (task) { return task.tests || []; }));
     var actions = tasks.map(function (task) { return task.actions || []; });
     return { type: actionTypes_1.SET_PAGE, payload: { page: page, tasks: tasks, position: selectedPosition, taskTests: taskTests, actions: actions } };
 }

lib/reducers/editor-actions/editor-actions.js

@@ -1,6 +1,6 @@
 "use strict";
 var actionTypes_1 = require('../../actions/actionTypes');
-var times = require('lodash').times;
+var lodash_1 = require('lodash');
 var actions_1 = require('./actions');
 function handleEditorActions(actionArray) {
     if (actionArray && actionArray.length) {
@@ -21,7 +21,7 @@ function editorActionsReducer(editorActions, action) {
             actions = action.payload.actions;
             var nextTaskPosition = action.payload.result.taskPosition;
             if (nextTaskPosition > currentTaskPosition) {
-                times(handleEditorActions(actions.shift()), nextTaskPosition - currentTaskPosition);
+                lodash_1.times(handleEditorActions(actions.shift()), nextTaskPosition - currentTaskPosition);
                 currentTaskPosition = nextTaskPosition;
             }
             return actions;

lib/services/package.js

@@ -2,7 +2,7 @@
 var path_1 = require('path');
 var actions_1 = require('../actions/actions');
 var store_1 = require('../store/store');
-var _a = require('lodash'), cloneDeep = _a.cloneDeep, isString = _a.isString;
+var lodash_1 = require('lodash');
 function configTestString(config, packageName, test) {
     if (window.coderoad.win) {
         test = test.split('/').join('\\');
@@ -36,7 +36,7 @@ var PackageService = (function () {
     };
     PackageService.prototype.page = function (_a) {
         var chapter = _a.chapter, page = _a.page;
-        return cloneDeep(this.data.chapters[chapter].pages[page]);
+        return lodash_1.cloneDeep(this.data.chapters[chapter].pages[page]);
     };
     PackageService.prototype.getPackage = function () {
         return this.packageJson;
@@ -47,7 +47,7 @@ var PackageService = (function () {
         return !tasks ? [] : tasks.map(function (task) {
             if (task.tests) {
                 task.tests = task.tests.map(function (test) {
-                    if (isString(test)) {
+                    if (lodash_1.isString(test)) {
                         return configTestString(config, _this.packageName, test);
                     }
                     else {

src/actions/alert.ts

@@ -1,13 +1,12 @@
 import {store} from '../store/store';
 import {TOGGLE_ALERT, REPLAY_ALERT} from './actionTypes';
-const _ = require('lodash');
 
 export function toggleAlert(alert?: CR.Alert): CR.Action {
   const isOpen = store.getState().alert.open;
   if (!alert) {
     alert = { message: '', action: '', open: false };
   } else {
-    alert = _.assign(alert, { open: !isOpen });
+    alert = Object.assign({}, { open: !isOpen }, alert);
   }
   return { type: TOGGLE_ALERT, payload: { alert } };
 }

src/actions/page-actions.ts

@@ -1,7 +1,7 @@
 import {SET_ROUTE, SET_PAGE} from './actionTypes';
 import {store} from '../store/store';
 import Package from '../services/package';
-const {flatten} = require('lodash');
+import {flatten} from 'lodash';
 
 export function setPage(selectedPosition: CR.Position = { chapter: 0, page: 0 }): CR.Action {
   if (selectedPosition.completed) {

src/reducers/editor-actions/editor-actions.ts

@@ -1,5 +1,5 @@
 import {SET_PAGE, TEST_RESULT} from '../../actions/actionTypes';
-const {times} = require('lodash');
+import {times} from 'lodash';
 import {editorActions} from './actions';
 
 function handleEditorActions(actionArray: string[]): void {

src/services/package.ts

@@ -1,7 +1,7 @@
 import {join} from 'path';
 import {setGlobals, projectComplete} from '../actions/actions';
 import {store} from '../store/store';
-const {cloneDeep, isString} = require('lodash');
+import {cloneDeep, isString} from 'lodash';
 
 function configTestString(config: CR.Config,
   packageName: string, test: string): string {