fx 39.1.0 → 39.2.0

package/index.js

@@ -73,6 +73,7 @@ async function transform(json, args, theme) {
       return ${jsCode}
     })`
     output = await run(output, fn)
+    if (output === skip) break
   } catch (err) {
     await printErr(err)
   }
@@ -125,12 +126,12 @@ function transpile(code) {
 
   if (/^@/.test(code)) {
     const jsCode = transpile(code.substring(1))
-    return `x.map((x, i) => apply(${jsCode}, x, i))`
+    return `map((x, i) => apply(${jsCode}, x, i))`
   }
 
   if (/^\?/.test(code)) {
     const jsCode = transpile(code.substring(1))
-    return `x.filter((x, i) => apply(${jsCode}, x, i))`
+    return `filter((x, i) => apply(${jsCode}, x, i))`
   }
 
   return code
@@ -164,21 +165,16 @@ async function run(json, code) {
     throw new Error(`Cannot sort ${typeof x}`)
   }
 
+  function isFalsely(x) {
+    return x === false || x === null || x === undefined
+  }
+
   function filter(fn) {
     return function (x) {
       if (Array.isArray(x)) {
-        return x.filter((v, i) => fn(v, i))
-      } else if (x !== null && typeof x === 'object') {
-        const result = {}
-        for (const [k, v] of Object.entries(x)) {
-          if (fn(v, k)) {
-            result[k] = v
-          }
-        }
-        return result
-      } else {
-        throw new Error(`Cannot filter ${typeof x}`)
+        return x.filter((v, i) => !isFalsely(fn(v, i)))
       }
+      return isFalsely(fn(x))? skip : x
     }
   }
 
@@ -186,15 +182,8 @@ async function run(json, code) {
     return function (x) {
       if (Array.isArray(x)) {
         return x.map((v, i) => fn(v, i))
-      } else if (x !== null && typeof x === 'object') {
-        const result = {}
-        for (const [k, v] of Object.entries(x)) {
-          result[k] = fn(v, k)
-        }
-        return result
-      } else {
-        throw new Error(`Cannot map over ${typeof x}`)
       }
+      return fn(x)
     }
   }
 

package/package.json

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