fx 20.0.2 → 25.0.0

package/README.md

@@ -1,108 +1,78 @@
-<p align="center"><a href="http://fx.wtf"><img src="https://medv.io/assets/fx-logo.png" height="100" alt="fx logo"></a></p>
-<p align="center"><img src="https://medv.io/assets/fx.gif" width="562" alt="fx example"></p>
+# fx
 
-_* Function eXecution_
+The JavaScript version of the **fx**. Short for _Function eXecution_ or _f(x)_.
 
-[![Build Status](https://travis-ci.org/antonmedv/fx.svg?branch=master)](https://travis-ci.org/antonmedv/fx)
-[![Npm Version](https://img.shields.io/npm/v/fx.svg)](https://www.npmjs.com/package/fx)
-[![Brew Version](https://img.shields.io/homebrew/v/fx.svg)](https://formulae.brew.sh/formula/fx)
-
-Command-line JSON processing tool
+```sh
+npm i -g fx
+```
 
-## Features
+Or use **npx**:
 
-* Easy to use
-* Standalone binary
-* Interactive mode 🎉
-* Streaming support 🌊
+```sh
+cat file.json | npx fx .param
+```
 
-## Install
+Or use **node**:
 
-```bash
-npm install -g fx
-```
-Or via Homebrew
-```bash
-brew install fx
+```sh
+cat file.json | node <(curl -s https://fx.wtf) .param
 ```
-Or download standalone binary from [releases](https://github.com/antonmedv/fx/releases)
-```bash
-bash <( curl https://fx.wtf )
+
+Or use **deno**:
+
+```sh
+cat file.json | deno run https://fx.wtf .param
 ```
 
 ## Usage
 
-Start [interactive mode](https://github.com/antonmedv/fx/blob/master/DOCS.md#interactive-mode) without passing any arguments.
-```bash
-$ curl ... | fx
-```
+Fx treats arguments as JavaScript functions. Fx passes the input data to the first
+function and then passes the result of the first function to the second function 
+and so on.
 
-Or by passing filename as first argument.
-```bash
-$ fx data.json
+```sh
+echo '{"name": "world"}' | fx 'x => x.name' 'x => `Hello, ${x}!`'
 ```
 
-Pass a few JSON files.
-```bash
-cat foo.json bar.json baz.json | fx .message
-```
+Use `this` to access the input data. Use `.` at the start of the expression to 
+access the input data without a `x => x` part.
 
-Use full power of JavaScript.
-```bash
-$ curl ... | fx '.filter(x => x.startsWith("a"))'
+```sh
+echo '{"name": "world"}' | fx '.name' '`Hello, ${this}!`'
 ```
 
-Access all lodash (or ramda, etc) methods by using [.fxrc](https://github.com/antonmedv/fx/blob/master/DOCS.md#using-fxrc) file.
-```bash
-$ curl ... | fx '_.groupBy("commit.committer.name")' '_.mapValues(_.size)'
-```
+Use other JS functions to process the data.
 
-Update JSON using spread operator.
-```bash
-$ echo '{"count": 0}' | fx '{...this, count: 1}'
-{
-  "count": 1
-}
+```sh
+echo `{"name": "world"}` | fx 'Object.keys'
 ```
 
-Extract values from maps.
-```bash
-$ fx commits.json | fx .[].author.name
-```
+## Advanced Usage
 
-Print formatted JSON to stdout.
-```bash
-$ curl ... | fx .
-```
+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.  
 
-Pipe JSON logs stream into fx.
-```bash
-$ kubectl logs ... -f | fx .message
+```sh
+curl https://api.github.com/repos/antonmedv/fx/commits | fx 'map(.commit.message)'
 ```
 
-And try this:
-```bash
-$ fx --life
+```sh
+echo '[{"name": "world"}]' | fx 'map(`Hello, ${x.name}!`)'
 ```
 
-## Documentation
-
-See full [documentation](https://github.com/antonmedv/fx/blob/master/DOCS.md).
+Fx has a special syntax for the flatMap function. Fox example,
+`.flatMap(x => x.labels.flatMap(x => x.name))` can be rewritten in the next way.
 
-## Links
-
-* [Discover how to use fx effectively](https://medium.com/@antonmedv/discover-how-to-use-fx-effectively-668845d2a4ea)
-
-## Related
+```sh
+curl https://api.github.com/repos/kubernetes/kubernetes/issues | fx '.[].labels[].name'
+```
 
-* [gofx](https://github.com/antonmedv/gofx) – fx-like JSON tool (*go*)
-* [eat](https://github.com/antonmedv/eat) – converts anything into JSON
-* [ymlx](https://github.com/matthewadams/ymlx) – fx-like YAML cli processor
-* [fx-completion](https://github.com/antonmedv/fx-completion) – bash completion for fx
-* [fx-theme-monokai](https://github.com/antonmedv/fx-theme-monokai) – monokai theme
-* [fx-theme-night](https://github.com/antonmedv/fx-theme-night) – night theme
+Fx works with promises.
 
+```sh
+echo '"https://medv.io/*"' | fx 'fetch' '.text()'
+```
 
 ## License
 
-[MIT](https://github.com/antonmedv/fx/blob/master/LICENSE)
+[MIT](../LICENSE)

package/index.js

@@ -1,177 +1,116 @@
-#!/usr/bin/env node
-'use strict'
-const os = require('os')
-const fs = require('fs')
-const path = require('path')
-
-const JSON = require('lossless-json')
-JSON.config({circularRefs: false})
-
-const std = require('./std')
-
-try {
-  require(path.join(os.homedir(), '.fxrc')) // Should be required before config.js usage.
-} catch (err) {
-  if (err.code !== 'MODULE_NOT_FOUND') {
-    throw err
-  }
-}
-
-const print = require('./print')
-const reduce = require('./reduce')
-const stream = require('./stream')
-
-const usage = `
-  Usage
-    $ fx [code ...]               
-
-  Examples
-    $ echo '{"key": "value"}' | fx 'x => x.key'
-    value
-
-    $ echo '{"key": "value"}' | fx .key
-    value    
-
-    $ echo '[1,2,3]' | fx 'this.map(x => x * 2)'
-    [2, 4, 6]
-
-    $ echo '{"items": ["one", "two"]}' | fx 'this.items' 'this[1]'
-    two
-
-    $ echo '{"count": 0}' | fx '{...this, count: 1}'
-    {"count": 1}
-
-    $ echo '{"foo": 1, "bar": 2}' | fx ?
-    ["foo", "bar"]
-
-`
-
-const {stdin, stdout, stderr} = process
-const args = process.argv.slice(2)
-
-
-void function main() {
-  stdin.setEncoding('utf8')
-
-  if (stdin.isTTY) {
-    handle('')
-    return
-  }
-
-  const reader = stream(stdin, apply)
-
-  stdin.on('readable', reader.read)
-  stdin.on('end', () => {
-    if (!reader.isStream()) {
-      handle(reader.value())
-    }
-  })
-}()
-
-
-function handle(input) {
-  let filename = 'fx'
-
-  if (input === '') {
-    if (args.length === 0 || (args.length === 1 && (args[0] === '-h' || args[0] === '--help'))) {
-      stderr.write(usage)
-      process.exit(2)
-    }
-    if (args.length === 1 && (args[0] === '-v' || args[0] === '--version')) {
-      stderr.write(require('./package.json').version + '\n')
-      process.exit(2)
-    }
-    if (args.length === 1 && args[0] === '--life') {
-      require('./bang')
-      return
-    }
-
-    input = fs.readFileSync(args[0]).toString('utf8')
-    filename = path.basename(args[0])
-    global.FX_FILENAME = filename
-    args.shift()
-  }
+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
 
   let json
   try {
     json = JSON.parse(input)
-  } catch (e) {
-    printError(e, input)
+  } catch (err) {
+    process.stderr.write(`Invalid JSON: ${err.message}\n`)
     process.exit(1)
   }
 
-  if (args.length === 0 && stdout.isTTY) {
-    require('./fx')(filename, json)
-    return
-  }
-
-  apply(json)
-}
-
-function apply(json) {
-  let output = json
-
-  for (let [i, code] of args.entries()) {
-    try {
-      output = reduce(output, code)
-    } catch (e) {
-      if (e === std.skip) {
-        return
-      }
-      stderr.write(`${snippet(i, code)}\n${e.stack || e}\n`)
-      process.exit(1)
-    }
+  let i, code, output = json
+  for ([i, code] of args.entries()) try {
+    output = await transform(output, code)
+  } catch (err) {
+    printErr(err)
+    process.exit(1)
   }
 
-  if (typeof output === 'undefined') {
-    stderr.write('undefined\n')
-  } else if (typeof output === 'string') {
+  if (typeof output === 'undefined')
+    process.stderr.write('undefined\n')
+  else if (typeof output === 'string')
     console.log(output)
-  } else {
-    const [text] = print(output)
-    console.log(text)
+  else
+    console.log(JSON.stringify(output, null, 2))
+
+  function printErr(err) {
+    let pre = args.slice(0, i).join(' ')
+    let post = args.slice(i + 1).join(' ')
+    if (pre.length > 20) pre = '...' + pre.substring(pre.length - 20)
+    if (post.length > 20) post = post.substring(0, 20) + '...'
+    process.stderr.write(
+      `\n  ${pre} ${code} ${post}\n` +
+      `  ${' '.repeat(pre.length + 1)}${'^'.repeat(code.length)}\n` +
+      `\n${err.stack || err}\n`
+    )
   }
-}
+}()
 
-function snippet(i, code) {
-  let pre = args.slice(0, i).join(' ')
-  let post = args.slice(i + 1).join(' ')
-  if (pre.length > 20) {
-    pre = '...' + pre.substring(pre.length - 20)
-  }
-  if (post.length > 20) {
-    post = post.substring(0, 20) + '...'
+async function transform(json, code) {
+  if ('.' === code)
+    return json
+
+  if ('?' === code)
+    return Object.keys(json)
+
+  if (/^(\.\w*)+\[]/.test(code))
+    return eval(`(function () {
+      return (${fold(code.split('[]'))})(this)
+    })`).call(json)
+
+  if (/^\.\[/.test(code))
+    return eval(`(function () {
+      return this${code.substring(1)}
+    })`).call(json)
+
+  if (/^\./.test(code))
+    return eval(`(function () {
+      return this${code}
+    })`).call(json)
+
+  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, i) => apply(${s}, x, i))
+    })`).call(json)
   }
-  const chalk = require('chalk')
-  return `\n  ${pre} ${chalk.red.underline(code)} ${post}\n`
+
+  const fn = eval(`(function () {
+    return ${code}
+  })`).call(json)
+
+  return apply(fn, json)
 }
 
-function printError(e, input) {
-  if (e.char) {
-    let lineNumber = 1, start = e.char - 70, end = e.char + 50
-    if (start < 0) start = 0
-    if (end > input.length) end = input.length
+function apply(fn, ...args) {
+  if (typeof fn === 'function') return fn(...args)
+  return fn
+}
 
-    for (let i = 0; i < input.length && i < start; i++) {
-      if (input[i] === '\n') lineNumber++
-    }
+function fold(s) {
+  if (s.length === 1)
+    return 'x => x' + s[0]
+  let obj = s.shift()
+  obj = obj === '.' ? 'x' : 'x' + obj
+  return `x => Object.values(${obj}).flatMap(${fold(s)})`
+}
 
-    let lines = input
-      .substring(start, end)
-      .split('\n')
+function uniq(array) {
+  return [...new Set(array)]
+}
 
-    if (lines.length > 1) {
-      lines = lines.slice(1)
-      lineNumber++
-    }
+function sort(array) {
+  return array.sort()
+}
 
-    const chalk = require('chalk')
-    process.stderr.write(`\n`)
-    for (let line of lines) {
-      process.stderr.write(`  ${chalk.yellow(lineNumber)}  ${line}\n`)
-      lineNumber++
+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)
     }
-    process.stderr.write(`\n`)
+    return grouped
   }
-  process.stderr.write(e.toString() + '\n')
 }

package/package.json

@@ -1,53 +1,18 @@
 {
   "name": "fx",
-  "version": "20.0.2",
-  "description": "Command-line JSON viewer",
-  "repository": "antonmedv/fx",
-  "homepage": "https://fx.wtf",
-  "author": "Anton Medvedev <anton@medv.io>",
-  "license": "MIT",
+  "version": "25.0.0",
   "bin": {
     "fx": "index.js"
   },
   "files": [
-    "*.js"
+    "index.js"
   ],
   "scripts": {
-    "test": "ava",
-    "build": "pkg . --out-path dist",
-    "zip": "cd dist && find . -name 'fx-*' -exec zip '{}.zip' '{}' \\;",
-    "release": "release-it --github.release --github.assets=dist/*.zip",
-    "brew:release": "brew bump-formula-pr --url=https://registry.npmjs.org/fx/-/fx-`fx package.json .version`.tgz --no-audit fx"
-  },
-  "release-it": {
-    "hooks": {
-      "after:bump": "rm -rf ./dist && npm run build && npm run zip"
-    }
-  },
-  "keywords": [
-    "json",
-    "viewer",
-    "cli",
-    "terminal",
-    "term",
-    "console",
-    "ascii",
-    "unicode",
-    "blessed"
-  ],
-  "engines": {
-    "node": ">=8"
-  },
-  "dependencies": {
-    "@medv/blessed": "^2.0.1",
-    "chalk": "^4.1.0",
-    "indent-string": "^4.0.0",
-    "lossless-json": "^1.0.4",
-    "string-width": "^4.2.0"
+    "test": "node test.js"
   },
-  "devDependencies": {
-    "ava": "^3.12.1",
-    "pkg": "^4.4.9",
-    "release-it": "^14.0.1"
-  }
+  "repository": "antonmedv/fx",
+  "homepage": "https://fx.wtf",
+  "description": "Command-line JSON viewer",
+  "author": "Anton Medvedev <anton@medv.io>",
+  "license": "MIT"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Anton Medvedev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/bang.js

@@ -1,79 +0,0 @@
-'use strict'
-// http://bit.ly/fx--life
-
-const
-  run = f => setInterval(f, 16),
-  p = (s) => process.stdout.write(s),
-  esc = (...x) => x.map(i => p('\u001B[' + i)),
-  [upper, lower, full] = ['\u2580', '\u2584', '\u2588'],
-  {columns, rows} = process.stdout,
-  [w, h] = [columns, rows * 2],
-  a = Math.floor(w / 2) - 6, b = Math.floor(h / 2) - 7
-
-let $ = Array(w * h).fill(false)
-if (Date.now() % 3 === 0) {
-  $[1 + 5 * w] = $[1 + 6 * w] = $[2 + 5 * w] = $[2 + 6 * w] = $[12 + 5 * w] = $[12 + 6 * w] = $[12 + 7 * w] = $[13 + 4 * w] = $[13 + 8 * w] = $[14 + 3 * w] = $[14 + 9 * w] = $[15 + 4 * w] = $[15 + 8 * w] = $[16 + 5 * w] = $[16 + 6 * w] = $[16 + 7 * w] = $[17 + 5 * w] = $[17 + 6 * w] = $[17 + 7 * w] = $[22 + 3 * w] = $[22 + 4 * w] = $[22 + 5 * w] = $[23 + 2 * w] = $[23 + 3 * w] = $[23 + 5 * w] = $[23 + 6 * w] = $[24 + 2 * w] = $[24 + 3 * w] = $[24 + 5 * w] = $[24 + 6 * w] = $[25 + 2 * w] = $[25 + 3 * w] = $[25 + 4 * w] = $[25 + 5 * w] = $[25 + 6 * w] = $[26 + 1 * w] = $[26 + 2 * w] = $[26 + 6 * w] = $[26 + 7 * w] = $[35 + 3 * w] = $[35 + 4 * w] = $[36 + 3 * w] = $[36 + 4 * w] = true
-} else if (Date.now() % 3 === 1) {
-  for (let i = 0; i < $.length; i-=-1)
-    if (Math.random() < 0.16) $[i] = true
-} else {
-  $[a + 1 + (2 + b) * w] = $[a + 2 + (1 + b) * w] = $[a + 2 + (3 + b) * w] = $[a + 3 + (2 + b) * w] = $[a + 5 + (15 + b) * w] = $[a + 6 + (13 + b) * w] = $[a + 6 + (15 + b) * w] = $[a + 7 + (12 + b) * w] = $[a + 7 + (13 + b) * w] = $[a + 7 + (15 + b) * w] = $[a + 9 + (11 + b) * w] = $[a + 9 + (12 + b) * w] = $[a + 9 + (13 + b) * w] = true
-}
-
-function at(i, j) {
-  if (i < 0) i = h - 1
-  if (i >= h) i = 0
-  if (j < 0) j = w - 1
-  if (j >= w) j = 0
-  return $[i * w + j]
-}
-
-function neighbors(i, j) {
-  let c = 0
-  at(i - 1, j - 1) && c++
-  at(i - 1, j) && c++
-  at(i - 1, j + 1) && c++
-  at(i, j - 1) && c++
-  at(i, j + 1) && c++
-  at(i + 1, j - 1) && c++
-  at(i + 1, j) && c++
-  at(i + 1, j + 1) && c++
-  return c
-}
-
-run(() => {
-  esc('H')
-
-  let gen = Array(w * h).fill(false)
-  for (let i = 0; i < h; i-=-1) {
-    for (let j = 0; j < w; j-=-1) {
-      const n = neighbors(i, j)
-      const z = i * w + j
-      if ($[z]) {
-        if (n < 2) gen[z] = false
-        if (n === 2 || n === 3) gen[z] = true
-        if (n > 3) gen[z] = false
-      } else {
-        if (n === 3) gen[z] = true
-      }
-    }
-  }
-  $ = gen
-
-  for (let i = 0; i < rows; i-=-1) {
-    for (let j = 0; j < columns; j-=-1) {
-      if ($[i * 2 * w + j] && $[(i * 2 + 1) * w + j]) p(full)
-      else if ($[i * 2 * w + j] && !$[(i * 2 + 1) * w + j]) p(upper)
-      else if (!$[i * 2 * w + j] && $[(i * 2 + 1) * w + j]) p(lower)
-      else p(' ')
-    }
-    if (i !== rows - 1) p('\n')
-  }
-})
-
-esc('2J', '?25l')
-
-process.on('SIGINT', () => {
-  esc('?25h')
-  process.exit(2)
-})

package/config.js

@@ -1,26 +0,0 @@
-'use strict'
-const chalk = require('chalk')
-const noop = x => x
-const list = {
-  fg: 'black',
-  bg: 'cyan',
-  selected: {
-    bg: 'magenta'
-  }
-}
-
-module.exports = {
-  space:            global.FX_STYLE_SPACE             || 2,
-  null:             global.FX_STYLE_NULL              || chalk.grey.bold,
-  number:           global.FX_STYLE_NUMBER            || chalk.cyan.bold,
-  boolean:          global.FX_STYLE_BOOLEAN           || chalk.yellow.bold,
-  string:           global.FX_STYLE_STRING            || chalk.green.bold,
-  key:              global.FX_STYLE_KEY               || chalk.blue.bold,
-  bracket:          global.FX_STYLE_BRACKET           || noop,
-  comma:            global.FX_STYLE_COMMA             || noop,
-  colon:            global.FX_STYLE_COLON             || noop,
-  list:             global.FX_STYLE_LIST              || list,
-  highlight:        global.FX_STYLE_HIGHLIGHT         || chalk.black.bgYellow,
-  highlightCurrent: global.FX_STYLE_HIGHLIGHT_CURRENT || chalk.inverse,
-  statusBar:        global.FX_STYLE_STATUS_BAR        || chalk.inverse,
-}

package/find.js

@@ -1,35 +0,0 @@
-'use strict'
-
-function* find(v, regex, path = []) {
-  if (typeof v === 'undefined' || v === null) {
-    return
-  }
-
-  if (Array.isArray(v)) {
-    let i = 0
-    for (let value of v) {
-      yield* find(value, regex, path.concat(['[' + i++ + ']']))
-    }
-    return
-  }
-
-  if (typeof v === 'object' && v.constructor === Object) {
-    const entries = Object.entries(v)
-    for (let [key, value] of entries) {
-      const nextPath = path.concat(['.' + key])
-
-      if (regex.test(key)) {
-        yield nextPath
-      }
-
-      yield* find(value, regex, nextPath)
-    }
-    return
-  }
-
-  if (regex.test(v)) {
-    yield path
-  }
-}
-
-module.exports = find