rework

cgoez · cgoez · commit 8d2e64015eb0 · 2018-03-21T10:10:18.000-07:00
diff --git a/src/closure.js b/src/closure.js
@@ -16,19 +16,21 @@ 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.
-  const increment = Object.prototype.increment;
-  const decrement = Object.prototype.decrement;
+  // const object = {}; // create an object
+  // let count = 0;
+  // object.increment
 };
 
 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 () => {
-    if (count <= n) {
+  return (...args) => {
+    if (count < n) {
       count++;
-      return cb();
+      return cb(...args);
     }
+    return null;
   };
 };
 
diff --git a/src/objects.js b/src/objects.js
@@ -5,35 +5,40 @@ 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
-  const newArr = [];
-  for (let i = 0; i < obj.length; i++) {
-    newArr.push(obj[i]);
-  }
-  return newArr;
+  const key = Object.keys(obj);
+  return key;
 };
 
 const values = (obj) => {
   // Return all of the values of the object's own properties.
   // Ignore functions
   // http://underscorejs.org/#values
-  // const val = Object.values(obj);
-  // return val;
+  const val = Object.values(obj);
+  return val;
 };
 
 const mapObject = (obj, cb) => {
   // Like map for arrays, but for objects. Transform the value of each property in turn.
   // http://underscorejs.org/#mapObject
+
   // const map = Object.Map(obj, function(val, key) {
   //   cb();
   // });
   // return map;
+
+  const key = keys(obj); // use
+  const val = values(obj);
+  for (let i = 0; i < key.length; i++) {
+    obj[key[i]] = cb(val[i]);
+  }
+  return obj;
 };
 
 const pairs = (obj) => {
   // Convert an object into a list of [key, value] pairs.
   // http://underscorejs.org/#pairs
-  // const pair = Object.entries(obj);
-  // return pair;
+  const pair = Object.entries(obj);
+  return pair;
 };
 
 /* STRETCH PROBLEMS */
diff --git a/yarn-error.log b/yarn-error.log
@@ -1,5 +1,5 @@
 Arguments: 
-  C:\Program Files\nodejs\node.exe C:\Users\goez2\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js test arrays
+  C:\Program Files\nodejs\node.exe C:\Users\goez2\AppData\Roaming\npm\node_modules\yarn\bin\yarn.js test objects
 
 PATH: 
   C:\Users\goez2\bin;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\local\bin;C:\Program Files\Git\usr\bin;C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Users\goez2\bin;C:\Program Files (x86)\Razer Chroma SDK\bin;C:\Program Files\Razer Chroma SDK\bin;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\intel64\compiler;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\ia32\compiler;C:\ProgramData\Oracle\Java\javapath;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\Program Files (x86)\Bitvise SSH Client;C:\Program Files (x86)\Skype\Phone;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Users\goez2\AppData\Local\Programs\Python\Python36-32;C:\Program Files\Calibre2;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0;C:\Program Files\Git\cmd;C:\Program Files\nodejs;C:\ProgramData\chocolatey\bin;%USERPROFILE%\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Microsoft VS Code\bin;C:\Users\goez2\AppData\Roaming\npm;C:\Exercism;C:\Program Files\Git\usr\bin\vendor_perl;C:\Program Files\Git\usr\bin\core_perl
@@ -3587,7 +3587,7 @@ Trace:
   Error: Command failed.
   Exit code: 1
   Command: C:\WINDOWS\system32\cmd.exe
-  Arguments: /d /s /c eslint tests/*.js && eslint src/*.js && jest --verbose arrays
+  Arguments: /d /s /c eslint tests/*.js && eslint src/*.js && jest --verbose objects
   Directory: C:\Users\goez2\Documents\Git\LambdaSchool\JavaScript-I
   Output:
   
