Merge branch 'master' into proposal/val

Author: TotalTechGeek

async_iterators.js

@@ -6,23 +6,23 @@ export async function filter (arr, iter) {
   const result = []
   let index = 0
   for (const item of arr) {
-    if (await iter(item, index++)) result.push(item)
+    if (await iter(item, index++, arr)) result.push(item)
   }
   return result
 }
 
 export async function some (arr, iter) {
   let index = 0
   for (const item of arr) {
-    if (await iter(item, index++)) return true
+    if (await iter(item, index++, arr)) return true
   }
   return false
 }
 
 export async function every (arr, iter) {
   let index = 0
   for (const item of arr) {
-    if (!(await iter(item, index++))) return false
+    if (!(await iter(item, index++, arr))) return false
   }
   return true
 }
@@ -31,7 +31,7 @@ export async function map (arr, iter) {
   const result = []
   let index = 0
   for (const item of arr) {
-    result.push(await iter(item, index++))
+    result.push(await iter(item, index++, arr))
   }
   return result
 }

defaultMethods.js

@@ -637,7 +637,7 @@ function createArrayIterativeMethod (name, useTruthy = false) {
 
       return selector[name]((i, index) => {
         const result = engine.run(mapper, i, {
-          above: [{ item: selector, index }, context, above]
+          above: [{ iterator: selector, index }, context, above]
         })
         return useTruthy ? engine.truthy(result) : result
       })
@@ -651,7 +651,7 @@ function createArrayIterativeMethod (name, useTruthy = false) {
         })) || []
       return asyncIterators[name](selector, (i, index) => {
         const result = engine.run(mapper, i, {
-          above: [{ item: selector, index }, context, above]
+          above: [{ iterator: selector, index }, context, above]
         })
         return useTruthy ? engine.truthy(result) : result
       })
@@ -669,16 +669,16 @@ function createArrayIterativeMethod (name, useTruthy = false) {
       }
 
       const method = build(mapper, mapState)
-      const aboveArray = method.aboveDetected ? buildState.compile`[{ item: null, index: x }, context, above]` : buildState.compile`null`
+      const aboveArray = method.aboveDetected ? buildState.compile`[{ iterator: z, index: x }, context, above]` : buildState.compile`null`
 
       if (async) {
         if (!isSyncDeep(mapper, buildState.engine, buildState)) {
           buildState.detectAsync = true
-          return buildState.compile`await asyncIterators[${name}](${selector} || [], async (i, x) => ${method}(i, x, ${aboveArray}))`
+          return buildState.compile`await asyncIterators[${name}](${selector} || [], async (i, x, z) => ${method}(i, x, ${aboveArray}))`
         }
       }
 
-      return buildState.compile`(${selector} || [])[${name}]((i, x) => ${method}(i, x, ${aboveArray}))`
+      return buildState.compile`(${selector} || [])[${name}]((i, x, z) => ${method}(i, x, ${aboveArray}))`
     },
     traverse: false
   }

general.test.js

@@ -259,9 +259,9 @@ describe('Various Test Cases', () => {
   })
 
   // This is not fully supported right now.
-  // it('is able to access the source array in the iterators', async () => {
-  //   for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { map: [[0, 1, 2, 3], { '+': [{ var: '' }, { var: '../item.2' }] }] }, {}, [2, 3, 4, 5])
-  // })
+  it('is able to access the source array in the iterators', async () => {
+    for (const engine of [...normalEngines, ...permissiveEngines]) await testEngine(engine, { map: [[0, 1, 2, 3], { '+': [{ var: '' }, { var: '../iterator.2' }] }] }, {}, [2, 3, 4, 5])
+  })
 
   it('should be able to handle various instances of "in" with good, bad and invalid data', async () => {
     const rule = {