All exercises pass except objects

mattmetten · mattmetten · commit 2a8da43c2099 · 2017-11-06T17:54:45.000-06:00
diff --git a/src/arrays.js b/src/arrays.js
@@ -9,36 +9,77 @@ const each = (elements, cb) => {
   // This only needs to work with arrays.
   // You should also pass the index into `cb` as the second argument
   // based off http://underscorejs.org/#each
+  for (let i = 0; i < elements.length; i++) {
+    cb(elements[i], i);
+  }
 };
 
 const map = (elements, cb) => {
   // Produces a new array of values by mapping each value in list through a transformation function (iteratee).
   // Return the new array.
+  const newArray = [];
+  for (let i = 0; i < elements.length; i++) {
+    newArray[i] = cb(elements[i]);
+  }
+  return newArray;
 };
 
 const reduce = (elements, cb, startingValue) => {
   // Combine all elements into a single value going from left to right.
   // Elements will be passed one by one into `cb` along with the `startingValue`.
   // `startingValue` should be the first argument passed to `cb` and the array element should be the second argument.
   // `startingValue` is the starting value.  If `startingValue` is undefined then make `elements[0]` the initial value.
+  if (startingValue === undefined) {
+    startingValue = elements[0];
+    for (let i = 1; i < elements.length; i++) {
+      startingValue = cb(startingValue, elements[i]);
+    }
+  } else {
+    for (let i = 0; i < elements.length; i++) {
+      startingValue = cb(startingValue, elements[i]);
+    }
+  }
+  return startingValue;
 };
 
 const find = (elements, cb) => {
   // Look through each value in `elements` and pass each element to `cb`.
   // If `cb` returns `true` then return that element.
   // Return `undefined` if no elements pass the truth test.
+  for (let i = 0; i < elements.length; i++) {
+    if (cb(elements[i])) {
+      return elements[i];
+    }
+  }
+  return 'undefined';
 };
 
 const filter = (elements, cb) => {
   // Similar to `find` but you will return an array of all elements that passed the truth test
   // Return an empty array if no elements pass the truth test
+  const filterArray = [];
+  for (let i = 0; i < elements.length; i++) {
+    if (cb(elements[i])) {
+      filterArray.push(elements[i]);
+    }
+  }
+  return filterArray;
 };
 
-/* STRETCH PROBLEM */
+/* Extra Credit */
 
 const flatten = (elements) => {
   // Flattens a nested array (the nesting can be to any depth).
   // Example: flatten([1, [2], [3, [[4]]]]); => [1, 2, 3, 4];
+  const newArr = [];
+  for (let i = 0; i < elements.length; i++) {
+    if (Array.isArray(elements[i])) {
+      elements = elements.concat(elements[i]);
+    } else if (!Array.isArray(elements[i])) {
+      newArr.push(elements[i]);
+    }
+  }
+  return newArr;
 };
 
 /* eslint-enable no-unused-vars, max-len */
diff --git a/src/callbacks.js b/src/callbacks.js
@@ -2,27 +2,34 @@
 
 const firstItem = (arr, cb) => {
   // firstItem passes the first item of the given array to the callback function.
+ cb(arr[0]);
 };
 
 const getLength = (arr, cb) => {
   // getLength passes the length of the array into the callback.
+  cb(arr.length);
 };
 
 const last = (arr, cb) => {
   // last passes the last item of the array into the callback.
+  cb(arr[arr.length-1]);
 };
 
 const sumNums = (x, y, cb) => {
   // sumNums adds two numbers (x, y) and passes the result to the callback.
+  cb(x + y);
 };
 
 const multiplyNums = (x, y, cb) => {
   // multiplyNums multiplies two numbers and passes the result to the callback.
+  cb(x * y);
 };
 
 const contains = (item, list, cb) => {
   // contains checks if an item is present inside of the given array/list.
   // Pass true to the callback if it is, otherwise pass false.
+  let result = list.indexOf(item) >= 1 ? true : false;
+  cb(result);
 };
 
 /* STRETCH PROBLEM */
@@ -31,6 +38,8 @@ const removeDuplicates = (array, cb) => {
   // removeDuplicates removes all duplicate values from the given array.
   // Pass the duplicate free array to the callback function.
   // Do not mutate the original array.
+  const removed = array.filter((item, index, inputArray) => inputArray.indexOf(item) === index);
+  cb(removed);
 };
 
 /* eslint-enable */
diff --git a/src/closure.js b/src/closure.js
@@ -5,28 +5,69 @@ const counter = () => {
   // Example: const newCounter = counter();
   // newCounter(); // 1
   // newCounter(); // 2
+  let count = 0;
+
+  return () => {
+    count++;
+    return count;
+  };
 };
 
 const counterFactory = () => {
   // Return an object that has two methods called `increment` and `decrement`.
   // `increment` should increment a counter variable in closure scope and return it.
   // `decrement` should decrement the counter variable and return it.
+  let count = 0;
+
+  return {
+    increment() {
+      count++;
+      return count;
+    },
+
+    decrement() {
+      count--;
+      return count;
+    },
+  };
 };
 
 const limitFunctionCallCount = (cb, n) => {
   // Should return a function that invokes `cb`.
   // The returned function should only allow `cb` to be invoked `n` times.
+  let count = 0;
+
+  return (...args) => {
+    count++;
+
+    if (count < n) {
+      return cb(...args);
+    }
+
+    return null;
+  };
 };
 
-/* STRETCH PROBLEM */
+/* Extra Credit */
 
 const cacheFunction = (cb) => {
-  // Should return a funciton that invokes `cb`.
+  // Should return a function that invokes `cb`.
   // A cache (object) should be kept in closure scope.
   // The cache should keep track of all arguments have been used to invoke this function.
   // If the returned function is invoked with arguments that it has already seen
   // then it should return the cached result and not invoke `cb` again.
   // `cb` should only ever be invoked once for a given set of arguments.
+  const cache = {};
+
+  return (...args) => {
+    if (args[0] in cache) {
+      return cache[args];
+    }
+
+    const newResult = cb(...args);
+    cache[args] = newResult;
+    return newResult;
+  };
 };
 
 /* eslint-enable no-unused-vars */
@@ -37,3 +78,4 @@ module.exports = {
   cacheFunction,
   limitFunctionCallCount,
 };
+
diff --git a/src/objects.js b/src/objects.js
@@ -5,36 +5,67 @@ const keys = (obj) => {
   // Retrieve all the names of the object's properties.
   // Return the keys as strings in an array.
   // Based on http://underscorejs.org/#keys
+  return Object.keys(obj);
 };
 
 const values = (obj) => {
   // Return all of the values of the object's own properties.
   // Ignore functions
   // http://underscorejs.org/#values
+  return Object.values(obj);
 };
 
 const mapObject = (obj, cb) => {
   // Like map for arrays, but for objects. Transform the value of each property in turn.
   // http://underscorejs.org/#mapObject
+  const mappedObject = {};
+
+  Object.keys(obj).forEach((key) => {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      mappedObject[key] = cb(obj[key]);
+    }
+  });
+
+  return mappedObject;
 };
 
 const pairs = (obj) => {
   // Convert an object into a list of [key, value] pairs.
   // http://underscorejs.org/#pairs
+  return Object.entries(obj);
 };
 
-/* STRETCH PROBLEMS */
+/* Extra credit */
 
 const invert = (obj) => {
   // Returns a copy of the object where the keys have become the values and the values the keys.
   // Assume that all of the object's values will be unique and string serializable.
   // http://underscorejs.org/#invert
+  const invertedObject = {};
+
+  Object.keys(obj).forEach((key) => {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      invertedObject[obj[key]] = key;
+    }
+  });
+
+  return invertedObject;
 };
 
 const defaults = (obj, defaultProps) => {
   // Fill in undefined properties that match properties on the `defaultProps` parameter object.
   // Return `obj`.
   // http://underscorejs.org/#defaults
+
+  Object.keys(defaultProps).forEach((prop) => {
+    if (Object.prototype.hasOwnProperty.call(defaultProps, prop)) {
+      if (!(prop in obj)) {
+        obj[prop] = defaultProps[prop];
+      }
+    }
+  });
+
+  return obj;
 };
 
 /* eslint-enable no-unused-vars */
