fix: Bring back support for maker functions as values in oneOfWeighted()

Author: justinvdm

oneOfWeighted.js

@@ -1,4 +1,5 @@
 var hash = require('./hash')
+var resolve = require('./utils/resolve')
 var hash2 = hash.hash2
 
 var EPS = 0.0001
@@ -16,7 +17,7 @@ function oneOfWeightedMain(input, samples) {
   for (var i = 0; i < samples.length; i++) {
     cumulative += samples[i][0]
     if (prob < cumulative) {
-      return samples[i][1]
+      return resolve(id, samples[i][1])
     }
   }
 

readme.md

@@ -800,7 +800,7 @@ oneOfWeighted('id-2', [
   [0.05, char],
   [0.05, int]
 ])
-// => [Function: word] { options: [Function: wordOptions] }
+// => 'Ut'
 ```
 
 For each `[probability, value]` pair in the array of `values`, if the given

tests/oneOfWeighted.test.js

@@ -1,5 +1,5 @@
 const test = require('ava')
-const { oneOfWeighted } = require('..')
+const { oneOfWeighted, oneOf } = require('..')
 const { diffBetween } = require('./utils')
 
 const DIFF_THRESHOLD = 0.065
@@ -210,3 +210,19 @@ test(`omitted probabilities`, t => {
     ])
   )
 })
+
+
+test(`curried makers`, t => {
+  const n = 10000
+  let i = -1
+
+  const fn = oneOfWeighted([
+    [0.8, oneOf(['red', 'green'])],
+    [0.2, oneOf(['blue', 'yellow'])],
+  ])
+
+  const seen = new Set()
+  while (++i < n) seen.add(fn(i))
+
+  t.deepEqual(Array.from(seen).sort(), ['blue', 'green', 'red', 'yellow'])
+})