fx 34.0.0 → 36.0.0

package/README.md

@@ -16,7 +16,7 @@ cat file.json | npx fx .field
 Or use **deno**:
 
 ```sh
-cat file.json | deno run -A https://fx.wtf .field
+cat file.json | deno run -A npm:fx .field
 ```
 
 ## Usage
@@ -42,7 +42,7 @@ Use other JS functions to process the data.
 echo '{"name": "world"}' | fx 'Object.keys'
 ```
 
-## Advanced Usage
+### Stream processing
 
 Fx can process a stream of json objects. Fx will apply arguments to each object.
 
@@ -57,6 +57,8 @@ use the **--slurp** or **-s** flag.
 echo '{"name": "hello"}\n{"name": "world"}' | fx --slurp '.map(x => x.name)' '.join(", ")'
 ```
 
+### Raw input
+
 If you want to process non-JSON data, use the **--raw** or **-r** flag.
 
 ```sh
@@ -75,18 +77,24 @@ Fx has a special symbol **skip** for skipping the printing of the result.
 ls | fx -r '.includes(".md") ? this : skip'
 ```
 
+### Built-in functions
+
 Fx comes with a set of useful functions: **uniq**, **sort**, **groupBy**, **chunk**, **zip**.
 
 ```sh
 cat file.json | fx 'uniq' 'sort' 'groupBy(x => x.name)'
 ```
 
-Fx works with promises.
+### Edit-in-place
+
+You can use special function **save** to edit-in-place the input data.
 
 ```sh
-echo '"https://medv.io/*"' | fx 'fetch' '.text()'
+fx file.json 'x.name = x.name.toUpperCase(), x' 'save'
 ```
 
+The edited data will be saved to the same `file.json` file.
+
 ### Syntactic Sugar
 
 Fx has a shortcut for the map function. Fox example, `this.map(x => x.commit.message)`
@@ -101,28 +109,32 @@ 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 rewritten in the next way.
+`.issues.flatMap(x => x.labels.flatMap(x => x))` can be rewritten in the next way.
 
 ```sh
-curl https://api.github.com/repos/kubernetes/kubernetes/issues | fx '.[].labels[].name'
+curl https://fx.wtf/example.json | fx '.issues[].labels[]'
 ```
 
 ### .fxrc.js
 
-Fx supports `.fxrc.js` file in the current directory or in the home directory.
+Fx supports `.fxrc.js` file in the current directory, or in the home directory, or in XDG config directory.
 
 Put the next code in the `.fxrc.js` file to make `myFunction` available in the fx.
 
 ```js
-global.myFunction = x => x + 1
+function addOne(x) {
+  return x + 1
+}
 ```
 
-Now you can use `myFunction` in the fx.
+Now you can use `addOne` in the fx.
 
 ```sh
-echo '1' | fx 'myFunction'
+echo '1' | fx addOne
 ```
 
+If you would like to create global variables use `var` instead of `let` or `const`.
+
 ## License
 
 [MIT](../LICENSE)

package/index.js

@@ -4,6 +4,7 @@
 void async function main() {
   const os = await import('node:os')
   const fs = await import('node:fs')
+  const path = await import('node:path')
   const process = await import('node:process')
 
   let flagHelp = false
@@ -26,8 +27,7 @@ void async function main() {
 
   const theme = themes(process.stdout.isTTY ? (process.env.FX_THEME || '1') : '0')
 
-  await importFxrc(process.cwd())
-  await importFxrc(os.homedir())
+  loadFxrc(os, fs, path, process)
 
   let fd = 0 // stdin
   if (args.length > 0) {
@@ -35,6 +35,7 @@ void async function main() {
       isFile(fs, args[0]) ? args.shift() :
         isFile(fs, args.at(-1)) ? args.pop() : false
     if (filename) {
+      globalThis.__file__ = filename
       fd = fs.openSync(filename, 'r')
       if (!flagYaml) flagYaml = /\.ya?ml$/i.test(filename)
     }
@@ -138,6 +139,7 @@ function transpile(code) {
 }
 
 async function run(json, code) {
+  const fs = await import('node:fs')
   const fn = eval(code).call(json)
 
   return apply(fn, json)
@@ -241,6 +243,12 @@ async function run(json, code) {
     }
     throw new Error(`Cannot list ${typeof x}`)
   }
+
+  function save(x) {
+    if (!globalThis.__file__) throw new Error('Specify a file as the first argument to be able to save: fx file.json ...')
+    fs.writeFileSync(globalThis.__file__, JSON.stringify(x, null, 2))
+    return x
+  }
 }
 
 async function read(fd = 0) {
@@ -272,8 +280,12 @@ async function read(fd = 0) {
 }
 
 function isFile(fs, path) {
-  const stat = fs.statSync(path, {throwIfNoEntry: false})
-  return stat !== undefined && stat.isFile()
+  try {
+    const stat = fs.statSync(path, {throwIfNoEntry: false})
+    return stat !== undefined && stat.isFile()
+  } catch (err) {
+    return false
+  }
 }
 
 function sleepSync(ms) {
@@ -290,6 +302,7 @@ function* readLine(stdin) {
       buffer += ch
     }
   }
+  if (buffer.length > 0) yield buffer
   return buffer
 }
 
@@ -678,6 +691,37 @@ async function importFxrc(path) {
   }
 }
 
+function loadFxrc(os, fs, path, process) {
+  let script = ''
+
+  const cwd = process.cwd()
+  const home = os.homedir()
+  const xdgHome = process.env.XDG_CONFIG_HOME || path.join(home, '.config')
+  const xdgDirsEnv = process.env.XDG_CONFIG_DIRS || '/etc/xdg'
+
+  const paths = [path.join(cwd, '.fxrc.js')]
+  paths.push(path.join(home, '.fxrc.js'))
+  paths.push(path.join(xdgHome, 'fx', '.fxrc.js'))
+  for (const dir of xdgDirsEnv.split(':')) {
+    paths.push(path.join(dir, 'fx', '.fxrc.js'))
+  }
+
+  for (const filePath of paths) {
+    try {
+      const stat = fs.statSync(filePath)
+      if (stat.isDirectory()) continue
+
+      const data = fs.readFileSync(filePath, 'utf8')
+      script += data + '\n'
+    } catch (err) {
+      if (err.code === 'ENOENT') continue
+      throw new Error(`read ${filePath}: ${err.message}`)
+    }
+  }
+
+  eval?.(script)
+}
+
 function printUsage() {
   const usage = `Usage
   fx [flags] [code...]

package/package.json

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