feat: replace jq-web with emuto

Author: kantord

package.json

@@ -27,9 +27,9 @@
   "dependencies": {
     "billboard.js": "^1.4.1",
     "d3": "4.10.0",
+    "emuto": "^1.37.0",
     "fast-deep-equal": "^2.0.1",
     "fd-slicer": "^1.1.0",
-    "jq-web": "^0.1.3",
     "sassline": "^2.1.2",
     "spinkit": "^1.2.5",
     "yamljs": "^0.3.0"

src/components/base/render.js

@@ -1,5 +1,5 @@
 import with_spinner from './spinner'
-import jq from '../../jq-web.js'
+import emuto from '../../jq-web.js'
 import show_error_message from './error_handling'
 import { format_data } from './state_handling'
 
@@ -15,8 +15,8 @@ const call_render_function = (args, instance_args, selection, element) =>
 
 const execute_query = (query, data) =>
   (reject) => (resolve) =>
-    jq(data, query)
-      .then((data) => resolve(data))
+    emuto(data, query)
+		.then((result) => {console.log('data!!!', result); return resolve(result)}) // eslint-disable-line
       .catch((error) => {reject(error)})
 
 const render_component_with_query = (args, instance_args, selection,

src/jq-web.js

@@ -1,8 +1,8 @@
 
-const jq = async (...args) => {
-  const jq_ = await import(/* webpackChunkName: "jq-web" */ 'jq-web')
-console.log(jq_) // eslint-disable-line
-  return jq_.default(...args)
+const emuto = async (data, query) => {
+  const emuto_ = await import(/* webpackChunkName: "emuto" */ 'emuto/lib/interpreter')
+	console.log(emuto_) // eslint-disable-line
+  return emuto_.default(query)(data)
 }
 
-export default jq
+export default emuto

src/manual_test.js

@@ -13,7 +13,7 @@ const render_dashboard = (data) => {
 render_dashboard(`
 dashboard "Cereals":
   - h1 text: 
-    - attr:query: '.[0].a'
+    - attr:query: '$[0].a'
     - data: file:///foo/bar.csv
   - h2 text: "By calories"
   - dropdown my_var=~last:
@@ -23,10 +23,10 @@ dashboard "Cereals":
     - p text: "foo \${my_var} bar"
     - p text: "foo \${my_var} bar"
   - bar chart:
-    - attr:query: '{"columns": [(sort_by(-(.calories | tonumber)) | .[] | [.name, .calories])]}'
+    - attr:query: 'map ($ => [$.name, $.calories * 1]) | sortBy ($ => $[1] * -1) | { "columns": $ }'
     - data: https://gist.githubusercontent.com/ZeningQu/6184eaf8faa533e320abc938c4738c3e/raw/40f237de825061faa8721c2293b79c46979780b4/cereals.csv
   - h2 text: "By nutritional profile"
   - 4 columns:
-    - attr:query: '.[] | {"component": "rows", "data": [{"component": "text", "args": {"tagName": "h3"}, "data": .name}, {"component": "chart", "args": {"type": "pie"}, "data": {"columns": [["protein", .protein], ["carbo", .carbo], ["sugars", .sugars], ["fat", .fat]]}}]}'
+    - attr:query: 'map ($ => {"component": "rows", "data": [{"component": "text", "args": {"tagName": "h3"}, "data": .name}, {"component": "chart", "args": {"type": "pie"}, "data": {"columns": ["protein": .protein, "fat": .fat, "carbo": .carbo]}}]})'
     - data: https://gist.githubusercontent.com/ZeningQu/6184eaf8faa533e320abc938c4738c3e/raw/40f237de825061faa8721c2293b79c46979780b4/cereals.csv
 `)

yarn.lock

@@ -1929,6 +1929,13 @@ cardinal@^2.1.1:
     ansicolors "~0.3.2"
     redeyed "~2.1.0"
 
+cartesian-product-generator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cartesian-product-generator/-/cartesian-product-generator-1.1.0.tgz#8bc32b44b7406eeadac5acfbeb42d6a1acfa433c"
+  integrity sha512-wKHdWUaIrqY4lgnmyCN5Oac0Xb1+Fvo6vUrsrEuRvpO/RTKrqFmZACDDNTctRBnuqnSNc/D0fsBuqYxi13ltOg==
+  dependencies:
+    ind2sub "^2.0.0"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -2200,6 +2207,11 @@ columnify@~1.5.4:
     strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
+combinations-generator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/combinations-generator/-/combinations-generator-1.0.1.tgz#f0cb4da0cbcb55cce3bbe18612d19323fb939d14"
+  integrity sha1-8MtNoMvLVczju+GGEtGTI/uTnRQ=
+
 combined-stream@1.0.6, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
@@ -3392,6 +3404,16 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
+emuto@^1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/emuto/-/emuto-1.37.0.tgz#9417439ea0b1db9701d61dbbb04339d05392feca"
+  integrity sha512-8J/L6OM2aA/THYcqnqrxMp6riAuJX4WkxYDvw1Joskr9H8KnCWdZKoyKY2N+zE0rY+oMUeWgCX052Lr1SXxu2A==
+  dependencies:
+    cartesian-product-generator "^1.1.0"
+    combinations-generator "^1.0.1"
+    flow "^0.2.3"
+    parsimmon "^1.12.0"
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -4040,6 +4062,11 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
   integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
 
+flow@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/flow/-/flow-0.2.3.tgz#f8da65efa249127ec99376a28896572a9795d1af"
+  integrity sha1-+Npl76JJEn7Jk3aiiJZXKpeV0a8=
+
 flush-write-stream@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
@@ -4883,6 +4910,11 @@ in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
 
+ind2sub@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ind2sub/-/ind2sub-2.0.0.tgz#323158a584fb4ed494ec600508b87af2fcd38219"
+  integrity sha512-xvb/V5SoBlJ36hYYzn5ZXGEPeGi6qDwFQu/luxa4eEoHYwlZFZChESsPl2cQVPE4kAsBHg5OQ5alEWtyktYXBg==
+
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -5315,10 +5347,6 @@ java-properties@^0.2.9:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-0.2.10.tgz#2551560c25fa1ad94d998218178f233ad9b18f60"
 
-jq-web@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/jq-web/-/jq-web-0.1.5.tgz#3de502424831b0117e443f0550c670bef83884e1"
-
 js-base64@^2.1.8:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92"
@@ -7361,6 +7389,11 @@ parseurl@~1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
 
+parsimmon@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/parsimmon/-/parsimmon-1.12.0.tgz#886a442fb30b5fc3c8e7c4994050f5cdcfe0ea90"
+  integrity sha512-uC/BjuSfb4jfaWajKCp1mVncXXq+V1twbcYChbTxN3GM7fn+8XoHwUdvUz+PTaFtDSCRQxU8+Rnh+iMhAkVwdw==
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"