reduce a closure

jonathanong · Sep 23, 2023 · a1de9da · a1de9da
1 parent 808c313
commit a1de9da
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/__tests__/types.js b/__tests__/types.js
@@ -62,4 +62,4 @@ test('a null value', async () => {
  const result = await streamToString(render`__1__${promise1}__2__${promise2}__3__`)
  assert.strictEqual(result, '__1____2____3__')
  expect(result).toMatchSnapshot()
-})
+})
diff --git a/lib/index.js b/lib/index.js
@@ -29,13 +29,18 @@ function render (template, ...values) {
  }
  }
 
- Promise.resolve(value).then((result) => {
- if (!result) return
- if (typeof result === 'string') return stream.write(result)
- if (result.readableObjectMode) throw new Error('Readable object streams are not supported.')
- if (result.readable) return pipe(result)
- throw new Error(`Value passed did not return a string or a stream: <${typeof result}>${JSON.stringify(result)}`)
- }).catch(onError).finally(next)
+ Promise.resolve(value)
+ .then(onPromiseResolve)
+ .catch(onError)
+ .finally(next)
+ }
+
+ function onPromiseResolve (result) {
+ if (!result) return
+ if (typeof result === 'string') return stream.write(result)
+ if (result.readableObjectMode) throw new Error('Readable object streams are not supported.')
+ if (result.readable) return pipe(result)
+ throw new Error(`Value passed did not return a string or a stream: <${typeof result}>${JSON.stringify(result)}`)
  }
 
  function pipe (readable) {