fx 24.1.0 → 25.0.0

package/README.md

@@ -41,20 +41,38 @@ access the input data without a `x => x` part.
 echo '{"name": "world"}' | fx '.name' '`Hello, ${this}!`'
 ```
 
-Fx has a shortcut for the map function. Fox example `.map(x => x.commit.message)`
-can be written without leading dot and without `x =>` parts.  
+Use other JS functions to process the data.
 
 ```sh
-curl https://api.github.com/repos/antonmedv/fx/commits | fx 'map(x.commit.message)'
+echo `{"name": "world"}` | fx 'Object.keys'
+```
+
+## Advanced Usage
+
+Fx has a shortcut for the map function. Fox example, `this.map(x => x.commit.message)`
+can be rewritten without leading dot and without `x => x` parts.  
+
+```sh
+curl https://api.github.com/repos/antonmedv/fx/commits | fx 'map(.commit.message)'
+```
+
+```sh
+echo '[{"name": "world"}]' | fx 'map(`Hello, ${x.name}!`)'
 ```
 
 Fx has a special syntax for the flatMap function. Fox example,
-`.flatMap(x => x.labels.flatMap(x => x.name))` can be written in the next way.
+`.flatMap(x => x.labels.flatMap(x => x.name))` can be rewritten in the next way.
 
 ```sh
 curl https://api.github.com/repos/kubernetes/kubernetes/issues | fx '.[].labels[].name'
 ```
 
+Fx works with promises.
+
+```sh
+echo '"https://medv.io/*"' | fx 'fetch' '.text()'
+```
+
 ## License
 
 [MIT](../LICENSE)

package/index.js

@@ -1,26 +1,22 @@
 void async function main() {
   const process = await import('node:process')
+  const args = process.argv.slice(2)
   let input = ''
   process.stdin.setEncoding('utf8')
   for await (const chunk of process.stdin)
     input += chunk
-  const args = process.argv.slice(2)
 
   let json
   try {
     json = JSON.parse(input)
   } catch (err) {
-    try {
-      json = eval(`(${input})`)
-    } catch (_) {
-      process.stderr.write(`Invalid JSON: ${err.message}\n`)
-      process.exit(1)
-    }
+    process.stderr.write(`Invalid JSON: ${err.message}\n`)
+    process.exit(1)
   }
 
   let i, code, output = json
   for ([i, code] of args.entries()) try {
-    output = transform(output, code)
+    output = await transform(output, code)
   } catch (err) {
     printErr(err)
     process.exit(1)
@@ -46,7 +42,7 @@ void async function main() {
   }
 }()
 
-function transform(json, code) {
+async function transform(json, code) {
   if ('.' === code)
     return json
 
@@ -68,20 +64,23 @@ function transform(json, code) {
       return this${code}
     })`).call(json)
 
-  if (/^map\(.+?\)$/.test(code))
+  if (/^map\(.+?\)$/.test(code)) {
+    let s = code.substring(4, code.length - 1)
+    if (s[0] === '.') s = 'x' + s
     return eval(`(function () {
-      return this.map(x => apply(x, ${code.substring(4, code.length - 1)}))
+      return this.map((x, i) => apply(${s}, x, i))
     })`).call(json)
+  }
 
   const fn = eval(`(function () {
     return ${code}
   })`).call(json)
 
-  return apply(json, fn)
+  return apply(fn, json)
 }
 
-function apply(json, fn) {
-  if (typeof fn === 'function') return fn(json)
+function apply(fn, ...args) {
+  if (typeof fn === 'function') return fn(...args)
   return fn
 }
 
@@ -100,3 +99,18 @@ function uniq(array) {
 function sort(array) {
   return array.sort()
 }
+
+function groupBy(keyOrFunction) {
+  return array => {
+    const grouped = {}
+    for (const item of array) {
+      const key = typeof keyOrFunction === 'function'
+        ? keyOrFunction(item)
+        : item[keyOrFunction]
+      if (!grouped.hasOwnProperty(key))
+        grouped[key] = []
+      grouped[key].push(item)
+    }
+    return grouped
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fx",
-  "version": "24.1.0",
+  "version": "25.0.0",
   "bin": {
     "fx": "index.js"
   },