From b733369767fbf0429e4a7e735f58fe910c349a3e Mon Sep 17 00:00:00 2001 From: Christopher T Small Date: Fri, 17 Jan 2020 12:49:27 -0800 Subject: [PATCH 1/2] [vega-lite] update vega-lite version to 4.0.2-0 Full version set: vega -> 5.9.0-0, vega-lite -> 4.0.2-0. --- vega-lite/build.boot | 19 +++++++++++-------- .../cljsjs/vega-lite/common/vega-lite.ext.js | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/vega-lite/build.boot b/vega-lite/build.boot index 12be6a867..d4f89c503 100644 --- a/vega-lite/build.boot +++ b/vega-lite/build.boot @@ -1,11 +1,12 @@ (set-env! :resource-paths #{"resources"} - :dependencies '[[cljsjs/boot-cljsjs "0.10.4" :scope "test"] - [cljsjs/vega "5.3.2-0"]]) + :dependencies '[[org.clojure/clojurescript "1.10.597"] + [cljsjs/boot-cljsjs "0.10.4" :scope "test"] + [cljsjs/vega "5.9.0-0"]]) (require '[cljsjs.boot-cljsjs.packaging :refer :all]) -(def +lib-version+ "3.4.0") +(def +lib-version+ "4.0.2") (def +version+ (str +lib-version+ "-0")) (task-options! @@ -19,11 +20,13 @@ (task-options! push {:ensure-branch nil}) (comp (download - :url (str "https://github.com/vega/vega-lite/archive/v" +lib-version+ ".zip") - :unzip true - :checksum "211240722ed8e06bc1325022ebf7fc2a") - (sift :move {(re-pattern (str "^vega-lite-" +lib-version+ "/build/vega-lite.js$")) "cljsjs/development/vega-lite.inc.js" - (re-pattern (str "^vega-lite-" +lib-version+ "/build/vega-lite.min.js$")) "cljsjs/production/vega-lite.min.inc.js"}) + :url (format "https://unpkg.com/vega-lite@%s/build/vega-lite.js" +lib-version+) + :checksum "60fffbad1623ecedda00e707a6afeaa4") + (download + :url (format "https://unpkg.com/vega-lite@%s/build/vega-lite.min.js" +lib-version+) + :checksum "3b95448677f446e00bf9ad3b076ad0b0") + (sift :move {(re-pattern "^vega-lite.js$") "cljsjs/development/vega-lite.inc.js" + (re-pattern "^vega-lite.min.js$") "cljsjs/production/vega-lite.min.inc.js"}) (sift :include #{#"^cljsjs"}) (deps-cljs :name "cljsjs.vega-lite" :requires ["cljsjs.vega"]) diff --git a/vega-lite/resources/cljsjs/vega-lite/common/vega-lite.ext.js b/vega-lite/resources/cljsjs/vega-lite/common/vega-lite.ext.js index 32ee1fc7b..8d023d316 100644 --- a/vega-lite/resources/cljsjs/vega-lite/common/vega-lite.ext.js +++ b/vega-lite/resources/cljsjs/vega-lite/common/vega-lite.ext.js @@ -1,13 +1,13 @@ /********************************************************************** - * Extern for vl + * Extern for vegaLite * Generated by http://jmmk.github.io/javascript-externs-generator **********************************************************************/ -var vl = { +var vegaLite = { "compile": function () {}, "extractTransforms": function () {}, "normalize": function () {}, "version": {} }; /********************************************************************** - * End Generated Extern for vl + * End Generated Extern for vegaLite /**********************************************************************/ \ No newline at end of file From 6976b615d5a5aecf1cec629f2532b4af00a30768 Mon Sep 17 00:00:00 2001 From: Christopher T Small Date: Fri, 17 Jan 2020 12:50:09 -0800 Subject: [PATCH 2/2] [vega-extras] update vega-embed & vega-tooltip versions Full version set: vega -> 5.9.0-0, vega-lite -> 4.0.2-0, vega-embed -> 6.0.0-0, vega-tooltip -> 0.20.0-0. --- vega-embed/build.boot | 13 +- .../vega-embed/common/vega-embed.ext.js | 174 +++++++++++++++++- vega-tooltip/build.boot | 11 +- 3 files changed, 185 insertions(+), 13 deletions(-) diff --git a/vega-embed/build.boot b/vega-embed/build.boot index c09b5d2c2..f3cd045f7 100644 --- a/vega-embed/build.boot +++ b/vega-embed/build.boot @@ -1,12 +1,13 @@ (set-env! :resource-paths #{"resources"} - :dependencies '[[cljsjs/boot-cljsjs "0.10.4" :scope "test"] - [cljsjs/vega "5.4.0-0"] - [cljsjs/vega-lite "3.4.0-0"]]) + :dependencies '[[org.clojure/clojurescript "1.10.597"] + [cljsjs/boot-cljsjs "0.10.4" :scope "test"] + [cljsjs/vega "5.9.0-0"] + [cljsjs/vega-lite "4.0.2-0"]]) (require '[cljsjs.boot-cljsjs.packaging :refer :all]) - (def +lib-version+ "4.0.0") + (def +lib-version+ "6.0.0") (def +version+ (str +lib-version+ "-0")) (task-options! @@ -21,10 +22,10 @@ (comp (download :url (format "https://unpkg.com/vega-embed@%s/build/vega-embed.js" +lib-version+) - :checksum "a1de4b3de6c3d040c54bd180bdeeef0b") + :checksum "70e2ff3cdb6f03d26a3a3e734b521f05") (download :url (format "https://unpkg.com/vega-embed@%s/build/vega-embed.min.js" +lib-version+) - :checksum "ceaef0a57f250b6012cf1891db001fa6") + :checksum "3d09a1061a681e0c181098c936b83eeb") (sift :move {#".*vega-embed\.js$" "cljsjs/development/vega-embed.inc.js"}) (sift :move {#".*vega-embed\.min\.js$" "cljsjs/production/vega-embed.min.inc.js"}) (sift :include #{#"^cljsjs"}) diff --git a/vega-embed/resources/cljsjs/vega-embed/common/vega-embed.ext.js b/vega-embed/resources/cljsjs/vega-embed/common/vega-embed.ext.js index f70daf685..20c846fc1 100644 --- a/vega-embed/resources/cljsjs/vega-embed/common/vega-embed.ext.js +++ b/vega-embed/resources/cljsjs/vega-embed/common/vega-embed.ext.js @@ -45,6 +45,7 @@ var vegaEmbed = { "attr": function () {}, "background": function () {}, "bound": function () {}, + "content": function () {}, "draw": function () {}, "foreground": function () {}, "isect": function () {}, @@ -176,6 +177,7 @@ var vegaEmbed = { "accessorFields": function () {}, "accessorName": function () {}, "array": function () {}, + "bandwidthNRD": function () {}, "bin": function () {}, "bootstrapCI": function () {}, "boundClip": function () {}, @@ -197,12 +199,19 @@ var vegaEmbed = { "closeTag": function () {}, "compare": function () {}, "constant": function () {}, + "cumulativeLogNormal": function () {}, + "cumulativeNormal": function () {}, + "cumulativeUniform": function () {}, "debounce": function () {}, "definition": function () {}, + "densityLogNormal": function () {}, + "densityNormal": function () {}, + "densityUniform": function () {}, "domChild": function () {}, "domClear": function () {}, "domCreate": function () {}, "domFind": function () {}, + "dotbin": function () {}, "error": function () {}, "expressionFunction": function () {}, "extend": function () {}, @@ -237,6 +246,7 @@ var vegaEmbed = { }, "formatLocale": function () {}, "formats": function () {}, + "hasOwnProperty": function () {}, "id": { "fields": {}, "fname": {} @@ -269,9 +279,12 @@ var vegaEmbed = { "isTuple": function () {}, "key": function () {}, "lerp": function () {}, + "lineHeight": function () {}, "loader": function () {}, "logger": function () {}, "merge": function () {}, + "mergeConfig": function () {}, + "multiLineOffset": function () {}, "one": { "fields": {}, "fname": {} @@ -293,6 +306,10 @@ var vegaEmbed = { "peek": function () {}, "point": function () {}, "projection": function () {}, + "quantileLogNormal": function () {}, + "quantileNormal": function () {}, + "quantileUniform": function () {}, + "quantiles": function () {}, "quantizeInterpolator": function () {}, "quarter": function () {}, "quartiles": function () {}, @@ -300,6 +317,7 @@ var vegaEmbed = { "randomInteger": function () {}, "randomKDE": function () {}, "randomLCG": function () {}, + "randomLogNormal": function () {}, "randomMixture": function () {}, "randomNormal": function () {}, "randomUniform": function () {}, @@ -318,6 +336,9 @@ var vegaEmbed = { "runtime": function () {}, "runtimeContext": function () {}, "sampleCurve": function () {}, + "sampleLogNormal": function () {}, + "sampleNormal": function () {}, + "sampleUniform": function () {}, "scale": function () {}, "sceneEqual": function () {}, "sceneFromJSON": function () {}, @@ -337,8 +358,15 @@ var vegaEmbed = { "measureWidth": function () {}, "width": function () {} }, + "timeBin": function () {}, + "timeFloor": function () {}, + "timeFormat": function () {}, "timeFormatLocale": function () {}, "timeInterval": function () {}, + "timeOffset": function () {}, + "timeSequence": function () {}, + "timeUnitSpecifier": function () {}, + "timeUnits": function () {}, "toBoolean": function () {}, "toDate": function () {}, "toNumber": function () {}, @@ -422,6 +450,15 @@ var vegaEmbed = { "type": {} } }, + "dotbin": { + "Definition": { + "metadata": { + "modifies": {} + }, + "params": {}, + "type": {} + } + }, "encode": function () {}, "expression": function () {}, "extent": { @@ -517,7 +554,17 @@ var vegaEmbed = { "graticule": { "Definition": { "metadata": { - "changes": {} + "changes": {}, + "generates": {} + }, + "params": {}, + "type": {} + } + }, + "heatmap": { + "Definition": { + "metadata": { + "modifies": {} }, "params": {}, "type": {} @@ -541,6 +588,15 @@ var vegaEmbed = { "type": {} } }, + "isocontour": { + "Definition": { + "metadata": { + "generates": {} + }, + "params": {}, + "type": {} + } + }, "joinaggregate": { "Definition": { "metadata": { @@ -559,6 +615,15 @@ var vegaEmbed = { "type": {} } }, + "kde2d": { + "Definition": { + "metadata": { + "generates": {} + }, + "params": {}, + "type": {} + } + }, "key": function () {}, "legendentries": function () {}, "linkpath": { @@ -656,6 +721,16 @@ var vegaEmbed = { }, "projection": function () {}, "proxy": function () {}, + "quantile": { + "Definition": { + "metadata": { + "changes": {}, + "generates": {} + }, + "params": {}, + "type": {} + } + }, "regression": { "Definition": { "metadata": { @@ -685,7 +760,8 @@ var vegaEmbed = { "sequence": { "Definition": { "metadata": { - "changes": {} + "changes": {}, + "generates": {} }, "params": {}, "type": {} @@ -712,6 +788,15 @@ var vegaEmbed = { } }, "subflow": function () {}, + "timeunit": { + "Definition": { + "metadata": { + "modifies": {} + }, + "params": {}, + "type": {} + } + }, "tree": { "Definition": { "metadata": { @@ -792,9 +877,15 @@ var vegaEmbed = { "fname": {} } }, + "utcFloor": function () {}, + "utcFormat": function () {}, + "utcInterval": function () {}, + "utcOffset": function () {}, + "utcSequence": function () {}, "utcquarter": function () {}, "version": {}, "visitArray": function () {}, + "writeConfig": function () {}, "zero": { "fields": {}, "fname": {} @@ -804,6 +895,12 @@ var vegaEmbed = { "zoomPow": function () {}, "zoomSymlog": function () {} }, + "vegaLite": { + "compile": function () {}, + "extractTransforms": function () {}, + "normalize": function () {}, + "version": {} + }, "version": {}, "vl": { "compile": function () {}, @@ -1342,6 +1439,18 @@ vegaEmbed.vega.transforms.density.prototype = { "targets": function () {}, "transform": function () {} }; +vegaEmbed.vega.transforms.dotbin.prototype = { + "constructor": function () {}, + "evaluate": function () {}, + "marshall": function () {}, + "modified": function () {}, + "parameters": function () {}, + "run": function () {}, + "set": function () {}, + "skip": function () {}, + "targets": function () {}, + "transform": function () {} +}; vegaEmbed.vega.transforms.encode.prototype = { "constructor": function () {}, "evaluate": function () {}, @@ -1535,6 +1644,18 @@ vegaEmbed.vega.transforms.graticule.prototype = { "targets": function () {}, "transform": function () {} }; +vegaEmbed.vega.transforms.heatmap.prototype = { + "constructor": function () {}, + "evaluate": function () {}, + "marshall": function () {}, + "modified": function () {}, + "parameters": function () {}, + "run": function () {}, + "set": function () {}, + "skip": function () {}, + "targets": function () {}, + "transform": function () {} +}; vegaEmbed.vega.transforms.identifier.prototype = { "constructor": function () {}, "evaluate": function () {}, @@ -1559,6 +1680,18 @@ vegaEmbed.vega.transforms.impute.prototype = { "targets": function () {}, "transform": function () {} }; +vegaEmbed.vega.transforms.isocontour.prototype = { + "constructor": function () {}, + "evaluate": function () {}, + "marshall": function () {}, + "modified": function () {}, + "parameters": function () {}, + "run": function () {}, + "set": function () {}, + "skip": function () {}, + "targets": function () {}, + "transform": function () {} +}; vegaEmbed.vega.transforms.joinaggregate.prototype = { "add": function () {}, "cell": function () {}, @@ -1593,6 +1726,18 @@ vegaEmbed.vega.transforms.kde.prototype = { "targets": function () {}, "transform": function () {} }; +vegaEmbed.vega.transforms.kde2d.prototype = { + "constructor": function () {}, + "evaluate": function () {}, + "marshall": function () {}, + "modified": function () {}, + "parameters": function () {}, + "run": function () {}, + "set": function () {}, + "skip": function () {}, + "targets": function () {}, + "transform": function () {} +}; vegaEmbed.vega.transforms.key.prototype = { "constructor": function () {}, "evaluate": function () {}, @@ -1849,6 +1994,18 @@ vegaEmbed.vega.transforms.proxy.prototype = { "targets": function () {}, "transform": function () {} }; +vegaEmbed.vega.transforms.quantile.prototype = { + "constructor": function () {}, + "evaluate": function () {}, + "marshall": function () {}, + "modified": function () {}, + "parameters": function () {}, + "run": function () {}, + "set": function () {}, + "skip": function () {}, + "targets": function () {}, + "transform": function () {} +}; vegaEmbed.vega.transforms.regression.prototype = { "constructor": function () {}, "evaluate": function () {}, @@ -1997,6 +2154,19 @@ vegaEmbed.vega.transforms.subflow.prototype = { "skip": function () {}, "targets": function () {} }; +vegaEmbed.vega.transforms.timeunit.prototype = { + "_floor": function () {}, + "constructor": function () {}, + "evaluate": function () {}, + "marshall": function () {}, + "modified": function () {}, + "parameters": function () {}, + "run": function () {}, + "set": function () {}, + "skip": function () {}, + "targets": function () {}, + "transform": function () {} +}; vegaEmbed.vega.transforms.tree.prototype = { "constructor": function () {}, "evaluate": function () {}, diff --git a/vega-tooltip/build.boot b/vega-tooltip/build.boot index 36221a788..30771bec9 100644 --- a/vega-tooltip/build.boot +++ b/vega-tooltip/build.boot @@ -1,11 +1,12 @@ (set-env! :resource-paths #{"resources"} - :dependencies '[[cljsjs/boot-cljsjs "0.10.4" :scope "test"] - [cljsjs/vega "5.4.0-0"]]) + :dependencies '[[org.clojure/clojurescript "1.10.597"] + [cljsjs/boot-cljsjs "0.10.4" :scope "test"] + [cljsjs/vega "5.9.0-0"]]) (require '[cljsjs.boot-cljsjs.packaging :refer :all]) -(def +lib-version+ "0.18.1") +(def +lib-version+ "0.20.0") (def +version+ (str +lib-version+ "-0")) @@ -21,10 +22,10 @@ (comp (download :url (format "https://unpkg.com/vega-tooltip@%s/build/vega-tooltip.js" +lib-version+) - :checksum "98a04b89eb46785e97f3ffe7d17d7138") + :checksum "113b66b7a0576c439427741c0fcc62df") (download :url (format "https://unpkg.com/vega-tooltip@%s/build/vega-tooltip.min.js" +lib-version+) - :checksum "cfd3d20bcb0fd915158904fd91566d0e") + :checksum "0821e5537771c8e6eb745f2dacce4b7b") (sift :move {#".*vega-tooltip\.js$" "cljsjs/vega-tooltip/development/vega-tooltip.inc.js"}) (sift :move {#".*vega-tooltip\.min\.js$" "cljsjs/vega-tooltip/production/vega-tooltip.min.inc.js"}) (sift :include #{#"^cljsjs"})