fx 30.1.1 → 31.0.0

package/index.js

@@ -48,9 +48,14 @@ const skip = Symbol('skip')
 
 async function runTransforms(json, args, theme) {
   const process = await import('node:process')
-  let i, code, output = json
+  let i, code, jsCode, output = json
   for ([i, code] of args.entries()) try {
-    output = await transform(output, code)
+    jsCode = transpile(code)
+    const fn = `(function () {
+      const x = this
+      return ${jsCode}
+    })`
+    output = await run(output, fn)
   } catch (err) {
     printErr(err)
     process.exit(1)
@@ -73,61 +78,58 @@ async function runTransforms(json, args, theme) {
     console.error(
       `\n  ${pre} ${code} ${post}\n` +
       `  ${' '.repeat(pre.length + 1)}${'^'.repeat(code.length)}\n` +
+      (jsCode !== code ? `\n${jsCode}\n` : ``) +
       `\n${err.stack || err}`,
     )
   }
 }
 
-async function transform(json, code) {
+function transpile(code) {
   if ('.' === code)
-    return json
-
-  if ('?' === code)
-    return Object.keys(json)
+    return 'x'
 
   if (/^(\.\w*)+\[]/.test(code))
-    return eval(`(function () {
-      return (${fold(code.split('[]'))})(this)
-    })`).call(json)
+    return `(${fold(code.split('[]'))})(x)`
 
   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)})`
+    return `x => ${obj}.flatMap(${fold(s)})`
   }
 
   if (/^\.\[/.test(code))
-    return eval(`(function () {
-      return this${code.substring(1)}
-    })`).call(json)
+    return `x${code.substring(1)}`
 
   if (/^\./.test(code))
-    return eval(`(function () {
-      return this${code}
-    })`).call(json)
+    return `x${code}`
 
-  if (/^[a-z]+\(.+?\)$/i.test(code)) {
+  // deprecated
+  if (/^map\(.+?\)$/i.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)
+    return `x.map((x, i) => apply(${s}, x, i))`
+  }
+
+  if (/^@/.test(code)) {
+    const jsCode = transpile(code.substring(1))
+    return `x.map((x, i) => apply(${jsCode}, x, i))`
   }
 
-  const fn = eval(`(function () {
-    const x = this
-    return ${code}
-  })`).call(json)
+  return code
+}
+
+async function run(json, code) {
+  const fn = eval(code).call(json)
+
+  return apply(fn, json)
 
   function apply(fn, ...args) {
     if (typeof fn === 'function') return fn(...args)
     return fn
   }
 
-  return apply(fn, json)
-
   function len(x) {
     if (Array.isArray(x)) return x.length
     if (typeof x === 'string') return x.length
@@ -145,11 +147,18 @@ async function transform(json, code) {
     throw new Error(`Cannot sort ${typeof x}`)
   }
 
-  function sortBy(func) {
+  function map(fn) {
+    return function (x) {
+      if (Array.isArray(x)) return x.map((v, i) => fn(v, i))
+      throw new Error(`Cannot map ${typeof x}`)
+    }
+  }
+
+  function sortBy(fn) {
     return function (x) {
       if (Array.isArray(x)) return x.sort((a, b) => {
-        const fa = func(a)
-        const fb = func(b)
+        const fa = fn(a)
+        const fb = fn(b)
         return fa < fb ? -1 : fa > fb ? 1 : 0
       })
       throw new Error(`Cannot sort ${typeof x}`)
@@ -160,11 +169,8 @@ async function transform(json, code) {
     return function (x) {
       const grouped = {}
       for (const item of x) {
-        const key = typeof keyFn === 'function'
-          ? keyFn(item)
-          : item[keyFn]
-        if (!grouped.hasOwnProperty(key))
-          grouped[key] = []
+        const key = typeof keyFn === 'function' ? keyFn(item) : item[keyFn]
+        if (!grouped.hasOwnProperty(key)) grouped[key] = []
         grouped[key].push(item)
       }
       return grouped
@@ -200,6 +206,16 @@ async function transform(json, code) {
     if (Array.isArray(x)) return x.reverse()
     throw new Error(`Cannot reverse ${typeof x}`)
   }
+
+  function keys(x) {
+    if (typeof x === 'object' && x !== null) return Object.keys(x)
+    throw new Error(`Cannot get keys of ${typeof x}`)
+  }
+
+  function values(x) {
+    if (typeof x === 'object' && x !== null) return Object.values(x)
+    throw new Error(`Cannot get values of ${typeof x}`)
+  }
 }
 
 async function read(fd = 0) {

package/package.json

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