fx 28.0.0 → 30.0.0

package/README.md

@@ -13,16 +13,10 @@ Or use **npx**:
 cat file.json | npx fx .field
 ```
 
-Or use **node**:
-
-```sh
-cat file.json | node <(curl -s https://fx.wtf) .field
-```
-
 Or use **deno**:
 
 ```sh
-cat file.json | deno run https://fx.wtf .field
+cat file.json | deno run -A https://fx.wtf .field
 ```
 
 ## Usage

package/index.js

@@ -3,6 +3,7 @@
 
 void async function main() {
   const os = await import('node:os')
+  const fs = await import('node:fs')
   const process = await import('node:process')
   let flagHelp = false
   let flagRaw = false
@@ -19,8 +20,16 @@ void async function main() {
     return printUsage()
   await importFxrc(process.cwd())
   await importFxrc(os.homedir())
-  const stdin = await readStdinGenerator()
-  const input = flagRaw ? readLine(stdin) : parseJson(stdin)
+  let fd = 0 // stdin
+  if (args.length > 0) {
+    if (await isFile(args[0])) {
+      fd = fs.openSync(args.shift(), 'r')
+    } else if (await isFile(args.at(-1))) {
+      fd = fs.openSync(args.pop(), 'r')
+    }
+  }
+  const gen = await read(fd)
+  const input = flagRaw ? readLine(gen) : parseJson(gen)
   if (flagSlurp) {
     const array = []
     for (const json of input) {
@@ -63,7 +72,7 @@ async function runTransforms(json, args) {
     console.error(
       `\n  ${pre} ${code} ${post}\n` +
       `  ${' '.repeat(pre.length + 1)}${'^'.repeat(code.length)}\n` +
-      `\n${err.stack || err}`
+      `\n${err.stack || err}`,
     )
   }
 }
@@ -161,7 +170,7 @@ async function transform(json, code) {
   }
 }
 
-async function readStdinGenerator() {
+async function read(fd = 0) {
   const fs = await import('node:fs')
   const {Buffer} = await import('node:buffer')
   const {StringDecoder} = await import('node:string_decoder')
@@ -171,7 +180,7 @@ async function readStdinGenerator() {
       const buffer = Buffer.alloc(4_096)
       let bytesRead
       try {
-        bytesRead = fs.readSync(0, buffer, 0, buffer.length, null)
+        bytesRead = fs.readSync(fd, buffer, 0, buffer.length, null)
       } catch (e) {
         if (e.code === 'EAGAIN' || e.code === 'EWOULDBLOCK') {
           sleepSync(10)
@@ -189,6 +198,12 @@ async function readStdinGenerator() {
   }()
 }
 
+async function isFile(path) {
+  const fs = await import('node:fs')
+  const stat = fs.statSync(path, {throwIfNoEntry: false})
+  return stat !== undefined && stat.isFile()
+}
+
 function sleepSync(ms) {
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms)
 }
@@ -206,11 +221,11 @@ function* readLine(stdin) {
   return buffer
 }
 
-function* parseJson(stdin) {
+function* parseJson(gen) {
   let lineNumber = 1, buffer = '', lastChar, done = false
 
   function next() {
-    ({value: lastChar, done} = stdin.next())
+    ({value: lastChar, done} = gen.next())
     if (lastChar === '\n') lineNumber++
     buffer += (lastChar || '')
     if (buffer.length > 100) buffer = buffer.slice(-40)
@@ -263,7 +278,7 @@ function* parseJson(stdin) {
             'f': '\f',
             'n': '\n',
             'r': '\r',
-            't': '\t'
+            't': '\t',
           }[lastChar]
           if (!escapedChar) {
             throw new SyntaxError(errorSnippet())
@@ -275,6 +290,8 @@ function* parseJson(stdin) {
         escaped = true
       } else if (lastChar === '"') {
         break
+      } else if (lastChar < '\x1F') {
+        throw new SyntaxError(errorSnippet(`Unescaped control character ${JSON.stringify(lastChar)}`))
       } else if (lastChar === undefined) {
         throw new SyntaxError(errorSnippet())
       } else {
@@ -494,7 +511,7 @@ function* parseJson(stdin) {
 
   function readEOL() {
     let line = ''
-    for (const ch of stdin) {
+    for (const ch of gen) {
       if (!ch || ch === '\n' || line.length >= 60) break
       line += ch
     }
@@ -518,7 +535,7 @@ function stringify(value, isPretty = false) {
 
   function stringifyValue(value, level = 0) {
     if (typeof value === 'string') {
-      return `${colors.string}"${value}"${colors.reset}`
+      return `${colors.string}${JSON.stringify(value)}${colors.reset}`
     } else if (typeof value === 'number') {
       return `${colors.number}${value}${colors.reset}`
     } else if (typeof value === 'bigint') {
@@ -545,8 +562,8 @@ function stringify(value, isPretty = false) {
           (key) =>
             `${getIndent(level + 1)}${colors.key}"${key}"${colors.reset}: ${stringifyValue(
               value[key],
-              level + 1
-            )}`
+              level + 1,
+            )}`,
         )
         .join(',\n')
       return `{\n${entries}\n${getIndent(level)}}`

package/package.json

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