diff --git a/README.md b/README.md new file mode 100644 index 0000000..d2ed7ad --- /dev/null +++ b/README.md @@ -0,0 +1,45 @@ +# Processing.py (for skulpt) + +This is a package for [skulpt] or on [github]. It implements as much of the Processing.py functions as possible. It is based on Processing.js. + +## Instalation + +When skulpt looks for `processing/__init__.js` return `skulpt_module/__init__.js`. Make sure that at that time `processing-sk.js` or `processing-sk-min.js` is loaded. + +There are a few things you can configure before running processing in skulpt. After you've loaded `processing-sk(-min).js`. You can call `ProcessingSk.initProcessing` with a suspensionHandler, a breakHandler, and a eventPredicate. These things are: + +- `suspensionHandler`: if you specify one in skulpt it makes sense to specify the same here. It gives you a way to handle suspensions differently or do something when a suspension is being handled it is an object with the suspension type and a function. Something like this: + +``` +{ + '*': function() { + // do something here + } +} +``` + +- `breakHandler`: a break handler is needed to be able to stop processing.sk. Because processing.sk has a run loop outside skulpt you might want to implement a way to stop processing. The breakHandler is a function that gets called every run loop, so it should do as little as possible. You could have a global interrupt variable and throw an error when it's truthy. Something like this: + +``` +function () { + if (window.InterruptProcessing) { + throw new Error('interrupt'); + } +} +``` + +- `eventPredicate`: a function that filters which events should be handled by processing.sk. Processing reacts to all global events that bubble up to the window. So if you want to filter out events that control your application for example key press events on your editor. This is where you do that. It'll look something like this: + +``` +var editor = document.getElementById('editor'); + +function(event) { + if (editor.contains(e.target)) { + return false + } +} + + +[skulpt]: http://skulpt.org +[github]: http://github.com/skulpt/skulpt +``` diff --git a/package-lock.json b/package-lock.json index 8502602..12a1b65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,43 +7,43 @@ "@babel/code-frame": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", - "integrity": "sha1-BuKrGb21NThVWaq7W6WXKUgoAPg=", + "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==", "dev": true, "requires": { "@babel/highlight": "^7.0.0" } }, "@babel/core": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.0.0.tgz", - "integrity": "sha1-DLDA/S54oKK+yXaY9UmunOC5lRU=", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz", + "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.0.0", - "@babel/helpers": "^7.0.0", - "@babel/parser": "^7.0.0", - "@babel/template": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0", + "@babel/generator": "^7.4.4", + "@babel/helpers": "^7.4.4", + "@babel/parser": "^7.4.5", + "@babel/template": "^7.4.4", + "@babel/traverse": "^7.4.5", + "@babel/types": "^7.4.4", "convert-source-map": "^1.1.0", - "debug": "^3.1.0", - "json5": "^0.5.0", - "lodash": "^4.17.10", + "debug": "^4.1.0", + "json5": "^2.1.0", + "lodash": "^4.17.11", "resolve": "^1.3.2", "semver": "^5.4.1", "source-map": "^0.5.0" } }, "@babel/generator": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0.tgz", - "integrity": "sha1-Hv1Yv/qVHchGRJ5YzjodfwLTk6o=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", + "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", "dev": true, "requires": { - "@babel/types": "^7.0.0", + "@babel/types": "^7.4.4", "jsesc": "^2.5.1", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "source-map": "^0.5.0", "trim-right": "^1.0.1" } @@ -51,87 +51,87 @@ "@babel/helper-annotate-as-pure": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz", - "integrity": "sha1-Mj053QtQ4Qx8Bsp9djjmhk2MXDI=", + "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==", "dev": true, "requires": { "@babel/types": "^7.0.0" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.0.0.tgz", - "integrity": "sha1-uiYza+squ1R9WLbrpbhNd5daOes=", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz", + "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.0.0", + "@babel/helper-explode-assignable-expression": "^7.1.0", "@babel/types": "^7.0.0" } }, "@babel/helper-call-delegate": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.0.0.tgz", - "integrity": "sha1-4DaVa7M9duWcB6BKH/8UTp9iq3g=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz", + "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0" + "@babel/helper-hoist-variables": "^7.4.4", + "@babel/traverse": "^7.4.4", + "@babel/types": "^7.4.4" } }, "@babel/helper-define-map": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.0.0.tgz", - "integrity": "sha1-pWhN0q3zDwE3z5sL3kNvjC2xciU=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz", + "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.0.0", - "@babel/types": "^7.0.0", - "lodash": "^4.17.10" + "@babel/helper-function-name": "^7.1.0", + "@babel/types": "^7.4.4", + "lodash": "^4.17.11" } }, "@babel/helper-explode-assignable-expression": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.0.0.tgz", - "integrity": "sha1-/fpMiGA64+lU0PwyRNXKgvtGhJc=", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz", + "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==", "dev": true, "requires": { - "@babel/traverse": "^7.0.0", + "@babel/traverse": "^7.1.0", "@babel/types": "^7.0.0" } }, "@babel/helper-function-name": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0.tgz", - "integrity": "sha1-pozI0EQgzMZj3SWPnMQbgmHvotQ=", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", + "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", "dev": true, "requires": { "@babel/helper-get-function-arity": "^7.0.0", - "@babel/template": "^7.0.0", + "@babel/template": "^7.1.0", "@babel/types": "^7.0.0" } }, "@babel/helper-get-function-arity": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", - "integrity": "sha1-g1ctQyDipGVyY3NBE8QoaLZOScM=", + "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", "dev": true, "requires": { "@babel/types": "^7.0.0" } }, "@babel/helper-hoist-variables": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz", - "integrity": "sha1-Rq3ExedYZFrnpF3rkrqwkYwju4g=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz", + "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.4.4" } }, "@babel/helper-member-expression-to-functions": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz", - "integrity": "sha1-jNFLCg33/wDwCefXpDaUX0fHoW8=", + "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==", "dev": true, "requires": { "@babel/types": "^7.0.0" @@ -140,30 +140,30 @@ "@babel/helper-module-imports": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz", - "integrity": "sha1-lggbcRHkhtpNLNlxrRpP4hbMLj0=", + "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==", "dev": true, "requires": { "@babel/types": "^7.0.0" } }, "@babel/helper-module-transforms": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.0.0.tgz", - "integrity": "sha1-sB7n1UPoHow/xASxnJ8mrLbkz0w=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz", + "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", - "@babel/helper-simple-access": "^7.0.0", - "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/template": "^7.0.0", - "@babel/types": "^7.0.0", - "lodash": "^4.17.10" + "@babel/helper-simple-access": "^7.1.0", + "@babel/helper-split-export-declaration": "^7.4.4", + "@babel/template": "^7.4.4", + "@babel/types": "^7.4.4", + "lodash": "^4.17.11" } }, "@babel/helper-optimise-call-expression": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz", - "integrity": "sha1-opIMVwKwc8Fd5REGIAqoytIEl9U=", + "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==", "dev": true, "requires": { "@babel/types": "^7.0.0" @@ -172,89 +172,89 @@ "@babel/helper-plugin-utils": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz", - "integrity": "sha1-u7P77phmHFaQNCN8wDlnupm08lA=", + "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==", "dev": true }, "@babel/helper-regex": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz", - "integrity": "sha1-LBcYkjtX+bvmRwX/5WQKxk2b2yc=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz", + "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==", "dev": true, "requires": { - "lodash": "^4.17.10" + "lodash": "^4.17.11" } }, "@babel/helper-remap-async-to-generator": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.0.0.tgz", - "integrity": "sha1-ZRInPC/rkVh4IjNc+RP99oDCaQE=", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz", + "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-wrap-function": "^7.0.0", - "@babel/template": "^7.0.0", - "@babel/traverse": "^7.0.0", + "@babel/helper-wrap-function": "^7.1.0", + "@babel/template": "^7.1.0", + "@babel/traverse": "^7.1.0", "@babel/types": "^7.0.0" } }, "@babel/helper-replace-supers": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.0.0.tgz", - "integrity": "sha1-tvISNygOC+VPWR9jpGS2ZifO1wc=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz", + "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==", "dev": true, "requires": { "@babel/helper-member-expression-to-functions": "^7.0.0", "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0" + "@babel/traverse": "^7.4.4", + "@babel/types": "^7.4.4" } }, "@babel/helper-simple-access": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.0.0.tgz", - "integrity": "sha1-/zaieYOuTCcSLaL38pTc7YDsvQg=", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz", + "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==", "dev": true, "requires": { - "@babel/template": "^7.0.0", + "@babel/template": "^7.1.0", "@babel/types": "^7.0.0" } }, "@babel/helper-split-export-declaration": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz", - "integrity": "sha1-Oq4oXAMRwqsJXZl7jJqUytVH2BM=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", + "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", "dev": true, "requires": { - "@babel/types": "^7.0.0" + "@babel/types": "^7.4.4" } }, "@babel/helper-wrap-function": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.0.0.tgz", - "integrity": "sha1-HI5Cos+wgI4xQBid/pSQeCpvp0A=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz", + "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.0.0", - "@babel/template": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0" + "@babel/helper-function-name": "^7.1.0", + "@babel/template": "^7.1.0", + "@babel/traverse": "^7.1.0", + "@babel/types": "^7.2.0" } }, "@babel/helpers": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.0.0.tgz", - "integrity": "sha1-chM4g0HusHQX9EcQ/X4dAKz6asA=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz", + "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==", "dev": true, "requires": { - "@babel/template": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0" + "@babel/template": "^7.4.4", + "@babel/traverse": "^7.4.4", + "@babel/types": "^7.4.4" } }, "@babel/highlight": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz", - "integrity": "sha1-9xDDjI1Fjm3ZogGvtjf8t4HOmeQ=", + "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==", "dev": true, "requires": { "chalk": "^2.0.0", @@ -263,341 +263,377 @@ } }, "@babel/parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0.tgz", - "integrity": "sha1-aXZVGDOU+s/7BjQ33fUsAndph3U=", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz", + "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.0.0.tgz", - "integrity": "sha1-XR62tE/TiLl/lkNQAHq52gkLHXA=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz", + "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.0.0", - "@babel/plugin-syntax-async-generators": "^7.0.0" + "@babel/helper-remap-async-to-generator": "^7.1.0", + "@babel/plugin-syntax-async-generators": "^7.2.0" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.0.0.tgz", - "integrity": "sha1-O017XPUeHy5w9SNR0o1E/Clw0B4=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz", + "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-json-strings": "^7.0.0" + "@babel/plugin-syntax-json-strings": "^7.2.0" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.0.0.tgz", - "integrity": "sha1-mhe1R/ZNBna2yc7NTt90qCq4Xn4=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz", + "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.0.0" + "@babel/plugin-syntax-object-rest-spread": "^7.2.0" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.0.0.tgz", - "integrity": "sha1-thDZKP5VH/cRfULIu0EO7DEqZCU=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz", + "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.0.0" + "@babel/plugin-syntax-optional-catch-binding": "^7.2.0" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.0.0.tgz", - "integrity": "sha1-SYs5zXJTbNfEsmF30DAibroIzTM=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz", + "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.0.0", - "regexpu-core": "^4.2.0" + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.5.4" } }, "@babel/plugin-syntax-async-generators": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz", - "integrity": "sha1-vwiR3Nv1lVg1nQxib9yUkOILwTw=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz", + "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-json-strings": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.0.0.tgz", - "integrity": "sha1-DSWaaAkOFbODzjcQ4B1bI/N3DL0=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz", + "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-object-rest-spread": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.0.0.tgz", - "integrity": "sha1-N9j7yvIWvWWOoa6764t16I68VJs=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz", + "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.0.0.tgz", - "integrity": "sha1-iG9yAIs6ixhZd/fLcHE7ReUe5HU=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz", + "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.0.0.tgz", - "integrity": "sha1-psFIdYSMaKO0sxY6SGU17yXH50k=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz", + "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.0.0.tgz", - "integrity": "sha1-/q8Y9L/q8iNu6kstSHnagwBsyPU=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz", + "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.0.0" + "@babel/helper-remap-async-to-generator": "^7.1.0" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.0.0.tgz", - "integrity": "sha1-SCs/dRA5J+NyiLO2e2X4SOKqDQc=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz", + "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.0.0.tgz", - "integrity": "sha1-F0UHXt/9fNr2n6svtvlpRCS36bw=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz", + "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "lodash": "^4.17.10" + "lodash": "^4.17.11" } }, "@babel/plugin-transform-classes": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.0.0.tgz", - "integrity": "sha1-nmXKQBdH3emeNEuuqQq1Dcy0xGg=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz", + "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-define-map": "^7.0.0", - "@babel/helper-function-name": "^7.0.0", + "@babel/helper-define-map": "^7.4.4", + "@babel/helper-function-name": "^7.1.0", "@babel/helper-optimise-call-expression": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.0.0", - "@babel/helper-split-export-declaration": "^7.0.0", + "@babel/helper-replace-supers": "^7.4.4", + "@babel/helper-split-export-declaration": "^7.4.4", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.0.0.tgz", - "integrity": "sha1-L7uJAM0+gljyou3pCbkOdVYYXjE=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz", + "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-destructuring": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0.tgz", - "integrity": "sha1-aOkR4ZNd2i8Gtsy78YT/sCTp1Do=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz", + "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.0.0.tgz", - "integrity": "sha1-c6JNppvDw3AlH0Oj0EgZhUYRXlg=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz", + "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.0.0", - "regexpu-core": "^4.1.3" + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.5.4" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.0.0.tgz", - "integrity": "sha1-oGAeWAmR58rOCA5M+RnP1Y2nToY=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz", + "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.0.0.tgz", - "integrity": "sha1-xRtF4JCgGHb2TTK1tGwHmchepWw=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz", + "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.0.0", + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-for-of": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.0.0.tgz", - "integrity": "sha1-8rpOrbg70X3Dx+mzD0cHNl4cPjk=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz", + "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-function-name": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.0.0.tgz", - "integrity": "sha1-7toY3CJYThPDWBpo9r5IIrsdHYE=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz", + "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.0.0", + "@babel/helper-function-name": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-literals": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.0.0.tgz", - "integrity": "sha1-KuwdKc3STEBzWckwzdiekU7o/4Y=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz", + "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-member-expression-literals": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz", + "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.0.0.tgz", - "integrity": "sha1-JDCrc9uZYMTKiZZvQluAP10NBGg=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz", + "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.0.0", + "@babel/helper-module-transforms": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.0.0.tgz", - "integrity": "sha1-ILkG5asTDdjkVraUqU2VddoP1B8=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz", + "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.0.0", + "@babel/helper-module-transforms": "^7.4.4", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.0.0" + "@babel/helper-simple-access": "^7.1.0" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.0.0.tgz", - "integrity": "sha1-iHPYdtT+4jIJ3sxNH+q48ZjPLfQ=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz", + "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.0.0", + "@babel/helper-hoist-variables": "^7.4.4", "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.0.0.tgz", - "integrity": "sha1-57tPKmzRmWaJZCQZUaJQE0UDSb4=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz", + "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.0.0", + "@babel/helper-module-transforms": "^7.1.0", "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz", + "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==", + "dev": true, + "requires": { + "regexp-tree": "^0.1.6" + } + }, "@babel/plugin-transform-new-target": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz", - "integrity": "sha1-ro+9iVF/p4ktIOZWTmQeh3DDqko=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz", + "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-object-assign": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.0.0.tgz", - "integrity": "sha1-/KbXUA2WdcQoaLjziCl5IBuaWtg=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.2.0.tgz", + "integrity": "sha512-nmE55cZBPFgUktbF2OuoZgPRadfxosLOpSgzEPYotKSls9J4pEPcembi8r78RU37Rph6UApCpNmsQA4QMWK9Ng==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-object-super": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.0.0.tgz", - "integrity": "sha1-uFh9URMJs6Dpbp44FpkIs+OSBB4=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz", + "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.0.0" + "@babel/helper-replace-supers": "^7.1.0" } }, "@babel/plugin-transform-parameters": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.0.0.tgz", - "integrity": "sha1-2oZO+hEYFqbfFh1JLzPeEOdLGUk=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz", + "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==", "dev": true, "requires": { - "@babel/helper-call-delegate": "^7.0.0", + "@babel/helper-call-delegate": "^7.4.4", "@babel/helper-get-function-arity": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0" } }, + "@babel/plugin-transform-property-literals": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz", + "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, "@babel/plugin-transform-regenerator": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.0.0.tgz", - "integrity": "sha1-W0Foa07UC++HTX7WqEvdhJwT4ME=", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz", + "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==", + "dev": true, + "requires": { + "regenerator-transform": "^0.14.0" + } + }, + "@babel/plugin-transform-reserved-words": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz", + "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==", "dev": true, "requires": { - "regenerator-transform": "^0.13.3" + "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.0.0.tgz", - "integrity": "sha1-hfivWS3MB2R1QaA1DoyVx79BnRU=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz", + "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-spread": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.0.0.tgz", - "integrity": "sha1-k1g85I3YyF5T86RgVshW5K8wtJs=", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz", + "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.0.0.tgz", - "integrity": "sha1-MKnWSsKrRu7Ah7hTBTW+zZDnM2Y=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz", + "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -605,9 +641,9 @@ } }, "@babel/plugin-transform-template-literals": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.0.0.tgz", - "integrity": "sha1-CE8ZUu/lsVPdrmnriUX4gsepfGU=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz", + "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.0.0", @@ -615,144 +651,172 @@ } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.0.0.tgz", - "integrity": "sha1-Tc8eUulD5SZ7cxO/80f9vg+Bzsk=", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz", + "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.0.0.tgz", - "integrity": "sha1-xngOWxhjp2/nktkO3tn81bUdaPw=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz", + "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.0.0", - "regexpu-core": "^4.1.3" + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.5.4" } }, "@babel/preset-env": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.0.0.tgz", - "integrity": "sha1-9FDyAMFOcT+YyxTRE78MLPu4nKk=", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.5.tgz", + "integrity": "sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-async-generator-functions": "^7.0.0", - "@babel/plugin-proposal-json-strings": "^7.0.0", - "@babel/plugin-proposal-object-rest-spread": "^7.0.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.0.0", - "@babel/plugin-syntax-async-generators": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.0.0", - "@babel/plugin-transform-arrow-functions": "^7.0.0", - "@babel/plugin-transform-async-to-generator": "^7.0.0", - "@babel/plugin-transform-block-scoped-functions": "^7.0.0", - "@babel/plugin-transform-block-scoping": "^7.0.0", - "@babel/plugin-transform-classes": "^7.0.0", - "@babel/plugin-transform-computed-properties": "^7.0.0", - "@babel/plugin-transform-destructuring": "^7.0.0", - "@babel/plugin-transform-dotall-regex": "^7.0.0", - "@babel/plugin-transform-duplicate-keys": "^7.0.0", - "@babel/plugin-transform-exponentiation-operator": "^7.0.0", - "@babel/plugin-transform-for-of": "^7.0.0", - "@babel/plugin-transform-function-name": "^7.0.0", - "@babel/plugin-transform-literals": "^7.0.0", - "@babel/plugin-transform-modules-amd": "^7.0.0", - "@babel/plugin-transform-modules-commonjs": "^7.0.0", - "@babel/plugin-transform-modules-systemjs": "^7.0.0", - "@babel/plugin-transform-modules-umd": "^7.0.0", - "@babel/plugin-transform-new-target": "^7.0.0", - "@babel/plugin-transform-object-super": "^7.0.0", - "@babel/plugin-transform-parameters": "^7.0.0", - "@babel/plugin-transform-regenerator": "^7.0.0", - "@babel/plugin-transform-shorthand-properties": "^7.0.0", - "@babel/plugin-transform-spread": "^7.0.0", - "@babel/plugin-transform-sticky-regex": "^7.0.0", - "@babel/plugin-transform-template-literals": "^7.0.0", - "@babel/plugin-transform-typeof-symbol": "^7.0.0", - "@babel/plugin-transform-unicode-regex": "^7.0.0", - "browserslist": "^4.1.0", + "@babel/plugin-proposal-async-generator-functions": "^7.2.0", + "@babel/plugin-proposal-json-strings": "^7.2.0", + "@babel/plugin-proposal-object-rest-spread": "^7.4.4", + "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", + "@babel/plugin-syntax-async-generators": "^7.2.0", + "@babel/plugin-syntax-json-strings": "^7.2.0", + "@babel/plugin-syntax-object-rest-spread": "^7.2.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", + "@babel/plugin-transform-arrow-functions": "^7.2.0", + "@babel/plugin-transform-async-to-generator": "^7.4.4", + "@babel/plugin-transform-block-scoped-functions": "^7.2.0", + "@babel/plugin-transform-block-scoping": "^7.4.4", + "@babel/plugin-transform-classes": "^7.4.4", + "@babel/plugin-transform-computed-properties": "^7.2.0", + "@babel/plugin-transform-destructuring": "^7.4.4", + "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/plugin-transform-duplicate-keys": "^7.2.0", + "@babel/plugin-transform-exponentiation-operator": "^7.2.0", + "@babel/plugin-transform-for-of": "^7.4.4", + "@babel/plugin-transform-function-name": "^7.4.4", + "@babel/plugin-transform-literals": "^7.2.0", + "@babel/plugin-transform-member-expression-literals": "^7.2.0", + "@babel/plugin-transform-modules-amd": "^7.2.0", + "@babel/plugin-transform-modules-commonjs": "^7.4.4", + "@babel/plugin-transform-modules-systemjs": "^7.4.4", + "@babel/plugin-transform-modules-umd": "^7.2.0", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5", + "@babel/plugin-transform-new-target": "^7.4.4", + "@babel/plugin-transform-object-super": "^7.2.0", + "@babel/plugin-transform-parameters": "^7.4.4", + "@babel/plugin-transform-property-literals": "^7.2.0", + "@babel/plugin-transform-regenerator": "^7.4.5", + "@babel/plugin-transform-reserved-words": "^7.2.0", + "@babel/plugin-transform-shorthand-properties": "^7.2.0", + "@babel/plugin-transform-spread": "^7.2.0", + "@babel/plugin-transform-sticky-regex": "^7.2.0", + "@babel/plugin-transform-template-literals": "^7.4.4", + "@babel/plugin-transform-typeof-symbol": "^7.2.0", + "@babel/plugin-transform-unicode-regex": "^7.4.4", + "@babel/types": "^7.4.4", + "browserslist": "^4.6.0", + "core-js-compat": "^3.1.1", "invariant": "^2.2.2", "js-levenshtein": "^1.1.3", - "semver": "^5.3.0" + "semver": "^5.5.0" + } + }, + "@babel/runtime": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz", + "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.13.2" } }, "@babel/template": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0.tgz", - "integrity": "sha1-wryYcEBZWcianIFDdqLsskeDjIA=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", + "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.0.0", - "@babel/types": "^7.0.0" + "@babel/parser": "^7.4.4", + "@babel/types": "^7.4.4" } }, "@babel/traverse": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0.tgz", - "integrity": "sha1-sf6bZWf986tULPrW87MfhU15mmE=", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz", + "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.0.0", - "@babel/helper-function-name": "^7.0.0", - "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/parser": "^7.0.0", - "@babel/types": "^7.0.0", - "debug": "^3.1.0", + "@babel/generator": "^7.4.4", + "@babel/helper-function-name": "^7.1.0", + "@babel/helper-split-export-declaration": "^7.4.4", + "@babel/parser": "^7.4.5", + "@babel/types": "^7.4.4", + "debug": "^4.1.0", "globals": "^11.1.0", - "lodash": "^4.17.10" + "lodash": "^4.17.11" } }, "@babel/types": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0.tgz", - "integrity": "sha1-bhkXk9PIVNGcZ0mYnjvFXw6WIRg=", + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", + "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", "dev": true, "requires": { "esutils": "^2.0.2", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "to-fast-properties": "^2.0.0" } }, + "@samverschueren/stream-to-observable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", + "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==", + "dev": true, + "requires": { + "any-observable": "^0.3.0" + } + }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha1-4Xfmme4bjCLSMXTKqnQiZEOJUJ8=", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", "dev": true }, "@types/node": { - "version": "10.9.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.9.4.tgz", - "integrity": "sha1-D0yy3Hwd5glgVTV/cBeQQ8M+mJc=", + "version": "12.0.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.10.tgz", + "integrity": "sha512-LcsGbPomWsad6wmMNv7nBLw7YYYyfdYcz6xryKYQhx89c3XXan+8Q6AJ43G5XDIaklaVkK3mE4fCb0SBvMiPSQ==", + "dev": true + }, + "@types/normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", "dev": true }, "acorn": { - "version": "5.7.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha1-Z6ojG/iBKXS4UjWpZ3Hra9B+onk=", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", + "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "dev": true }, "acorn-jsx": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-4.1.1.tgz", - "integrity": "sha1-6OQeSOov4MiWdAYQq2pP/YrdIl4=", - "dev": true, - "requires": { - "acorn": "^5.0.3" - } + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz", + "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==", + "dev": true }, "ajv": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.3.tgz", - "integrity": "sha1-caVp0Yns9PTzISJP7LFm8HHdkPk=", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -761,16 +825,10 @@ "uri-js": "^4.2.2" } }, - "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", - "dev": true - }, "ansi-escapes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha1-9zIHu4EgfXX9bIPxJa8m7qN4yjA=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", "dev": true }, "ansi-regex": { @@ -782,34 +840,43 @@ "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { "color-convert": "^1.9.0" } }, + "any-observable": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz", + "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==", + "dev": true + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { "sprintf-js": "~1.0.2" } }, "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "dev": true }, "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, "array-union": { @@ -828,9 +895,9 @@ "dev": true }, "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, "arrify": { @@ -839,16 +906,89 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", + "dev": true + }, + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true + }, + "atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "dev": true, + "requires": { + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -856,52 +996,104 @@ } }, "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } } }, "browserslist": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.1.1.tgz", - "integrity": "sha1-Mo60/xIVsS32WJ6auC+K2qT8jNY=", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.3.tgz", + "integrity": "sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30000975", + "electron-to-chromium": "^1.3.164", + "node-releases": "^1.1.23" + } + }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dev": true, + "requires": { + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + } + }, + "caller-callsite": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", + "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000884", - "electron-to-chromium": "^1.3.62", - "node-releases": "^1.0.0-alpha.11" + "callsites": "^2.0.0" + }, + "dependencies": { + "callsites": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", + "dev": true + } } }, "caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", + "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", "dev": true, "requires": { - "callsites": "^0.2.0" + "caller-callsite": "^2.0.0" } }, "callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, "caniuse-lite": { - "version": "1.0.30000885", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000885.tgz", - "integrity": "sha1-6Inp+OflDnafKkljTJMriu5iKYQ=", + "version": "1.0.30000976", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000976.tgz", + "integrity": "sha512-tleNB1IwPRqZiod6nUNum63xQCMN96BUO2JTeiwuRM7p9d616EHsMBjBWJMudX39qCaPuWY8KEWzMZq7A9XQMQ==", "dev": true }, "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha1-GMSasWoDe26wFSzIPjRxM4IVtm4=", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -912,15 +1104,38 @@ "chardet": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4=", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=", + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", "dev": true }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -930,16 +1145,85 @@ "restore-cursor": "^2.0.0" } }, + "cli-truncate": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz", + "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=", + "dev": true, + "requires": { + "slice-ansi": "0.0.4", + "string-width": "^1.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "slice-ansi": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", + "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, "cli-width": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true + }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "dev": true, + "requires": { + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" + } + }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, "requires": { "color-name": "1.1.3" @@ -952,9 +1236,15 @@ "dev": true }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78=", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "dev": true + }, + "component-emitter": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, "concat-map": { @@ -966,16 +1256,77 @@ "convert-source-map": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha1-UbU3qMQ+DwTewZk7/83VBOdYrCA=", + "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", "dev": true, "requires": { "safe-buffer": "~5.1.1" } }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true + }, + "core-js-compat": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz", + "integrity": "sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==", + "dev": true, + "requires": { + "browserslist": "^4.6.2", + "core-js-pure": "3.1.4", + "semver": "^6.1.1" + }, + "dependencies": { + "semver": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz", + "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==", + "dev": true + } + } + }, + "core-js-pure": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz", + "integrity": "sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==", + "dev": true + }, + "cosmiconfig": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", + "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", + "dev": true, + "requires": { + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" + }, + "dependencies": { + "import-fresh": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", + "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", + "dev": true, + "requires": { + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" + } + }, + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", + "dev": true + } + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { "nice-try": "^1.0.4", @@ -985,51 +1336,139 @@ "which": "^1.2.9" } }, + "date-fns": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", + "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==", + "dev": true + }, "debug": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.4.tgz", - "integrity": "sha1-ghI3N8Ua++lgmitd/pZk50hxcfA=", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" } }, + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true + }, + "dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", + "dev": true + }, "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, + "requires": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, "del": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", - "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", + "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", "dev": true, "requires": { - "globby": "^5.0.0", + "globby": "^6.1.0", "is-path-cwd": "^1.0.0", "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", + "p-map": "^1.1.1", + "pify": "^3.0.0", "rimraf": "^2.2.8" } }, "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { "esutils": "^2.0.2" } }, "electron-to-chromium": { - "version": "1.3.65", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.65.tgz", - "integrity": "sha1-BlXCOORf6n4ODoH9DKxiuBhhKcI=", + "version": "1.3.172", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.172.tgz", + "integrity": "sha512-bHgFvYeHBiQNNuY/WvoX37zLosPgMbR8nKU1r4mylHptLvuMMny/KG/L28DTIlcoOCJjMAhEimy3DHDgDayPbg==", + "dev": true + }, + "elegant-spinner": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz", + "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, + "end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dev": true, + "requires": { + "once": "^1.4.0" + } + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -1037,55 +1476,53 @@ "dev": true }, "eslint": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.5.0.tgz", - "integrity": "sha1-hVf8zqtRQagZfan/2ZBPifZEJcY=", + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", + "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "ajv": "^6.5.3", + "ajv": "^6.9.1", "chalk": "^2.1.0", "cross-spawn": "^6.0.5", - "debug": "^3.1.0", - "doctrine": "^2.1.0", - "eslint-scope": "^4.0.0", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^4.0.3", "eslint-utils": "^1.3.1", "eslint-visitor-keys": "^1.0.0", - "espree": "^4.0.0", + "espree": "^5.0.1", "esquery": "^1.0.1", "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", + "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", "glob": "^7.1.2", "globals": "^11.7.0", "ignore": "^4.0.6", + "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.1.0", - "is-resolvable": "^1.1.0", - "js-yaml": "^3.12.0", + "inquirer": "^6.2.2", + "js-yaml": "^3.13.0", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.3.0", - "lodash": "^4.17.5", + "lodash": "^4.17.11", "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", "optionator": "^0.8.2", "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", "progress": "^2.0.0", - "regexpp": "^2.0.0", - "require-uncached": "^1.0.3", + "regexpp": "^2.0.1", "semver": "^5.5.1", "strip-ansi": "^4.0.0", "strip-json-comments": "^2.0.1", - "table": "^4.0.3", + "table": "^5.2.3", "text-table": "^0.2.0" } }, "eslint-scope": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", - "integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "dev": true, "requires": { "esrecurse": "^4.1.0", @@ -1095,35 +1532,36 @@ "eslint-utils": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=", + "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", "dev": true }, "eslint-visitor-keys": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=", + "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", "dev": true }, "espree": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-4.0.0.tgz", - "integrity": "sha1-JTmY8goPgttdhmOFeZ2RKoOjZjQ=", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", + "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", "dev": true, "requires": { - "acorn": "^5.6.0", - "acorn-jsx": "^4.1.1" + "acorn": "^6.0.7", + "acorn-jsx": "^5.0.0", + "eslint-visitor-keys": "^1.0.0" } }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, "esquery": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=", + "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", "dev": true, "requires": { "estraverse": "^4.0.0" @@ -1132,7 +1570,7 @@ "esrecurse": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", "dev": true, "requires": { "estraverse": "^4.1.0" @@ -1145,9 +1583,9 @@ "dev": true }, "estree-walker": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.2.tgz", - "integrity": "sha1-04UL51KclYDYFWALUxJlFeFG3Tk=", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", + "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", "dev": true }, "esutils": { @@ -1156,28 +1594,96 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "is-posix-bracket": "^0.1.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } } }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "fill-range": "^2.1.0" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } } }, "external-editor": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz", - "integrity": "sha1-WGbbKal4Jtvkvzr9JAcOrZ6kOic=", + "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", "dev": true, "requires": { "chardet": "^0.7.0", @@ -1186,12 +1692,68 @@ } }, "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "^1.0.0" + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } } }, "fast-deep-equal": { @@ -1222,59 +1784,83 @@ } }, "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", "dev": true, "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" + "flat-cache": "^2.0.1" } }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, "fill-range": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", - "integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^3.0.0", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "flat-cache": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", - "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", "dev": true, "requires": { - "circular-json": "^0.3.1", - "del": "^2.0.2", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" } }, + "flatted": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz", + "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==", + "dev": true + }, + "fn-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fn-name/-/fn-name-2.0.1.tgz", + "integrity": "sha1-UhTXU3pNBqSjAcDMJi/rhBiAAuc=", + "dev": true + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "for-in": "^1.0.1" + "map-cache": "^0.2.2" } }, "fs.realpath": { @@ -1289,64 +1875,101 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, - "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=", + "g-status": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/g-status/-/g-status-2.0.2.tgz", + "integrity": "sha512-kQoE9qH+T1AHKgSSD0Hkv98bobE90ILQcXAF4wvGgsr7uFqNvwmh8j+Lq3l0RVt3E3HjSbv2B9biEGcEtpHLCA==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "arrify": "^1.0.1", + "matcher": "^1.0.0", + "simple-git": "^1.85.0" } }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "get-own-enumerable-property-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz", + "integrity": "sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==", + "dev": true + }, + "get-stdin": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz", + "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==", + "dev": true + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" + "pump": "^3.0.0" } }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", + "dev": true + }, + "glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "dev": true, "requires": { - "is-glob": "^2.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "globals": { - "version": "11.7.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz", - "integrity": "sha1-pYP6pDBVsayncZFL9oJY4vwSVnM=", + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, "globby": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", - "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { "array-union": "^1.0.1", - "arrify": "^1.0.0", "glob": "^7.0.3", "object-assign": "^4.0.1", "pify": "^2.0.0", "pinkie-promise": "^2.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } } }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + } + } }, "has-flag": { "version": "3.0.0", @@ -1354,10 +1977,65 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", "dev": true }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "dev": true, + "requires": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "dependencies": { + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "hosted-git-info": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", + "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", + "dev": true + }, + "husky": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-2.5.0.tgz", + "integrity": "sha512-/aQIBaVMuzGi5X5BPliDPbHE+G+HDpWV7Zu28DiiXFMvHQcOeTsEnODWIGKyGBp7GM7rOgkxQdF+6AEo6xNtkw==", + "dev": true, + "requires": { + "cosmiconfig": "^5.2.1", + "execa": "^1.0.0", + "get-stdin": "^7.0.0", + "is-ci": "^2.0.0", + "pkg-dir": "^4.2.0", + "please-upgrade-node": "^3.1.1", + "read-pkg": "^5.1.1", + "run-node": "^1.0.0", + "slash": "^3.0.0" + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" @@ -1366,15 +2044,31 @@ "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, + "import-fresh": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz", + "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, + "indent-string": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz", + "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1386,62 +2080,144 @@ } }, "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, "inquirer": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz", - "integrity": "sha1-Ua3Nd29mE2ncHolIWcJWCiJKvdg=", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.4.1.tgz", + "integrity": "sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", "cli-cursor": "^2.1.0", "cli-width": "^2.0.0", - "external-editor": "^3.0.0", + "external-editor": "^3.0.3", "figures": "^2.0.0", - "lodash": "^4.17.10", + "lodash": "^4.17.11", "mute-stream": "0.0.7", "run-async": "^2.2.0", - "rxjs": "^6.1.0", + "rxjs": "^6.4.0", "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", + "strip-ansi": "^5.1.0", "through": "^2.3.6" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY=", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { "loose-envify": "^1.0.0" } }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true + "is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "dev": true, + "requires": { + "ci-info": "^2.0.0" + } }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-primitive": "^2.0.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true + } } }, + "is-directory": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", + "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", + "dev": true + }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -1449,9 +2225,9 @@ "dev": true }, "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-fullwidth-code-point": { @@ -1461,21 +2237,47 @@ "dev": true }, "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { - "is-extglob": "^1.0.0" + "is-extglob": "^2.1.1" } }, "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true + }, + "is-observable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz", + "integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==", + "dev": true, + "requires": { + "symbol-observable": "^1.1.0" } }, "is-path-cwd": { @@ -1487,7 +2289,7 @@ "is-path-in-cwd": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha1-WsSLNF72dTOb1sekipEhELJBz1I=", + "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", "dev": true, "requires": { "is-path-inside": "^1.0.0" @@ -1502,17 +2304,14 @@ "path-is-inside": "^1.0.1" } }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "requires": { + "isobject": "^3.0.1" + } }, "is-promise": { "version": "2.1.0", @@ -1520,10 +2319,22 @@ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, - "is-resolvable": { + "is-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", + "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=", + "dev": true + }, + "is-stream": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true }, "isarray": { @@ -1539,30 +2350,27 @@ "dev": true }, "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "dev": true }, "js-levenshtein": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.3.tgz", - "integrity": "sha1-PvYn30jsjPJLrPBcDxhP8w70E8U=", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", + "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==", "dev": true }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha1-GSA/tZmR35jjoocFDUZHzerzJJk=", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha1-6u1lbsg0TxD1J8a/obbiJE3hZ9E=", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -1570,15 +2378,21 @@ } }, "jsesc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", - "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, "json-stable-stringify-without-jsonify": { @@ -1588,20 +2402,20 @@ "dev": true }, "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", + "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "minimist": "^1.2.0" } }, + "kind-of": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "dev": true + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -1612,82 +2426,321 @@ "type-check": "~0.3.2" } }, - "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha1-G3eTz3JZ6jj7NmHU04syYK+K5Oc=", - "dev": true - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=", + "lint-staged": { + "version": "8.2.1", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-8.2.1.tgz", + "integrity": "sha512-n0tDGR/rTCgQNwXnUf/eWIpPNddGWxC32ANTNYsj2k02iZb7Cz5ox2tytwBu+2r0zDXMEMKw7Y9OD/qsav561A==", "dev": true, "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", - "dev": true - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "chalk": "^2.3.1", + "commander": "^2.14.1", + "cosmiconfig": "^5.2.0", + "debug": "^3.1.0", + "dedent": "^0.7.0", + "del": "^3.0.0", + "execa": "^1.0.0", + "g-status": "^2.0.2", + "is-glob": "^4.0.0", + "is-windows": "^1.0.2", + "listr": "^0.14.2", + "listr-update-renderer": "^0.5.0", + "lodash": "^4.17.11", + "log-symbols": "^2.2.0", + "micromatch": "^3.1.8", + "npm-which": "^3.0.1", + "p-map": "^1.1.1", + "path-is-inside": "^1.0.2", + "pify": "^3.0.0", + "please-upgrade-node": "^3.0.2", + "staged-git-files": "1.1.2", + "string-argv": "^0.0.2", + "stringify-object": "^3.2.2", + "yup": "^0.27.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + } } }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", + "listr": { + "version": "0.14.3", + "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz", + "integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "@samverschueren/stream-to-observable": "^0.3.0", + "is-observable": "^1.1.0", + "is-promise": "^2.1.0", + "is-stream": "^1.1.0", + "listr-silent-renderer": "^1.1.1", + "listr-update-renderer": "^0.5.0", + "listr-verbose-renderer": "^0.5.0", + "p-map": "^2.0.0", + "rxjs": "^6.3.3" + }, + "dependencies": { + "p-map": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", + "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", + "dev": true + } } }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "listr-silent-renderer": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz", + "integrity": "sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4=", "dev": true }, - "mkdirp": { - "version": "0.5.1", + "listr-update-renderer": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz", + "integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==", + "dev": true, + "requires": { + "chalk": "^1.1.3", + "cli-truncate": "^0.2.1", + "elegant-spinner": "^1.0.1", + "figures": "^1.7.0", + "indent-string": "^3.0.0", + "log-symbols": "^1.0.2", + "log-update": "^2.3.0", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" + } + }, + "log-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", + "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", + "dev": true, + "requires": { + "chalk": "^1.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, + "listr-verbose-renderer": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz", + "integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==", + "dev": true, + "requires": { + "chalk": "^2.4.1", + "cli-cursor": "^2.1.0", + "date-fns": "^1.27.2", + "figures": "^2.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "dev": true + }, + "log-symbols": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", + "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "dev": true, + "requires": { + "chalk": "^2.0.1" + } + }, + "log-update": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz", + "integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=", + "dev": true, + "requires": { + "ansi-escapes": "^3.0.0", + "cli-cursor": "^2.0.0", + "wrap-ansi": "^3.0.1" + } + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", + "dev": true + }, + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "dev": true, + "requires": { + "object-visit": "^1.0.0" + } + }, + "matcher": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz", + "integrity": "sha512-+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.4" + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "mixin-deep": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", + "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "dev": true, + "requires": { + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } + } + } + }, + "mkdirp": { + "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "requires": { "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "mute-stream": { @@ -1696,6 +2749,25 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "nanomatch": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + } + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", @@ -1705,41 +2777,118 @@ "nice-try": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y=", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, "node-releases": { - "version": "1.0.0-alpha.11", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.11.tgz", - "integrity": "sha1-c8gQrMLlt0Ghfd+7Od/Kmrk1nYo=", + "version": "1.1.23", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.23.tgz", + "integrity": "sha512-uq1iL79YjfYC0WXoHbC/z28q/9pOl8kSHaXdWmAAc8No+bDwqkZbzIJz55g/MUsPgSGm9LZ7QSUbzTcH5tz47w==", "dev": true, "requires": { "semver": "^5.3.0" } }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, + "npm-path": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz", + "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==", + "dev": true, + "requires": { + "which": "^1.2.10" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "^2.0.0" + } + }, + "npm-which": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz", + "integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=", + "dev": true, + "requires": { + "commander": "^2.9.0", + "npm-path": "^2.0.2", + "which": "^1.2.10" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true + }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "dev": true, + "requires": { + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "dev": true, + "requires": { + "isobject": "^3.0.0" + } + }, + "object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" + "isobject": "^3.0.1" } }, "once": { @@ -1780,18 +2929,73 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true + }, + "p-limit": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", + "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" + "p-limit": "^2.2.0" } }, + "p-map": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", + "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", + "dev": true + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", @@ -1813,13 +3017,13 @@ "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "dev": true }, "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true }, "pinkie": { @@ -1837,10 +3041,28 @@ "pinkie": "^2.0.0" } }, - "pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=", + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + }, + "please-upgrade-node": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz", + "integrity": "sha512-KY1uHnQ2NlQHqIJQpnh/i54rKkuxCEBx+voJIS/Mvb+L2iYd2NMotwduhKTMjfC1uKoX3VXOxLjIYG66dfJTVQ==", + "dev": true, + "requires": { + "semver-compare": "^1.0.0" + } + }, + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", "dev": true }, "prelude-ls": { @@ -1849,118 +3071,134 @@ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", "dev": true }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "prettier": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz", + "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==", "dev": true }, "private": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha1-I4Hts2ifelPWUxkAYPz4ItLzaP8=", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", "dev": true }, "progress": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz", - "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, + "property-expr": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-1.5.1.tgz", + "integrity": "sha512-CGuc0VUTGthpJXL36ydB6jnbyOf/rAHFvmVrJlH+Rg0DqqLFQGAP6hIaxD/G0OAmBJPhXDHuEJigrp0e0wFV6g==", + "dev": true + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, - "randomatic": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.0.tgz", - "integrity": "sha1-NvLKcI6eVn9e0uwBlJAm1QqhARY=", + "read-pkg": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.1.1.tgz", + "integrity": "sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==", "dev": true, "requires": { - "is-number": "^4.0.0", - "kind-of": "^6.0.0", - "math-random": "^1.0.1" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8=", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", - "dev": true - } + "@types/normalize-package-data": "^2.4.0", + "normalize-package-data": "^2.5.0", + "parse-json": "^4.0.0", + "type-fest": "^0.4.1" } }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha1-SoVuxLVuQHfFV1icroXnpMiGmhE=", + "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", "dev": true }, "regenerate-unicode-properties": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz", - "integrity": "sha1-EHQFr8xKGQ7F7UUOyqAO0Mr6ekw=", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz", + "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==", "dev": true, "requires": { "regenerate": "^1.4.0" } }, + "regenerator-runtime": { + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", + "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==", + "dev": true + }, "regenerator-transform": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.3.tgz", - "integrity": "sha1-JkvZ/zioziSwbgY2SWsshWtXvLs=", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz", + "integrity": "sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==", "dev": true, "requires": { "private": "^0.1.6" } }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=", + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "is-equal-shallow": "^0.1.3" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, + "regexp-tree": { + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.10.tgz", + "integrity": "sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==", + "dev": true + }, "regexpp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.0.tgz", - "integrity": "sha1-sqdTSoXKGwM7z1zp/45W1OB1U2U=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", "dev": true }, "regexpu-core": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.2.0.tgz", - "integrity": "sha1-o3RPoDgGz/4UbepEIaPnO9zEex0=", + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", + "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", "dev": true, "requires": { "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^7.0.0", - "regjsgen": "^0.4.0", - "regjsparser": "^0.3.0", + "regenerate-unicode-properties": "^8.0.2", + "regjsgen": "^0.5.0", + "regjsparser": "^0.6.0", "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.0.2" + "unicode-match-property-value-ecmascript": "^1.1.0" } }, "regjsgen": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.4.0.tgz", - "integrity": "sha1-wetMiaIJJj+HF8eCWRUjkT7eJWE=", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz", + "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==", "dev": true }, "regjsparser": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.3.0.tgz", - "integrity": "sha1-PDJtp/z9afoNMyV1pByMDN9YjJY=", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz", + "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==", "dev": true, "requires": { "jsesc": "~0.5.0" @@ -1974,16 +3212,10 @@ } } }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, "repeat-element": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=", + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==", "dev": true }, "repeat-string": { @@ -1992,29 +3224,25 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, - "require-uncached": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", - "dev": true, - "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" - } - }, "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha1-gvHsGaQjrB+9CAsLqwa6NuhKeiY=", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", + "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", "dev": true, "requires": { - "path-parse": "^1.0.5" + "path-parse": "^1.0.6" } }, "resolve-from": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, "restore-cursor": { @@ -2027,43 +3255,49 @@ "signal-exit": "^3.0.2" } }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true + }, "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=", + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "^7.0.5" + "glob": "^7.1.3" } }, "rollup": { - "version": "0.65.2", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.65.2.tgz", - "integrity": "sha1-4VMuPBouECyJ2ZKJoYT8u8fNS0o=", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.16.2.tgz", + "integrity": "sha512-UAZxaQvH0klYZdF+90xv9nGb+m4p8jdoaow1VL5/RzDK/gN/4CjvaMmJNcOIv1/+gtzswKhAg/467mzF0sLpAg==", "dev": true, "requires": { "@types/estree": "0.0.39", - "@types/node": "*" + "@types/node": "^12.0.8", + "acorn": "^6.1.1" } }, "rollup-plugin-babel": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.0.3.tgz", - "integrity": "sha1-goKw4iIzFg1nnpx2MTQuhIQi+wI=", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/rollup-plugin-babel/-/rollup-plugin-babel-4.3.3.tgz", + "integrity": "sha512-tKzWOCmIJD/6aKNz0H1GMM+lW1q9KyFubbWzGiOG540zxPPifnEAHTZwjo0g991Y+DyOZcLqBgqOdqazYE5fkw==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", - "rollup-pluginutils": "^2.3.0" + "rollup-pluginutils": "^2.8.1" } }, "rollup-pluginutils": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.3.1.tgz", - "integrity": "sha1-dg0YXMwjfe3BLXrkjGvNEntIktA=", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz", + "integrity": "sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==", "dev": true, "requires": { - "estree-walker": "^0.5.2", - "micromatch": "^2.3.11" + "estree-walker": "^0.6.1" } }, "run-async": { @@ -2075,10 +3309,16 @@ "is-promise": "^2.1.0" } }, + "run-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz", + "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==", + "dev": true + }, "rxjs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.2.tgz", - "integrity": "sha1-amiLFsTm6YDmLqgF7DBkjhxgkH8=", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", + "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -2087,21 +3327,59 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, + "requires": { + "ret": "~0.1.10" + } + }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, "semver": { - "version": "5.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz", - "integrity": "sha1-ff3YgUvbfKvHvg+x1zTPtmyUBHc=", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", + "dev": true + }, + "semver-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", "dev": true }, + "set-value": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", + "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", @@ -2123,37 +3401,280 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "simple-git": { + "version": "1.116.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-1.116.0.tgz", + "integrity": "sha512-Pbo3tceqMYy0j3U7jzMKabOWcx5+67GdgQUjpK83XUxGhA+1BX93UPvlWNzbCRoFwd7EJTyDSCC2XCoT4NTLYQ==", + "dev": true, + "requires": { + "debug": "^4.0.1" + } + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, "slice-ansi": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", "dev": true, "requires": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", "is-fullwidth-code-point": "^2.0.0" } }, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "dev": true, + "requires": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dev": true, + "requires": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, + "requires": { + "kind-of": "^3.2.0" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true }, + "source-map-resolve": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", + "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", + "dev": true, + "requires": { + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", + "dev": true + }, + "spdx-correct": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz", + "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==", + "dev": true + }, + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dev": true, + "requires": { + "extend-shallow": "^3.0.0" + } + }, "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, + "staged-git-files": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/staged-git-files/-/staged-git-files-1.1.2.tgz", + "integrity": "sha512-0Eyrk6uXW6tg9PYkhi/V/J4zHp33aNyi2hOCmhFLqLTIhbgqWn5jlSzI+IU0VqrZq6+DbHcabQl/WP6P3BG0QA==", + "dev": true + }, + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "dev": true, + "requires": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, + "string-argv": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.0.2.tgz", + "integrity": "sha1-2sMECGkMIfPDYwo/86BYd73L1zY=", + "dev": true + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" } }, + "stringify-object": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", + "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", + "dev": true, + "requires": { + "get-own-enumerable-property-symbols": "^3.0.0", + "is-obj": "^1.0.1", + "is-regexp": "^1.0.0" + } + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -2163,6 +3684,12 @@ "ansi-regex": "^3.0.0" } }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -2172,24 +3699,62 @@ "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { "has-flag": "^3.0.0" } }, + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "dev": true + }, + "synchronous-promise": { + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.9.tgz", + "integrity": "sha512-LO95GIW16x69LuND1nuuwM4pjgFGupg7pZ/4lU86AmchPKrhk0o2tpMU2unXRrqo81iAFe1YJ0nAGEVwsrZAgg==", + "dev": true + }, "table": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz", - "integrity": "sha1-ALXitgLxeUuayvnKkIp2OGp4E7w=", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.1.tgz", + "integrity": "sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==", "dev": true, "requires": { - "ajv": "^6.0.1", - "ajv-keywords": "^3.0.0", - "chalk": "^2.1.0", - "lodash": "^4.17.4", - "slice-ansi": "1.0.0", - "string-width": "^2.1.1" + "ajv": "^6.9.1", + "lodash": "^4.17.11", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, "text-table": { @@ -2207,7 +3772,7 @@ "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { "os-tmpdir": "~1.0.2" @@ -2219,6 +3784,54 @@ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", "dev": true }, + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, + "requires": { + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + }, + "toposort": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz", + "integrity": "sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=", + "dev": true + }, "trim-right": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", @@ -2226,9 +3839,9 @@ "dev": true }, "tslib": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", "dev": true }, "type-check": { @@ -2240,20 +3853,26 @@ "prelude-ls": "~1.1.2" } }, + "type-fest": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz", + "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==", + "dev": true + }, "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha1-rwLxgMEgfXZDLkc+0koo9KeCuuM=", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", + "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", "dev": true, "requires": { - "commander": "~2.17.1", + "commander": "~2.20.0", "source-map": "~0.6.1" }, "dependencies": { "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true } } @@ -2261,13 +3880,13 @@ "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", - "integrity": "sha1-JhmADEyCWADv3YNDr33Zkzy+KBg=", + "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", "dev": true }, "unicode-match-property-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", - "integrity": "sha1-jtKjJWmWG86SJ9Cc0/+7j+1fAgw=", + "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", "dev": true, "requires": { "unicode-canonical-property-names-ecmascript": "^1.0.4", @@ -2275,30 +3894,127 @@ } }, "unicode-match-property-value-ecmascript": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz", - "integrity": "sha1-nx3HaSbWzPRSMQVk/YNKzgWWY9Q=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz", + "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==", "dev": true }, "unicode-property-aliases-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz", - "integrity": "sha1-WlM/MbQxfqdvF9gH+g0RZUYRHdA=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz", + "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==", "dev": true }, + "union-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", + "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^0.4.3" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "set-value": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", + "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.1", + "to-object-path": "^0.3.0" + } + } + } + }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dev": true, + "requires": { + "has-value": "^0.3.1", + "isobject": "^3.0.0" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dev": true, + "requires": { + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true + } + } + }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", "dev": true, "requires": { "punycode": "^2.1.0" } }, + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "dev": true + }, + "use": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -2310,6 +4026,16 @@ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", "dev": true }, + "wrap-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz", + "integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=", + "dev": true, + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -2317,13 +4043,27 @@ "dev": true }, "write": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", "dev": true, "requires": { "mkdirp": "^0.5.1" } + }, + "yup": { + "version": "0.27.0", + "resolved": "https://registry.npmjs.org/yup/-/yup-0.27.0.tgz", + "integrity": "sha512-v1yFnE4+u9za42gG/b/081E7uNW9mUj3qtkmelLbW5YPROZzSH/KUUyJu9Wt8vxFJcT9otL/eZopS0YK1L5yPQ==", + "dev": true, + "requires": { + "@babel/runtime": "^7.0.0", + "fn-name": "~2.0.1", + "lodash": "^4.17.11", + "property-expr": "^1.5.0", + "synchronous-promise": "^2.0.6", + "toposort": "^2.0.2" + } } } } diff --git a/package.json b/package.json index 620fb8f..b03f3f6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "processing.sk", - "version": "0.0.6", + "version": "0.0.12", "description": "A python interface for processing.js for skulpt", "main": "main.js", "browserslist": "> 0.2%, ie=10", @@ -17,12 +17,30 @@ "license": "MIT", "dependencies": {}, "devDependencies": { - "@babel/core": "^7.0.0", - "@babel/plugin-transform-object-assign": "^7.0.0", - "@babel/preset-env": "^7.0.0", + "@babel/core": "^7.4.5", + "@babel/plugin-transform-object-assign": "^7.2.0", + "@babel/preset-env": "^7.4.5", "eslint": "^5.5.0", - "rollup": "^0.65.2", - "rollup-plugin-babel": "^4.0.3", - "uglify-js": "^3.1.9" + "husky": "^2.5.0", + "lint-staged": "^8.2.1", + "prettier": "1.18.2", + "rollup": "^1.16.2", + "rollup-plugin-babel": "^4.3.3", + "uglify-js": "^3.6.0" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "*.{js,css,json,md}": [ + "prettier --write", + "git add" + ], + "*.js": [ + "eslint --fix", + "git add" + ] } } diff --git a/processing-sk-min.js b/processing-sk-min.js index 895d1d1..1d371b4 100644 --- a/processing-sk-min.js +++ b/processing-sk-min.js @@ -1 +1 @@ -!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports):"function"==typeof define&&define.amd?define(["exports"],t):t(e.ProcessingSk={})}(this,function(p){"use strict";function _(){return(_=Object.assign||function(e){for(var t=1;t { - processingProxy.beginCamera(); - return self; - }, "__call__", [ self ]), - __enter__: makeFunc(self => self, "__enter__", [ self ]), - __exit__: makeFunc(() => processingProxy.endCamera(), "__exit__", [ - self, - { "exc_type": object, ignored }, - { "exc_value": object, ignored }, - { "traceback": object, ignored } - ]) - }, "beginCamera"], "beginCamera"), + beginCamera: cachedLazy( + constructOptionalContextManager, + [ + { + __call__: makeFunc( + self => { + processingProxy.beginCamera(); + return self; + }, + "__call__", + [self] + ), + __enter__: makeFunc(self => self, "__enter__", [self]), + __exit__: makeFunc(() => processingProxy.endCamera(), "__exit__", [ + self, + { exc_type: object, ignored }, + { exc_value: object, ignored }, + { traceback: object, ignored } + ]) + }, + "beginCamera" + ], + "beginCamera" + ), endCamera: makeFunc(processingProxy, "endCamera"), camera: makeFunc(processingProxy, "camera", [ - { "eyeX": [ int_, float_ ], optional }, - { "eyeY": [ int_, float_ ], optional }, - { "eyeZ": [ int_, float_ ], optional }, - { "centerX": [ int_, float_ ], optional }, - { "centerY": [ int_, float_ ], optional }, - { "centerZ": [ int_, float_ ], optional }, - { "upX": [ int_, float_ ], optional }, - { "upY": [ int_, float_ ], optional }, - { "upZ": [ int_, float_ ], optional } + { eyeX: [int_, float_], optional }, + { eyeY: [int_, float_], optional }, + { eyeZ: [int_, float_], optional }, + { centerX: [int_, float_], optional }, + { centerY: [int_, float_], optional }, + { centerZ: [int_, float_], optional }, + { upX: [int_, float_], optional }, + { upY: [int_, float_], optional }, + { upZ: [int_, float_], optional } ]), frustum: makeFunc(processingProxy, "frustum", [ - { "left": [ int_, float_ ] }, - { "right": [ int_, float_ ] }, - { "bottom": [ int_, float_ ] }, - { "top": [ int_, float_ ] }, - { "near": [ int_, float_ ] }, - { "far": [ int_, float_ ] } + { left: [int_, float_] }, + { right: [int_, float_] }, + { bottom: [int_, float_] }, + { top: [int_, float_] }, + { near: [int_, float_] }, + { far: [int_, float_] } ]), ortho: makeFunc(processingProxy, "ortho", [ - { "left": [ int_, float_ ], optional }, - { "right": [ int_, float_ ], optional }, - { "bottom": [ int_, float_ ], optional }, - { "top": [ int_, float_ ], optional }, - { "near": [ int_, float_ ], optional }, - { "far": [ int_, float_ ], optional } + { left: [int_, float_], optional }, + { right: [int_, float_], optional }, + { bottom: [int_, float_], optional }, + { top: [int_, float_], optional }, + { near: [int_, float_], optional }, + { far: [int_, float_], optional } ]), perspective: makeFunc(processingProxy, "perspective", [ - { "fov": [ int_, float_ ], optional }, - { "aspect": [ int_, float_ ], optional }, - { "zNear": [ int_, float_ ], optional }, - { "zFar": [ int_, float_ ], optional } + { fov: [int_, float_], optional }, + { aspect: [int_, float_], optional }, + { zNear: [int_, float_], optional }, + { zFar: [int_, float_], optional } ]), printCamera: makeFunc(processingProxy, "printCamera"), printProjection: makeFunc(processingProxy, "printProjection") -}; \ No newline at end of file +}; diff --git a/src/color-creatingandreading.js b/src/color-creatingandreading.js index d2970e7..353e549 100644 --- a/src/color-creatingandreading.js +++ b/src/color-creatingandreading.js @@ -2,49 +2,80 @@ import Sk from "./skulpt.js"; import { processingProxy, makeFunc, strToColor } from "./utils.js"; import { remappedConstants } from "./constants.js"; -const { BLEND, ADD, SUBTRACT, DARKEST, LIGHTEST, DIFFERENCE, - EXLUSION, MULTIPLY, SCREEN, OVERLAY, HARD_LIGHT, SOFT_LIGHT, DODGE, BURN } = remappedConstants; +const { + BLEND, + ADD, + SUBTRACT, + DARKEST, + LIGHTEST, + DIFFERENCE, + EXLUSION, + MULTIPLY, + SCREEN, + OVERLAY, + HARD_LIGHT, + SOFT_LIGHT, + DODGE, + BURN +} = remappedConstants; const { int_, float_, lng, str } = Sk.builtin; export default { alpha: makeFunc(processingProxy, "alpha", [ - { "color": [ int_, lng, float_, str ], converter: strToColor } + { color: [int_, lng, float_, str], converter: strToColor } ]), blendColor: makeFunc(processingProxy, "blendColor", [ - { "c1": [ int_, lng, float_, str ], converter: strToColor }, - { "c2": [ int_, lng, float_, str ], converter: strToColor }, - { "mode": int_, allowed: [ BLEND, ADD, SUBTRACT, DARKEST, LIGHTEST, DIFFERENCE, - EXLUSION, MULTIPLY, SCREEN, OVERLAY, HARD_LIGHT, SOFT_LIGHT, DODGE, BURN ]} + { c1: [int_, lng, float_, str], converter: strToColor }, + { c2: [int_, lng, float_, str], converter: strToColor }, + { + mode: int_, + allowed: [ + BLEND, + ADD, + SUBTRACT, + DARKEST, + LIGHTEST, + DIFFERENCE, + EXLUSION, + MULTIPLY, + SCREEN, + OVERLAY, + HARD_LIGHT, + SOFT_LIGHT, + DODGE, + BURN + ] + } ]), blue: makeFunc(processingProxy, "blue", [ - { "color": [ int_, lng, float_, str ], converter: strToColor } + { color: [int_, lng, float_, str], converter: strToColor } ]), brightness: makeFunc(processingProxy, "brightness", [ - { "color": [ int_, lng, float_, str ], converter: strToColor } + { color: [int_, lng, float_, str], converter: strToColor } ]), green: makeFunc(processingProxy, "green", [ - { "color": [ int_, lng, float_, str ], converter: strToColor } + { color: [int_, lng, float_, str], converter: strToColor } ]), hue: makeFunc(processingProxy, "hue", [ - { "color": [ int_, lng, float_, str ], converter: strToColor } + { color: [int_, lng, float_, str], converter: strToColor } ]), lerpColor: makeFunc(processingProxy, "lerpColor", [ - { "c1": [ int_, lng, float_, str ], converter: strToColor }, - { "c2": [ int_, lng, float_, str ], converter: strToColor }, - { "amt": [ int_, float_ ] } + { c1: [int_, lng, float_, str], converter: strToColor }, + { c2: [int_, lng, float_, str], converter: strToColor }, + { amt: [int_, float_] } ]), red: makeFunc(processingProxy, "red", [ - { "color": [ int_, lng, float_, str ], converter: strToColor } + { color: [int_, lng, float_, str], converter: strToColor } ]), saturation: makeFunc(processingProxy, "saturation", [ - { "color": [ int_, lng, float_, str ], converter: strToColor } + { color: [int_, lng, float_, str], converter: strToColor } ]) -}; \ No newline at end of file +}; diff --git a/src/color-setting.js b/src/color-setting.js index 119efee..442df42 100644 --- a/src/color-setting.js +++ b/src/color-setting.js @@ -7,25 +7,25 @@ const { int_, float_, str, lng } = Sk.builtin; export default { background: makeFunc(processingProxy, "background", [ - { "value1": [ int_, lng, float_, str, "PImage" ], converter: strToColor }, - { "value2": [ int_, float_ ], optional }, - { "value2": [ int_, float_ ], optional }, - { "alpha": [ int_, float_ ], optional } + { value1: [int_, lng, float_, str, "PImage"], converter: strToColor }, + { value2: [int_, float_], optional }, + { value2: [int_, float_], optional }, + { alpha: [int_, float_], optional } ]), colorMode: makeFunc(processingProxy, "colorMode", [ - { "mode": int_, allowed: [ RGB, HSB ] }, - { "range1": [ int_, float_ ], optional }, - { "range2": [ int_, float_ ], optional }, - { "range3": [ int_, float_ ], optional }, - { "range4": [ int_, float_ ], optional } + { mode: int_, allowed: [RGB, HSB] }, + { range1: [int_, float_], optional }, + { range2: [int_, float_], optional }, + { range3: [int_, float_], optional }, + { range4: [int_, float_], optional } ]), fill: makeFunc(processingProxy, "fill", [ - { "value1": [ int_, lng, float_, str ], converter: strToColor }, - { "value2": [ int_, float_ ], optional }, - { "value2": [ int_, float_ ], optional }, - { "alpha": [ int_, float_ ], optional } + { value1: [int_, lng, float_, str], converter: strToColor }, + { value2: [int_, float_], optional }, + { value2: [int_, float_], optional }, + { alpha: [int_, float_], optional } ]), noFill: makeFunc(processingProxy, "noFill"), @@ -33,9 +33,9 @@ export default { noStroke: makeFunc(processingProxy, "noStroke"), stroke: makeFunc(processingProxy, "stroke", [ - { "value1": [ int_, lng, float_, str ], converter: strToColor }, - { "value2": [ int_, float_ ], optional }, - { "value2": [ int_, float_ ], optional }, - { "alpha": [ int_, float_ ], optional } + { value1: [int_, lng, float_, str], converter: strToColor }, + { value2: [int_, float_], optional }, + { value2: [int_, float_], optional }, + { alpha: [int_, float_], optional } ]) -}; \ No newline at end of file +}; diff --git a/src/color.js b/src/color.js index df878ef..579f80a 100644 --- a/src/color.js +++ b/src/color.js @@ -4,8 +4,8 @@ import { processingProxy, makeFunc, optional, strToColor } from "./utils.js"; const { float_, int_, str, lng } = Sk.builtin; export default makeFunc(processingProxy, "color", [ - { "value1": [ int_, float_, str, lng ], "converter": strToColor }, - { "value2": [ int_, float_ ], optional }, - { "value3": [ int_, float_ ], optional }, - { "alpha": [ int_, float_ ], optional } -]); \ No newline at end of file + { value1: [int_, float_, str, lng], converter: strToColor }, + { value2: [int_, float_], optional }, + { value3: [int_, float_], optional }, + { alpha: [int_, float_], optional } +]); diff --git a/src/constants.js b/src/constants.js index b21db87..76fd91f 100644 --- a/src/constants.js +++ b/src/constants.js @@ -64,32 +64,32 @@ const constants = { VERTEX_FIELD_COUNT: 36, // Renderers - P2D: 1, + P2D: 1, JAVA2D: 1, - WEBGL: 2, - P3D: 2, + WEBGL: 2, + P3D: 2, OPENGL: 2, - PDF: 0, - DXF: 0, + PDF: 0, + DXF: 0, // Platform IDs - OTHER: 0, + OTHER: 0, WINDOWS: 1, - MAXOSX: 2, - LINUX: 3, + MAXOSX: 2, + LINUX: 3, EPSILON: 0.0001, - MAX_FLOAT: 3.4028235e+38, - MIN_FLOAT: -3.4028235e+38, - MAX_INT: 2147483647, - MIN_INT: -2147483648, + MAX_FLOAT: 3.4028235e38, + MIN_FLOAT: -3.4028235e38, + MAX_INT: 2147483647, + MIN_INT: -2147483648, - PI: Math.PI, - TWO_PI: 2 * Math.PI, - TAU: 2 * Math.PI, - HALF_PI: Math.PI / 2, - THIRD_PI: Math.PI / 3, + PI: Math.PI, + TWO_PI: 2 * Math.PI, + TAU: 2 * Math.PI, + HALF_PI: Math.PI / 2, + THIRD_PI: Math.PI / 3, QUARTER_PI: Math.PI / 4, DEG_TO_RAD: Math.PI / 180, @@ -98,214 +98,218 @@ const constants = { WHITESPACE: " \t\n\r\f\u00A0", // Color modes - RGB: 1, - ARGB: 2, - HSB: 3, + RGB: 1, + ARGB: 2, + HSB: 3, ALPHA: 4, - CMYK: 5, + CMYK: 5, // Image file types - TIFF: 0, + TIFF: 0, TARGA: 1, - JPEG: 2, - GIF: 3, + JPEG: 2, + GIF: 3, // Filter/convert types - BLUR: 11, - GRAY: 12, - INVERT: 13, - OPAQUE: 14, + BLUR: 11, + GRAY: 12, + INVERT: 13, + OPAQUE: 14, POSTERIZE: 15, THRESHOLD: 16, - ERODE: 17, - DILATE: 18, + ERODE: 17, + DILATE: 18, // Blend modes - REPLACE: 0, - BLEND: 1 << 0, - ADD: 1 << 1, - SUBTRACT: 1 << 2, - LIGHTEST: 1 << 3, - DARKEST: 1 << 4, + REPLACE: 0, + BLEND: 1 << 0, + ADD: 1 << 1, + SUBTRACT: 1 << 2, + LIGHTEST: 1 << 3, + DARKEST: 1 << 4, DIFFERENCE: 1 << 5, - EXCLUSION: 1 << 6, - MULTIPLY: 1 << 7, - SCREEN: 1 << 8, - OVERLAY: 1 << 9, + EXCLUSION: 1 << 6, + MULTIPLY: 1 << 7, + SCREEN: 1 << 8, + OVERLAY: 1 << 9, HARD_LIGHT: 1 << 10, SOFT_LIGHT: 1 << 11, - DODGE: 1 << 12, - BURN: 1 << 13, + DODGE: 1 << 12, + BURN: 1 << 13, // Color component bit masks ALPHA_MASK: 0xff000000, - RED_MASK: 0x00ff0000, + RED_MASK: 0x00ff0000, GREEN_MASK: 0x0000ff00, - BLUE_MASK: 0x000000ff, + BLUE_MASK: 0x000000ff, // Projection matrices - CUSTOM: 0, + CUSTOM: 0, ORTHOGRAPHIC: 2, - PERSPECTIVE: 3, + PERSPECTIVE: 3, // Shapes - POINT: 2, - POINTS: 2, - LINE: 4, - LINES: 4, - TRIANGLE: 8, - TRIANGLES: 9, + POINT: 2, + POINTS: 2, + LINE: 4, + LINES: 4, + TRIANGLE: 8, + TRIANGLES: 9, TRIANGLE_STRIP: 10, - TRIANGLE_FAN: 11, - QUAD: 16, - QUADS: 16, - QUAD_STRIP: 17, - POLYGON: 20, - PATH: 21, - RECT: 30, - ELLIPSE: 31, - ARC: 32, - SPHERE: 40, - BOX: 41, + TRIANGLE_FAN: 11, + QUAD: 16, + QUADS: 16, + QUAD_STRIP: 17, + POLYGON: 20, + PATH: 21, + RECT: 30, + ELLIPSE: 31, + ARC: 32, + SPHERE: 40, + BOX: 41, // Arc drawing modes //OPEN: 1, // shared with Shape closing modes - CHORD: 2, - PIE: 3, + CHORD: 2, + PIE: 3, - - GROUP: 0, - PRIMITIVE: 1, + GROUP: 0, + PRIMITIVE: 1, //PATH: 21, // shared with Shape PATH - GEOMETRY: 3, + GEOMETRY: 3, // Shape Vertex - VERTEX: 0, + VERTEX: 0, BEZIER_VERTEX: 1, - CURVE_VERTEX: 2, - BREAK: 3, - CLOSESHAPE: 4, + CURVE_VERTEX: 2, + BREAK: 3, + CLOSESHAPE: 4, // Shape closing modes - OPEN: 1, + OPEN: 1, CLOSE: 2, // Shape drawing modes - CORNER: 0, // Draw mode convention to use (x, y) to (width, height) - CORNERS: 1, // Draw mode convention to use (x1, y1) to (x2, y2) coordinates - RADIUS: 2, // Draw mode from the center, and using the radius - CENTER_RADIUS: 2, // Deprecated! Use RADIUS instead - CENTER: 3, // Draw from the center, using second pair of values as the diameter - DIAMETER: 3, // Synonym for the CENTER constant. Draw from the center + CORNER: 0, // Draw mode convention to use (x, y) to (width, height) + CORNERS: 1, // Draw mode convention to use (x1, y1) to (x2, y2) coordinates + RADIUS: 2, // Draw mode from the center, and using the radius + CENTER_RADIUS: 2, // Deprecated! Use RADIUS instead + CENTER: 3, // Draw from the center, using second pair of values as the diameter + DIAMETER: 3, // Synonym for the CENTER constant. Draw from the center CENTER_DIAMETER: 3, // Deprecated! Use DIAMETER instead // Text vertical alignment modes - BASELINE: 0, // Default vertical alignment for text placement - TOP: 101, // Align text to the top - BOTTOM: 102, // Align text from the bottom, using the baseline + BASELINE: 0, // Default vertical alignment for text placement + TOP: 101, // Align text to the top + BOTTOM: 102, // Align text from the bottom, using the baseline // UV Texture coordinate modes - NORMAL: 1, + NORMAL: 1, NORMALIZED: 1, - IMAGE: 2, + IMAGE: 2, // Text placement modes MODEL: 4, SHAPE: 5, // Stroke modes - SQUARE: "butt", - ROUND: "round", + SQUARE: "butt", + ROUND: "round", PROJECT: "square", - MITER: "miter", - BEVEL: "bevel", + MITER: "miter", + BEVEL: "bevel", // Lighting modes - AMBIENT: 0, + AMBIENT: 0, DIRECTIONAL: 1, //POINT: 2, Shared with Shape constant - SPOT: 3, + SPOT: 3, // Key constants // Both key and keyCode will be equal to these values BACKSPACE: 8, - TAB: 9, - ENTER: 10, - RETURN: 13, - ESC: 27, - DELETE: 127, - CODED: 0xffff, + TAB: 9, + ENTER: 10, + RETURN: 13, + ESC: 27, + DELETE: 127, + CODED: 0xffff, // p.key will be CODED and p.keyCode will be this value - SHIFT: 16, - CONTROL: 17, - ALT: 18, - CAPSLK: 20, - PGUP: 33, - PGDN: 34, - END: 35, - HOME: 36, - LEFT: 37, - UP: 38, - RIGHT: 39, - DOWN: 40, - F1: 112, - F2: 113, - F3: 114, - F4: 115, - F5: 116, - F6: 117, - F7: 118, - F8: 119, - F9: 120, - F10: 121, - F11: 122, - F12: 123, - NUMLK: 144, - META: 157, - INSERT: 155, + SHIFT: 16, + CONTROL: 17, + ALT: 18, + CAPSLK: 20, + PGUP: 33, + PGDN: 34, + END: 35, + HOME: 36, + LEFT: 37, + UP: 38, + RIGHT: 39, + DOWN: 40, + F1: 112, + F2: 113, + F3: 114, + F4: 115, + F5: 116, + F6: 117, + F7: 118, + F8: 119, + F9: 120, + F10: 121, + F11: 122, + F12: 123, + NUMLK: 144, + META: 157, + INSERT: 155, // Cursor types - ARROW: "default", - CROSS: "crosshair", - HAND: "pointer", - MOVE: "move", - TEXT: "text", - WAIT: "wait", - NOCURSOR: "url('data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='), auto", + ARROW: "default", + CROSS: "crosshair", + HAND: "pointer", + MOVE: "move", + TEXT: "text", + WAIT: "wait", + NOCURSOR: + "url('data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw=='), auto", // Hints - DISABLE_OPENGL_2X_SMOOTH: 1, - ENABLE_OPENGL_2X_SMOOTH: -1, - ENABLE_OPENGL_4X_SMOOTH: 2, - ENABLE_NATIVE_FONTS: 3, - DISABLE_DEPTH_TEST: 4, - ENABLE_DEPTH_TEST: -4, - ENABLE_DEPTH_SORT: 5, - DISABLE_DEPTH_SORT: -5, - DISABLE_OPENGL_ERROR_REPORT: 6, - ENABLE_OPENGL_ERROR_REPORT: -6, - ENABLE_ACCURATE_TEXTURES: 7, - DISABLE_ACCURATE_TEXTURES: -7, - HINT_COUNT: 10, + DISABLE_OPENGL_2X_SMOOTH: 1, + ENABLE_OPENGL_2X_SMOOTH: -1, + ENABLE_OPENGL_4X_SMOOTH: 2, + ENABLE_NATIVE_FONTS: 3, + DISABLE_DEPTH_TEST: 4, + ENABLE_DEPTH_TEST: -4, + ENABLE_DEPTH_SORT: 5, + DISABLE_DEPTH_SORT: -5, + DISABLE_OPENGL_ERROR_REPORT: 6, + ENABLE_OPENGL_ERROR_REPORT: -6, + ENABLE_ACCURATE_TEXTURES: 7, + DISABLE_ACCURATE_TEXTURES: -7, + HINT_COUNT: 10, // PJS defined constants - SINCOS_LENGTH: 720, // every half degree - PRECISIONB: 15, // fixed point precision is limited to 15 bits!! - PRECISIONF: 1 << 15, - PREC_MAXVAL: (1 << 15) - 1, - PREC_ALPHA_SHIFT: 24 - 15, - PREC_RED_SHIFT: 16 - 15, - NORMAL_MODE_AUTO: 0, - NORMAL_MODE_SHAPE: 1, + SINCOS_LENGTH: 720, // every half degree + PRECISIONB: 15, // fixed point precision is limited to 15 bits!! + PRECISIONF: 1 << 15, + PREC_MAXVAL: (1 << 15) - 1, + PREC_ALPHA_SHIFT: 24 - 15, + PREC_RED_SHIFT: 16 - 15, + NORMAL_MODE_AUTO: 0, + NORMAL_MODE_SHAPE: 1, NORMAL_MODE_VERTEX: 2, - MAX_LIGHTS: 8 + MAX_LIGHTS: 8 }; export default constants; -export const remappedConstants = Object.keys(constants).reduce(function(previous, current) { +export const remappedConstants = Object.keys(constants).reduce(function( + previous, + current +) { previous[current] = remapToPy(constants[current]); return previous; -}, {}); +}, +{}); diff --git a/src/coordinates.js b/src/coordinates.js index b6ac63c..c3bffbb 100644 --- a/src/coordinates.js +++ b/src/coordinates.js @@ -5,38 +5,38 @@ const { int_, float_ } = Sk.builtin; export default { modelX: makeFunc(processingProxy, "modelX", [ - { "x": [ int_, float_ ]}, - { "y": [ int_, float_ ]}, - { "z": [ int_, float_ ]} + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_] } ]), modelY: makeFunc(processingProxy, "modelY", [ - { "x": [ int_, float_ ]}, - { "y": [ int_, float_ ]}, - { "z": [ int_, float_ ]} + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_] } ]), modelZ: makeFunc(processingProxy, "modelZ", [ - { "x": [ int_, float_ ]}, - { "y": [ int_, float_ ]}, - { "z": [ int_, float_ ]} + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_] } ]), screenX: makeFunc(processingProxy, "screenX", [ - { "x": [ int_, float_ ]}, - { "y": [ int_, float_ ]}, - { "z": [ int_, float_ ]} + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_] } ]), screenY: makeFunc(processingProxy, "screenY", [ - { "x": [ int_, float_ ]}, - { "y": [ int_, float_ ]}, - { "z": [ int_, float_ ]} + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_] } ]), screenZ: makeFunc(processingProxy, "screenZ", [ - { "x": [ int_, float_ ]}, - { "y": [ int_, float_ ]}, - { "z": [ int_, float_ ]} + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_] } ]) }; diff --git a/src/curves.js b/src/curves.js index 4e1e9ab..e9c2979 100644 --- a/src/curves.js +++ b/src/curves.js @@ -5,67 +5,75 @@ const { int_, float_ } = Sk.builtin; export default { bezier: makeFunc(processingProxy, "bezier", [ - { "x1": [ int_, float_ ] }, - { "y1": [ int_, float_ ] }, - { "z1": [ int_, float_ ] }, - { "cx1": [ int_, float_ ] }, - { "cy1": [ int_, float_ ] }, - { "cz1": [ int_, float_ ] }, - { "cx2": [ int_, float_ ] }, - { "cy2": [ int_, float_ ] }, - { "cz2": [ int_, float_ ], optional }, - { "x2": [ int_, float_ ], optional }, - { "y2": [ int_, float_ ], optional }, - { "z2": [ int_, float_ ], optional }]), + { x1: [int_, float_] }, + { y1: [int_, float_] }, + { z1: [int_, float_] }, + { cx1: [int_, float_] }, + { cy1: [int_, float_] }, + { cz1: [int_, float_] }, + { cx2: [int_, float_] }, + { cy2: [int_, float_] }, + { cz2: [int_, float_], optional }, + { x2: [int_, float_], optional }, + { y2: [int_, float_], optional }, + { z2: [int_, float_], optional } + ]), - bezierDetail: makeFunc(processingProxy, "bezierDetail", [ - { "detail": int_ }]), + bezierDetail: makeFunc(processingProxy, "bezierDetail", [{ detail: int_ }]), bezierPoint: makeFunc(processingProxy, "bezierPoint", [ - { "a": [ int_, float_ ] }, - { "b": [ int_, float_ ] }, - { "c": [ int_, float_ ] }, - { "d": [ int_, float_ ] }, - { "t": [ int_, float_ ] }]), + { a: [int_, float_] }, + { b: [int_, float_] }, + { c: [int_, float_] }, + { d: [int_, float_] }, + { t: [int_, float_] } + ]), bezierTangent: makeFunc(processingProxy, "bezierTangent", [ - { "a": [ int_, float_ ] }, - { "b": [ int_, float_ ] }, - { "c": [ int_, float_ ] }, - { "d": [ int_, float_ ] }, - { "t": [ int_, float_ ] }]), + { a: [int_, float_] }, + { b: [int_, float_] }, + { c: [int_, float_] }, + { d: [int_, float_] }, + { t: [int_, float_] } + ]), curve: makeFunc(processingProxy, "curve", [ - { "x1": [ int_, float_ ] }, - { "y1": [ int_, float_ ] }, - { "z1": [ int_, float_ ] }, - { "x2": [ int_, float_ ] }, - { "y2": [ int_, float_ ] }, - { "z2": [ int_, float_ ] }, - { "x3": [ int_, float_ ] }, - { "y3": [ int_, float_ ] }, - { "z3": [ int_, float_ ], optional }, - { "x4": [ int_, float_ ], optional }, - { "y4": [ int_, float_ ], optional }, - { "z4": [ int_, float_ ], optional }]), + { x1: [int_, float_] }, + { y1: [int_, float_] }, + { z1: [int_, float_] }, + { x2: [int_, float_] }, + { y2: [int_, float_] }, + { z2: [int_, float_] }, + { x3: [int_, float_] }, + { y3: [int_, float_] }, + { z3: [int_, float_], optional }, + { x4: [int_, float_], optional }, + { y4: [int_, float_], optional }, + { z4: [int_, float_], optional } + ]), - curveDetail: makeFunc(processingProxy, "curveDetail", [ - { "detail": int_ }]), + curveDetail: makeFunc(processingProxy, "curveDetail", [{ detail: int_ }]), curvePoint: makeFunc(processingProxy, "curvePoint", [ - { "a": [ int_, float_ ] }, - { "b": [ int_, float_ ] }, - { "c": [ int_, float_ ] }, - { "d": [ int_, float_ ] }, - { "t": [ int_, float_ ] }]), + { a: [int_, float_] }, + { b: [int_, float_] }, + { c: [int_, float_] }, + { d: [int_, float_] }, + { t: [int_, float_] } + ]), - curveTangent: makeFunc(processingProxy, "curveTangent" [ - { "a": [ int_, float_ ] }, - { "b": [ int_, float_ ] }, - { "c": [ int_, float_ ] }, - { "d": [ int_, float_ ] }, - { "t": [ int_, float_ ] }]), + curveTangent: makeFunc( + processingProxy, + "curveTangent"[ + ({ a: [int_, float_] }, + { b: [int_, float_] }, + { c: [int_, float_] }, + { d: [int_, float_] }, + { t: [int_, float_] }) + ] + ), curveTightness: makeFunc(processingProxy, "curveTightness", [ - { "squishy": [ int_, float_ ] }]) -}; \ No newline at end of file + { squishy: [int_, float_] } + ]) +}; diff --git a/src/environment.js b/src/environment.js index 7ffffa4..eef49dd 100644 --- a/src/environment.js +++ b/src/environment.js @@ -7,10 +7,9 @@ const { func, int_ } = Sk.builtin; const { buildClass } = Sk.misceval; const { ARROW, CROSS, HAND, MOVE, TEXT, WAIT } = remappedConstants; - function environmentClass($gbl, $loc) { - $loc.__getattr__ = new func(function (self, key) { - switch(remapToJs(key)) { + $loc.__getattr__ = new func(function(self, key) { + switch (remapToJs(key)) { case "frameCount": return remapToPy(processingProxy.frameCount); case "frameRate": @@ -29,25 +28,39 @@ function environmentClass($gbl, $loc) { }); } -export const EnvironmentBuilder = mod => buildClass(mod, environmentClass, "Environment", []); +export const EnvironmentBuilder = mod => + buildClass(mod, environmentClass, "Environment", []); function frameRateClass($gbl, $loc) { - $loc.__init__ = makeFunc(self => { - self.v = processingProxy.__frameRate; - }, "__init__", [ self ]); - - $loc.__call__ = makeFunc((self, rate) => { - processingProxy.frameRate(rate); - self.v = rate; - }, "__call__", [ self, { "rate": int_ } ]); + $loc.__init__ = makeFunc( + self => { + self.v = processingProxy.__frameRate; + }, + "__init__", + [self] + ); + + $loc.__call__ = makeFunc( + (self, rate) => { + processingProxy.frameRate(rate); + self.v = rate; + }, + "__call__", + [self, { rate: int_ }] + ); } -export const FrameRateBuilder = mod => buildClass(mod, frameRateClass, "FrameRate", [ int_ ]); +export const FrameRateBuilder = mod => + buildClass(mod, frameRateClass, "FrameRate", [int_]); export const cursor = makeFunc(processingProxy, "cursor", [ - { "image": [ "PImage", int_ ], allowed: [ ARROW, CROSS, HAND, MOVE, TEXT, WAIT ], optional }, - { "x": int_, optional }, - { "y": int_, optional } + { + image: ["PImage", int_], + allowed: [ARROW, CROSS, HAND, MOVE, TEXT, WAIT], + optional + }, + { x: int_, optional }, + { y: int_, optional } ]); export const noCursor = makeFunc(processingProxy, "noCursor"); diff --git a/src/files.js b/src/files.js index d138039..e92c767 100644 --- a/src/files.js +++ b/src/files.js @@ -4,12 +4,8 @@ import { processingProxy, makeFunc, notImplemented } from "./utils.js"; const { str } = Sk.builtin; export default { - loadBytes: makeFunc(processingProxy, "loadBytes", [ - { "filename": str } - ]), - loadStrings: makeFunc(processingProxy, "loadStrings" [ - { "filename": str } - ]), + loadBytes: makeFunc(processingProxy, "loadBytes", [{ filename: str }]), + loadStrings: makeFunc(processingProxy, "loadStrings"[{ filename: str }]), createInput: notImplemented, selectFolder: notImplemented, selectInput: notImplemented diff --git a/src/font-attributes.js b/src/font-attributes.js index 2a9d2d1..5b2937d 100644 --- a/src/font-attributes.js +++ b/src/font-attributes.js @@ -2,29 +2,34 @@ import Sk from "./skulpt.js"; import { remappedConstants } from "./constants.js"; import { processingProxy, makeFunc } from "./utils.js"; -const { LEFT, CENTER, RIGHT, TOP, BOTTOM, BASELINE, - MODEL, SCREEN, SHAPE } = remappedConstants; +const { + LEFT, + CENTER, + RIGHT, + TOP, + BOTTOM, + BASELINE, + MODEL, + SCREEN, + SHAPE +} = remappedConstants; const { int_, float_, str } = Sk.builtin; export default { textAlign: makeFunc(processingProxy, "textAlign", [ - { "ALIGN": int_, allowed: [ LEFT, CENTER, RIGHT ] }, - { "YALIGN": int_, allowed: [ TOP, BOTTOM, BASELINE, CENTER ] } + { ALIGN: int_, allowed: [LEFT, CENTER, RIGHT] }, + { YALIGN: int_, allowed: [TOP, BOTTOM, BASELINE, CENTER] } ]), textLeading: makeFunc(processingProxy, "textLeading", [ - { "dist": [ int_, float_ ] } + { dist: [int_, float_] } ]), textMode: makeFunc(processingProxy, "textMode", [ - { "MODE": int_, allowed: [ MODEL, SCREEN, SHAPE ] } + { MODE: int_, allowed: [MODEL, SCREEN, SHAPE] } ]), - textSize: makeFunc(processingProxy, "textSize", [ - { "size": [ int_, float_ ] } - ]), + textSize: makeFunc(processingProxy, "textSize", [{ size: [int_, float_] }]), - textWidth: makeFunc(processingProxy, "textWidth", [ - { "width": str } - ]) -}; \ No newline at end of file + textWidth: makeFunc(processingProxy, "textWidth", [{ width: str }]) +}; diff --git a/src/font-metrics.js b/src/font-metrics.js index 1b770bf..df57495 100644 --- a/src/font-metrics.js +++ b/src/font-metrics.js @@ -1,7 +1,6 @@ - import { processingProxy, makeFunc } from "./utils.js"; export default { textAscent: makeFunc(processingProxy, "textAscent"), textDescent: makeFunc(processingProxy, "textDescent") -}; \ No newline at end of file +}; diff --git a/src/font.js b/src/font.js index c3eb509..31a0ea7 100644 --- a/src/font.js +++ b/src/font.js @@ -4,23 +4,23 @@ import { PFont } from "./processing.js"; const { func, float_, list, str, bool, int_ } = Sk.builtin; const { buildClass, callsim, loadname } = Sk.misceval; - -function createFontFunction (name, size, smooth, charset) { +function createFontFunction(name, size, smooth, charset) { let font = processingProxy.createFont(name, size, smooth, charset); let pfont = callsim(PFont); pfont.v = font; return pfont; } -function fontClass ($gbl, $loc) { - $loc.__init__ = makeFunc(function (self, input) { - if (input) { - self.v = new processingProxy.PFont(input); - } - }, "__init__", [ - self, - { "input ": str, optional } - ]); +function fontClass($gbl, $loc) { + $loc.__init__ = makeFunc( + function(self, input) { + if (input) { + self.v = new processingProxy.PFont(input); + } + }, + "__init__", + [self, { "input ": str, optional }] + ); let staticmethod = loadname("staticmethod", $gbl); let list_func = new func(() => new list(processingProxy.PFont.list())); @@ -30,26 +30,26 @@ function fontClass ($gbl, $loc) { export const PFontBuilder = mod => buildClass(mod, fontClass, "PFont", []); export const createFont = makeFunc(createFontFunction, "createFont", [ - { "name": str }, - { "size": [ int_, float_ ]}, - { "smooth": bool, optional }, - { "charset": str, optional } + { name: str }, + { size: [int_, float_] }, + { smooth: bool, optional }, + { charset: str, optional } ]); export const loadFont = makeFunc(processingProxy, "loadFont", [ - { "fontname": str } + { fontname: str } ]); export const text = makeFunc(processingProxy, "text", [ - { "data": [ str, int_, float_ ] }, - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] }, - { "z": [ int_, float_ ], optional }, - { "height": [ int_, float_ ], optional }, - { "z": [ int_, float_ ], optional } + { data: [str, int_, float_] }, + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_], optional }, + { height: [int_, float_], optional }, + { z: [int_, float_], optional } ]); export const textFont = makeFunc(processingProxy, "textFont", [ - { "font": "PFont" }, - { "size": [ int_, float_ ], optional } -]); \ No newline at end of file + { font: "PFont" }, + { size: [int_, float_], optional } +]); diff --git a/src/graphics.js b/src/graphics.js index b571c92..48b773d 100644 --- a/src/graphics.js +++ b/src/graphics.js @@ -11,9 +11,9 @@ const { remapToPy, remapToJs } = Sk.ffi; function graphicsInit(self, width, height, renderer) { self.v = processingProxy.createGraphics(width, height, renderer); if (renderer === undefined || renderer === P2D || renderer === JAVA2D) { - // monkey patching image to make sure toImageData returns something. - // 2017 Chrome 64 doesn't always return something the first call. - // this is a VERY HACKY way to deal with that synchronously. + // monkey patching image to make sure toImageData returns something. + // 2017 Chrome 64 doesn't always return something the first call. + // this is a VERY HACKY way to deal with that synchronously. self.v.toImageData = function(x, y, w, h) { x = x !== undefined ? x : 0; y = y !== undefined ? y : 0; @@ -31,16 +31,20 @@ function graphicsInit(self, width, height, renderer) { function graphicsClass($gbl, $loc) { $loc.__init__ = makeFunc(graphicsInit, "__init__", [ self, - { "width": int_ }, - { "height": int_ }, - { "renderer": int_, allowed: [ P2D, JAVA2D, WEBGL, P3D, OPENGL, PDF, DXF ], optional } + { width: int_ }, + { height: int_ }, + { + renderer: int_, + allowed: [P2D, JAVA2D, WEBGL, P3D, OPENGL, PDF, DXF], + optional + } ]); - $loc.beginDraw = new func(function (self) { + $loc.beginDraw = new func(function(self) { self.v.beginDraw(); }); - $loc.endDraw = new func(function (self) { + $loc.endDraw = new func(function(self) { self.v.endDraw(); }); @@ -59,13 +63,14 @@ function graphicsClass($gbl, $loc) { }); } -export const PGraphicsBuilder = mod => buildClass(mod, graphicsClass, "PGraphics", []); +export const PGraphicsBuilder = mod => + buildClass(mod, graphicsClass, "PGraphics", []); -export const createGraphics = new func(function (width, height, renderer) { +export const createGraphics = new func(function(width, height, renderer) { return callsim(PGraphics, width, height, renderer); }); -export const hint = new func(function (item) { +export const hint = new func(function(item) { // hint(item) processingProxy.hint(item); }); diff --git a/src/image.js b/src/image.js index bc99a62..0d3cc69 100644 --- a/src/image.js +++ b/src/image.js @@ -1,20 +1,53 @@ import { PImage } from "./processing.js"; import Sk from "./skulpt.js"; -import { processingProxy, makeFunc, optional, ignored, self, strToColor } from "./utils.js"; +import { + processingProxy, + makeFunc, + optional, + ignored, + self, + strToColor +} from "./utils.js"; import { remappedConstants } from "./constants.js"; const { func, int_, list, str, float_, lng, IOError, list_iter_ } = Sk.builtin; const { buildClass, callsim, Suspension } = Sk.misceval; const { remapToJs, remapToPy } = Sk.ffi; -const { BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, DIFFERENCE, EXCLUSION, - MULTIPLY, SCREEN, OVERLAY, HARD, LIGHT, SOFT_LIGHT, DODGE, BURN, - THRESHOLD, GRAY, INVERT, POSTERIZE, BLUR, OPAQUE, ERODE, DILATE, - CORNER, CORNERS, CENTER, RGB, ARGB, ALPHA} = remappedConstants; +const { + BLEND, + ADD, + SUBTRACT, + LIGHTEST, + DARKEST, + DIFFERENCE, + EXCLUSION, + MULTIPLY, + SCREEN, + OVERLAY, + HARD, + LIGHT, + SOFT_LIGHT, + DODGE, + BURN, + THRESHOLD, + GRAY, + INVERT, + POSTERIZE, + BLUR, + OPAQUE, + ERODE, + DILATE, + CORNER, + CORNERS, + CENTER, + RGB, + ARGB, + ALPHA +} = remappedConstants; let PixelProxy = null; function imageLoadImage(img) { - let imageUrl = img; if (typeof Sk.imageProxy === "function") { @@ -79,7 +112,18 @@ function imageSet(self, x, y, color) { self.v.set(x, y, color); } -function imageCopy(self, srcImg, sx, sy, swidth, sheight, dx, dy, dwidth, dheight) { +function imageCopy( + self, + srcImg, + sx, + sy, + swidth, + sheight, + dx, + dy, + dwidth, + dheight +) { return self.v.copy(srcImg, sx, sy, swidth, sheight, dx, dy, dwidth, dheight); } @@ -87,7 +131,18 @@ function imageMask(self, maskImg) { self.v.mask(maskImg); } -function imageBlend(self, srcImg, x, y, width, height, dx, dy, dwidth, dheight) { +function imageBlend( + self, + srcImg, + x, + y, + width, + height, + dx, + dy, + dwidth, + dheight +) { self.v.blend(srcImg, x, y, width, height, dx, dy, dwidth, dheight); } @@ -112,41 +167,57 @@ function imageUpdatePixels(self, x, y, w, h) { } function pixelProxy($glb, $loc) { - $loc.__init__ = makeFunc(function(self, image) { - self.image = image; - }, "__init__", [ - self, - { "image": "PImage", optional } - ]); + $loc.__init__ = makeFunc( + function(self, image) { + self.image = image; + }, + "__init__", + [self, { image: "PImage", optional }] + ); $loc.__getitem__ = makeFunc( (self, index) => self.image.pixels.getPixel(index), - "__getitem__", [ self, { "index": int_ }]); + "__getitem__", + [self, { index: int_ }] + ); $loc.__setitem__ = makeFunc( (self, index, color) => self.image.pixels.setPixel(index, color), - "__setitem__", [ self, { "index": int_ }, { "color": [ int_, lng, float_, str ], - converter: strToColor }]); - - $loc.__iter__ = new Sk.builtin.func(function (self) { + "__setitem__", + [ + self, + { index: int_ }, + { color: [int_, lng, float_, str], converter: strToColor } + ] + ); + + $loc.__iter__ = new Sk.builtin.func(function(self) { Sk.builtin.pyCheckArgs("__iter__", arguments, 0, 0, true, false); return new list_iter_(new list(self.image.pixels.toArray())); }); - $loc.__repr__ = makeFunc(self => `array('i', [${self.image.pixels.toArray().join(", ")}])`, "__repr__", [ self ]); - - $loc.__len__ = makeFunc(self => self.image.width * self.image.height, "__len__", [ self ]); + $loc.__repr__ = makeFunc( + self => `array('i', [${self.image.pixels.toArray().join(", ")}])`, + "__repr__", + [self] + ); + + $loc.__len__ = makeFunc( + self => self.image.width * self.image.height, + "__len__", + [self] + ); } function imageClass($gbl, $loc) { $loc.__init__ = makeFunc(imageInit, "__init__", [ self, - { "width": [ int_, str ], optional }, - { "height": int_, optional }, - { "format": int_, allowed: [ 1, 2, 4 ], optional } + { width: [int_, str], optional }, + { height: int_, optional }, + { format: int_, allowed: [1, 2, 4], optional } ]); - $loc.__getattr__ = new func(function (self, key) { + $loc.__getattr__ = new func(function(self, key) { key = remapToJs(key); if (key === "width") { return remapToPy(self.v.width); @@ -161,77 +232,96 @@ function imageClass($gbl, $loc) { $loc.get = makeFunc(imageGet, "get", [ self, - { "x": int_ }, - { "y": int_ }, - { "width": int_, optional }, - { "height": int_, optional } + { x: int_ }, + { y: int_ }, + { width: int_, optional }, + { height: int_, optional } ]); $loc.set = makeFunc(imageSet, "set", [ self, - { "x": int_ }, - { "y": int_ }, - { "color": [ int_, lng, float_, str ], converter: strToColor } + { x: int_ }, + { y: int_ }, + { color: [int_, lng, float_, str], converter: strToColor } ]); $loc.copy = makeFunc(imageCopy, "copy", [ self, - { "srcImg": [ int_, "PImage" ]}, - { "sx": int_ }, - { "sy": int_ }, - { "swidth": int_ }, - { "sheight": int_ }, - { "dx": int_ }, - { "dy": int_ }, - { "dwidth": int_ }, - { "dheight": int_, optional } + { srcImg: [int_, "PImage"] }, + { sx: int_ }, + { sy: int_ }, + { swidth: int_ }, + { sheight: int_ }, + { dx: int_ }, + { dy: int_ }, + { dwidth: int_ }, + { dheight: int_, optional } ]); $loc.mask = makeFunc(imageMask, "mask", [ self, - { "maskImg": ["PImage", list] } + { maskImg: ["PImage", list] } ]); $loc.blend = makeFunc(imageBlend, "blend", [ self, - { "srcImg": [ int_, "PImage" ]}, - { "x": int_ }, - { "y": int_ }, - { "width": int_ }, - { "height": int_ }, - { "dx": int_ }, - { "dy": int_ }, - { "dwidth": int_ }, - { "dheight": int_ }, - { "MODE": int_, optional, allowed: [ BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, DIFFERENCE, EXCLUSION, - MULTIPLY, SCREEN, OVERLAY, HARD, LIGHT, SOFT_LIGHT, DODGE, BURN ]} + { srcImg: [int_, "PImage"] }, + { x: int_ }, + { y: int_ }, + { width: int_ }, + { height: int_ }, + { dx: int_ }, + { dy: int_ }, + { dwidth: int_ }, + { dheight: int_ }, + { + MODE: int_, + optional, + allowed: [ + BLEND, + ADD, + SUBTRACT, + LIGHTEST, + DARKEST, + DIFFERENCE, + EXCLUSION, + MULTIPLY, + SCREEN, + OVERLAY, + HARD, + LIGHT, + SOFT_LIGHT, + DODGE, + BURN + ] + } ]); $loc.filter = makeFunc(imageFilter, "filter", [ self, - { "MODE": int_, allowed: [ THRESHOLD, GRAY, INVERT, POSTERIZE, BLUR, OPAQUE, ERODE, DILATE ]}, - { "srcImg": "PImage", optional } + { + MODE: int_, + allowed: [THRESHOLD, GRAY, INVERT, POSTERIZE, BLUR, OPAQUE, ERODE, DILATE] + }, + { srcImg: "PImage", optional } ]); - $loc.save = makeFunc(imageSave, "save", [ - self, - { "filename": str } - ]); + $loc.save = makeFunc(imageSave, "save", [self, { filename: str }]); $loc.resize = makeFunc(imageResize, "resize", [ self, - { "wide": int_ }, - { "high": int_ } + { wide: int_ }, + { high: int_ } ]); - $loc.loadPixels = makeFunc(imageLoadPixels, "loadPixels", [ self ]); + $loc.loadPixels = makeFunc(imageLoadPixels, "loadPixels", [self]); $loc.updatePixels = makeFunc(imageUpdatePixels, "updatePixels", [ self, - { "x": int_, optional }, - { "y": int_, optional }, - { "w": int_, optional }, - { "h": int_, optional } + { x: int_, optional }, + { y: int_, optional }, + { w: int_, optional }, + { h: int_, optional } ]); } @@ -242,91 +332,117 @@ const PImageBuilder = mod => { export default PImageBuilder; -export const createImage = makeFunc(function (width, height, format) { - let image = Sk.misceval.callsim(PImage); - image.v = processingProxy.createImage(width, height, format); - return image; -}, "createFunc", [ - { "width": int_ }, - { "height": int_ }, - { "format": int_, allowed: [ RGB, ARGB, ALPHA ] } -]); +export const createImage = makeFunc( + function(width, height, format) { + let image = Sk.misceval.callsim(PImage); + image.v = processingProxy.createImage(width, height, format); + return image; + }, + "createFunc", + [ + { width: int_ }, + { height: int_ }, + { format: int_, allowed: [RGB, ARGB, ALPHA] } + ] +); export const image = makeFunc(processingProxy, "image", [ - { "img": [ "PImage", "PGraphics"] }, - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] }, - { "width": [ int_, float_ ], optional }, - { "height": [ int_, float_ ], optional } + { img: ["PImage", "PGraphics"] }, + { x: [int_, float_] }, + { y: [int_, float_] }, + { width: [int_, float_], optional }, + { height: [int_, float_], optional } ]); export const imageMode = makeFunc(processingProxy, "imageMode", [ - { "mode": int_, allowed: [ CORNER, CORNERS, CENTER ] } + { mode: int_, allowed: [CORNER, CORNERS, CENTER] } ]); export const loadImage = makeFunc(imageLoadImage, "loadImage", [ - { "image": str }, - { "extension": str, optional, ignored } + { image: str }, + { extension: str, optional, ignored } ]); export const noTint = makeFunc(processingProxy, "noTint"); export const requestImage = makeFunc(imageRequestImage, "requestImage", [ - { "filename": str }, - { "extension": str, optional } + { filename: str }, + { extension: str, optional } ]); export const tint = makeFunc(processingProxy, "tint", [ - { "value1": [ int_, lng, float_, str ], converter: strToColor }, - { "value2": [ int_, float_ ], optional }, - { "value3": [ int_, float_ ], optional }, - { "alpha": [ int_, float_ ], optional } + { value1: [int_, lng, float_, str], converter: strToColor }, + { value2: [int_, float_], optional }, + { value3: [int_, float_], optional }, + { alpha: [int_, float_], optional } ]); export const blend = makeFunc(processingProxy, "blend", [ - { "srcImg": [ int_, "PImage" ]}, - { "x": int_ }, - { "y": int_ }, - { "width": int_ }, - { "height": int_ }, - { "dx": int_ }, - { "dy": int_ }, - { "dwidth": int_ }, - { "dheight": int_ }, - { "MODE": int_, optional, allowed: [ BLEND, ADD, SUBTRACT, LIGHTEST, DARKEST, DIFFERENCE, EXCLUSION, - MULTIPLY, SCREEN, OVERLAY, HARD, LIGHT, SOFT_LIGHT, DODGE, BURN ]} + { srcImg: [int_, "PImage"] }, + { x: int_ }, + { y: int_ }, + { width: int_ }, + { height: int_ }, + { dx: int_ }, + { dy: int_ }, + { dwidth: int_ }, + { dheight: int_ }, + { + MODE: int_, + optional, + allowed: [ + BLEND, + ADD, + SUBTRACT, + LIGHTEST, + DARKEST, + DIFFERENCE, + EXCLUSION, + MULTIPLY, + SCREEN, + OVERLAY, + HARD, + LIGHT, + SOFT_LIGHT, + DODGE, + BURN + ] + } ]); export const copy = makeFunc(processingProxy, "copy", [ - { "srcImg": [ int_, "PImage" ]}, - { "sx": int_ }, - { "sy": int_ }, - { "swidth": int_ }, - { "sheight": int_ }, - { "dx": int_ }, - { "dy": int_ }, - { "dwidth": int_ }, - { "dheight": int_, optional } + { srcImg: [int_, "PImage"] }, + { sx: int_ }, + { sy: int_ }, + { swidth: int_ }, + { sheight: int_ }, + { dx: int_ }, + { dy: int_ }, + { dwidth: int_ }, + { dheight: int_, optional } ]); export const filter = makeFunc(processingProxy, "filter", [ - { "MODE": int_, allowed: [ THRESHOLD, GRAY, INVERT, POSTERIZE, BLUR, OPAQUE, ERODE, DILATE ]}, - { "srcImg": "PImage", optional } + { + MODE: int_, + allowed: [THRESHOLD, GRAY, INVERT, POSTERIZE, BLUR, OPAQUE, ERODE, DILATE] + }, + { srcImg: "PImage", optional } ]); export const get = makeFunc(processingProxy, "get", [ - { "x": int_, optional }, - { "y": int_, optional }, - { "width": int_, optional }, - { "height": int_, optional }, + { x: int_, optional }, + { y: int_, optional }, + { width: int_, optional }, + { height: int_, optional } ]); export const loadPixels = makeFunc(processingProxy, "loadPixels"); export const set = makeFunc(processingProxy, "set", [ - { "x": int_ }, - { "y": int_ }, - { "image": [ "PImage", int_, lng, float_, str ], converter: strToColor }, + { x: int_ }, + { y: int_ }, + { image: ["PImage", int_, lng, float_, str], converter: strToColor } ]); export const updatePixels = makeFunc(processingProxy, "updatePixels"); @@ -337,4 +453,4 @@ export function pixels() { pixels: processingProxy.pixels }; return pp; -} \ No newline at end of file +} diff --git a/src/keyboard.js b/src/keyboard.js index 496783a..48775d8 100644 --- a/src/keyboard.js +++ b/src/keyboard.js @@ -7,22 +7,21 @@ const { remapToPy, remapToJs } = Sk.ffi; const { func } = Sk.builtin; const { buildClass } = Sk.misceval; -function keyboardClass ($gbl, $loc) { - $loc.__getattr__ = new func(function (self, attr) { +function keyboardClass($gbl, $loc) { + $loc.__getattr__ = new func(function(self, attr) { let l_attr = remapToJs(attr); if (l_attr === "key") { return key(); - } - else if (l_attr === "keyCode") { + } else if (l_attr === "keyCode") { return keyCode(); - } - else if (l_attr === "keyPressed") { + } else if (l_attr === "keyPressed") { return keyPressed(); } }); } -export const KeyboardBuilder = mod => buildClass(mod, keyboardClass, "Keyboard", []); +export const KeyboardBuilder = mod => + buildClass(mod, keyboardClass, "Keyboard", []); export const key = () => { if (processingProxy.key.code === CODED) { diff --git a/src/lights.js b/src/lights.js index c7244b9..550259f 100644 --- a/src/lights.js +++ b/src/lights.js @@ -5,33 +5,33 @@ const { int_, float_ } = Sk.builtin; export default { ambientLight: makeFunc(processingProxy, "ambientLight", [ - { "v1": [ int_, float_ ] }, - { "v2": [ int_, float_ ] }, - { "v3": [ int_, float_ ] }, - { "x": [ int_, float_ ], optional }, - { "y": [ int_, float_ ], optional }, - { "z": [ int_, float_ ], optional } + { v1: [int_, float_] }, + { v2: [int_, float_] }, + { v3: [int_, float_] }, + { x: [int_, float_], optional }, + { y: [int_, float_], optional }, + { z: [int_, float_], optional } ]), directionalLight: makeFunc(processingProxy, "directionalLight", [ - { "v1": [ int_, float_ ] }, - { "v2": [ int_, float_ ] }, - { "v3": [ int_, float_ ] }, - { "nx": [ int_, float_ ], optional }, - { "ny": [ int_, float_ ], optional }, - { "nz": [ int_, float_ ], optional } + { v1: [int_, float_] }, + { v2: [int_, float_] }, + { v3: [int_, float_] }, + { nx: [int_, float_], optional }, + { ny: [int_, float_], optional }, + { nz: [int_, float_], optional } ]), lightFalloff: makeFunc(processingProxy, "lightFalloff", [ - { "constant": [ int_, float_ ] }, - { "linear": [ int_, float_ ] }, - { "quardatic": [ int_, float_ ] } + { constant: [int_, float_] }, + { linear: [int_, float_] }, + { quardatic: [int_, float_] } ]), lightSpecular: makeFunc(processingProxy, "lightSpecular", [ - { "v1": [ int_, float_ ] }, - { "v2": [ int_, float_ ] }, - { "v3": [ int_, float_ ] } + { v1: [int_, float_] }, + { v2: [int_, float_] }, + { v3: [int_, float_] } ]), lights: makeFunc(processingProxy, "lights"), @@ -39,31 +39,31 @@ export default { noLights: makeFunc(processingProxy, "noLights"), normal: makeFunc(processingProxy, "normal", [ - { "nx": [ int_, float_ ] }, - { "ny": [ int_, float_ ] }, - { "nz": [ int_, float_ ] } + { nx: [int_, float_] }, + { ny: [int_, float_] }, + { nz: [int_, float_] } ]), pointLight: makeFunc(processingProxy, "pointLight", [ - { "v1": [ int_, float_ ] }, - { "v2": [ int_, float_ ] }, - { "v3": [ int_, float_ ] }, - { "nx": [ int_, float_ ] }, - { "ny": [ int_, float_ ] }, - { "nz": [ int_, float_ ] } + { v1: [int_, float_] }, + { v2: [int_, float_] }, + { v3: [int_, float_] }, + { nx: [int_, float_] }, + { ny: [int_, float_] }, + { nz: [int_, float_] } ]), spotLight: makeFunc(processingProxy, "spotLight", [ - { "v1": [ int_, float_ ] }, - { "v2": [ int_, float_ ] }, - { "v3": [ int_, float_ ] }, - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] }, - { "z": [ int_, float_ ] }, - { "nx": [ int_, float_ ] }, - { "ny": [ int_, float_ ] }, - { "nz": [ int_, float_ ] }, - { "angle": [ int_, float_ ] }, - { "concentration": [ int_, float_ ] } + { v1: [int_, float_] }, + { v2: [int_, float_] }, + { v3: [int_, float_] }, + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_] }, + { nx: [int_, float_] }, + { ny: [int_, float_] }, + { nz: [int_, float_] }, + { angle: [int_, float_] }, + { concentration: [int_, float_] } ]) -}; \ No newline at end of file +}; diff --git a/src/materialproperties.js b/src/materialproperties.js index 0144edb..3de78cd 100644 --- a/src/materialproperties.js +++ b/src/materialproperties.js @@ -5,27 +5,27 @@ const { int_, float_, str, lng } = Sk.builtin; export default { ambient: makeFunc(processingProxy, "ambient", [ - { "gray": [ int_, lng, float_, str ], converter: strToColor }, - { "v1": [ int_, float_ ], optional }, - { "v2": [ int_, float_ ], optional }, - { "v3": [ int_, float_ ], optional }, + { gray: [int_, lng, float_, str], converter: strToColor }, + { v1: [int_, float_], optional }, + { v2: [int_, float_], optional }, + { v3: [int_, float_], optional } ]), emissive: makeFunc(processingProxy, "emissive", [ - { "gray": [ int_, lng, float_, str ], converter: strToColor }, - { "v1": [ int_, float_ ], optional }, - { "v2": [ int_, float_ ], optional }, - { "v3": [ int_, float_ ], optional }, + { gray: [int_, lng, float_, str], converter: strToColor }, + { v1: [int_, float_], optional }, + { v2: [int_, float_], optional }, + { v3: [int_, float_], optional } ]), shininess: makeFunc(processingProxy, "shininess", [ - { "shine": [ int_, float_ ] } + { shine: [int_, float_] } ]), specular: makeFunc(processingProxy, "specular", [ - { "gray": [ int_, lng, float_, str ], converter: strToColor }, - { "v1": [ int_, float_ ], optional }, - { "v2": [ int_, float_ ], optional }, - { "v3": [ int_, float_ ], optional }, + { gray: [int_, lng, float_, str], converter: strToColor }, + { v1: [int_, float_], optional }, + { v2: [int_, float_], optional }, + { v3: [int_, float_], optional } ]) -}; \ No newline at end of file +}; diff --git a/src/mouse.js b/src/mouse.js index 6fe3f3f..7d568af 100644 --- a/src/mouse.js +++ b/src/mouse.js @@ -6,7 +6,7 @@ const { func } = Sk.builtin; const { buildClass } = Sk.misceval; function mouseClass($gbl, $loc) { - $loc.__getattr__ = new func(function (self, key) { + $loc.__getattr__ = new func(function(self, key) { switch (remapToJs(key)) { case "x": return remapToPy(processingProxy.mouseX); diff --git a/src/output.js b/src/output.js index 4cf6812..d8e4585 100644 --- a/src/output.js +++ b/src/output.js @@ -5,25 +5,25 @@ const { object, str, list } = Sk.builtin; const { print_ } = Sk.misceval; export default { - println: makeFunc((o) => { - print_(o); - print_("\n"); - }, "println", [ - { "data": object } - ]), + println: makeFunc( + o => { + print_(o); + print_("\n"); + }, + "println", + [{ data: object }] + ), - save: makeFunc(processingProxy, "save", [ - { "filename": str } - ]), + save: makeFunc(processingProxy, "save", [{ filename: str }]), saveFrame: makeFunc(processingProxy, "saveFrame", [ - { "filename": str }, - { "ext": str, allowed: [ "tif", "tga", "jpg", "png" ] } + { filename: str }, + { ext: str, allowed: ["tif", "tga", "jpg", "png"] } ]), saveStrings: makeFunc(processingProxy, "saveStrings", [ - { "filename": str }, - { "strings": list } + { filename: str }, + { strings: list } ]), PrintWriter: notImplemented, @@ -37,4 +37,4 @@ export default { saveBytes: notImplemented, saveStream: notImplemented, selectOuput: notImplemented -}; \ No newline at end of file +}; diff --git a/src/processing.js b/src/processing.js index 6325378..fc1665a 100644 --- a/src/processing.js +++ b/src/processing.js @@ -9,18 +9,50 @@ import color from "./color.js"; import { remappedConstants } from "./constants.js"; import coordinates from "./coordinates.js"; import curves from "./curves.js"; -import { EnvironmentBuilder, cursor, noCursor, height, width, frameCount, focused, FrameRateBuilder } from "./environment.js"; +import { + EnvironmentBuilder, + cursor, + noCursor, + height, + width, + frameCount, + focused, + FrameRateBuilder +} from "./environment.js"; import files from "./files.js"; import fontattribues from "./font-attributes.js"; import fontmetrics from "./font-metrics.js"; import { PFontBuilder, createFont, loadFont, text, textFont } from "./font.js"; import { PGraphicsBuilder, createGraphics, hint } from "./graphics.js"; -import PImageBuilder, { image, createImage, imageMode, loadImage, noTint, requestImage, - tint, blend, copy, filter, get, loadPixels, set, updatePixels, pixels } from "./image.js"; +import PImageBuilder, { + image, + createImage, + imageMode, + loadImage, + noTint, + requestImage, + tint, + blend, + copy, + filter, + get, + loadPixels, + set, + updatePixels, + pixels +} from "./image.js"; import { KeyboardBuilder, keyCode, key, keyPressed } from "./keyboard.js"; import lights from "./lights.js"; import materialproperties from "./materialproperties.js"; -import { MouseBuilder, mouseX, mouseY, pmouseX, pmouseY, mousePressed, mouseButton } from "./mouse.js"; +import { + MouseBuilder, + mouseX, + mouseY, + pmouseX, + pmouseY, + mousePressed, + mouseButton +} from "./mouse.js"; import output from "./output.js"; import random from "./random.js"; import { ScreenBuilder } from "./screen.js"; @@ -58,20 +90,28 @@ let doubleBuffered = true; let eventPred = () => true; export function init(path, suspensionHandler, breakHandler, eventPredicate) { - suspHandler = suspensionHandler; - if (breakHandler !== undefined && typeof breakHandler !== "function") { - throw new Error("breakHandler must be a function if anything"); - } else { - bHandler = breakHandler; - } + initProcessing(suspensionHandler, breakHandler, eventPredicate); Sk.externalLibraries = Sk.externalLibraries || {}; Object.assign(Sk.externalLibraries, { "./processing/__init__.js": { - path: `${path}/__init__.js`, - }, + path: `${path}/__init__.js` + } }); +} + +export function initProcessing( + suspensionHandler, + breakHandler, + eventPredicate +) { + suspHandler = suspensionHandler; + if (breakHandler !== undefined && typeof breakHandler !== "function") { + throw new Error("breakHandler must be a function if anything"); + } else { + bHandler = breakHandler; + } if (typeof eventPredicate === "function") { eventPred = eventPredicate; @@ -114,22 +154,87 @@ export function main() { initUtils(mod); - Object.assign(mod, twodprimitives, threedprimitives, attributes, calculation, camera, - ccreatingandreading, csetting, { color }, remappedConstants, coordinates, curves, - { Environment, environment, cursor, noCursor, height, width, frameCount, frameRate, focused }, - files, fontattribues, fontmetrics, { PFont, createFont, loadFont, text, textFont }, - { PGraphics, createGraphics, hint }, { PImage }, { image, createImage, imageMode, loadImage, - noTint, requestImage, tint, blend, copy, filter, get, loadPixels, set, updatePixels, pixels }, - { keyboard, Keyboard, keyCode, key, keyPressed }, lights, materialproperties, { Mouse, mouse, - mouseX, mouseY, pmouseX, pmouseY, mousePressed, mouseButton }, output, random, { Screen, screen }, { PShape }, structure, - timeanddate, transform, trigonometry, { PVector }, vertex, web, shape, stringFunctions); + Object.assign( + mod, + twodprimitives, + threedprimitives, + attributes, + calculation, + camera, + ccreatingandreading, + csetting, + { color }, + remappedConstants, + coordinates, + curves, + { + Environment, + environment, + cursor, + noCursor, + height, + width, + frameCount, + frameRate, + focused + }, + files, + fontattribues, + fontmetrics, + { PFont, createFont, loadFont, text, textFont }, + { PGraphics, createGraphics, hint }, + { PImage }, + { + image, + createImage, + imageMode, + loadImage, + noTint, + requestImage, + tint, + blend, + copy, + filter, + get, + loadPixels, + set, + updatePixels, + pixels + }, + { keyboard, Keyboard, keyCode, key, keyPressed }, + lights, + materialproperties, + { + Mouse, + mouse, + mouseX, + mouseY, + pmouseX, + pmouseY, + mousePressed, + mouseButton + }, + output, + random, + { Screen, screen }, + { PShape }, + structure, + timeanddate, + transform, + trigonometry, + { PVector }, + vertex, + web, + shape, + stringFunctions + ); mod.disableDoubleBuffer = new Sk.builtin.func(function() { doubleBuffered = false; return Sk.builtin.none.none$; }); - mod.run = new Sk.builtin.func(function () { + mod.run = new Sk.builtin.func(function() { let susp = new Sk.misceval.Suspension(); let exceptionOccurred = null; let finish = null; @@ -145,13 +250,16 @@ export function main() { }; susp.data = { - type: "Sk.promise", promise: new Promise(function(resolve, reject) { + type: "Sk.promise", + promise: new Promise(function(resolve, reject) { exceptionOccurred = reject; finish = resolve; }) }; - let sketchProc = new window.Processing.Sketch(function sketchProcFunc(proc) { + let sketchProc = new window.Processing.Sketch(function sketchProcFunc( + proc + ) { function throwAndExit(e) { exceptionOccurred(e); proc.exit(); @@ -160,13 +268,16 @@ export function main() { processingInstance = proc; if (Sk.globals["setup"]) { - proc.setup = function () { - return asyncToPromise(() => callsimOrSuspend(Sk.globals["setup"]), suspHandler); + proc.setup = function() { + return asyncToPromise( + () => callsimOrSuspend(Sk.globals["setup"]), + suspHandler + ); }; } if (Sk.globals["draw"]) { - proc.draw = function () { + proc.draw = function() { // call the break handler every draw so the processing.sk is stoppable. if (bHandler) { try { @@ -177,14 +288,24 @@ export function main() { } return asyncToPromise( - () => callsimOrSuspend(Sk.globals["draw"]), suspHandler + () => callsimOrSuspend(Sk.globals["draw"]), + suspHandler ); }; } var callBacks = [ - "mouseMoved", "mouseClicked", "mouseDragged", "mouseMoved", "mouseOut", - "mouseOver", "mousePressed", "mouseReleased", "keyPressed", "keyReleased", "keyTyped" + "mouseMoved", + "mouseClicked", + "mouseDragged", + "mouseMoved", + "mouseOut", + "mouseOver", + "mousePressed", + "mouseReleased", + "keyPressed", + "keyReleased", + "keyTyped" ]; for (var cb in callBacks) { @@ -194,7 +315,7 @@ export function main() { let callback = callBacks[cb]; // store the python callback let skulptCallback = Sk.globals[callback]; - + // replace the function with the processing variable if it's keyPressed or mousePressed // because they can both be callbacks and variables. if (callback == "keyPressed") { @@ -205,9 +326,11 @@ export function main() { Sk.globals[callback] = mousePressed; } - proc[callback] = () => asyncToPromise( - () => Sk.misceval.callsimOrSuspend(skulptCallback), suspHandler - ).catch(r => throwAndExit(r)); + proc[callback] = () => + asyncToPromise( + () => Sk.misceval.callsimOrSuspend(skulptCallback), + suspHandler + ).catch(r => throwAndExit(r)); })(); } } @@ -271,4 +394,4 @@ export function main() { }); return mod; -} \ No newline at end of file +} diff --git a/src/random.js b/src/random.js index 033e664..811e220 100644 --- a/src/random.js +++ b/src/random.js @@ -5,27 +5,23 @@ const { float_, int_ } = Sk.builtin; export default { noise: makeFunc(processingProxy, "noise", [ - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ], optional }, - { "z": [ int_, float_ ], optional }, + { x: [int_, float_] }, + { y: [int_, float_], optional }, + { z: [int_, float_], optional } ]), noiseDetail: makeFunc(processingProxy, "noiseDetail", [ - { "octave": int_ }, - { "falloff": [ int_, float_ ], optional } + { octave: int_ }, + { falloff: [int_, float_], optional } ]), - noiseSeed: makeFunc(processingProxy, "noiseSeed", [ - { "value": int_ } - ]), + noiseSeed: makeFunc(processingProxy, "noiseSeed", [{ value: int_ }]), - randomSeed: makeFunc(processingProxy, "randomSeed", [ - { "value": int_ } - ]), + randomSeed: makeFunc(processingProxy, "randomSeed", [{ value: int_ }]), random: makeFunc(processingProxy, "random", [ - { low: [ int_, float_ ] }, - { high: [ int_, float_ ], optional } + { low: [int_, float_] }, + { high: [int_, float_], optional } ]), randomGaussian: makeFunc(processingProxy, "randomGaussian") diff --git a/src/screen.js b/src/screen.js index efbc529..44eaa17 100644 --- a/src/screen.js +++ b/src/screen.js @@ -6,11 +6,11 @@ const { buildClass } = Sk.misceval; const { list, func } = Sk.builtin; function screenClass($gbl, $loc) { - $loc.__init__ = new func(function (self) { + $loc.__init__ = new func(function(self) { self.pixels = null; }); - $loc.__getattr__ = new func(function (self, key) { + $loc.__getattr__ = new func(function(self, key) { key = remapToJs(key); switch (key) { case "height": @@ -26,4 +26,4 @@ function screenClass($gbl, $loc) { }); } -export const ScreenBuilder = mod => buildClass(mod, screenClass, "Screen", []); \ No newline at end of file +export const ScreenBuilder = mod => buildClass(mod, screenClass, "Screen", []); diff --git a/src/shape.js b/src/shape.js index fff265d..8b2ecb5 100644 --- a/src/shape.js +++ b/src/shape.js @@ -28,7 +28,7 @@ function shapeGetChild(self, shape) { // getChild() Returns a child element of a shape as a PShapeSVG object var child = self.v.getChild(shape); if (child != null) { - // special method for Skulpt: + // special method for Skulpt: var new_shape = Sk.misceval.callsim(PShape); // Now fill in value: new_shape.v = child; @@ -63,7 +63,7 @@ function shapeScale(self, x, y, z) { } function shapeClass($gbl, $loc) { - $loc.__getattr__ = new Sk.builtin.func(function (self, key) { + $loc.__getattr__ = new Sk.builtin.func(function(self, key) { key = remapToJs(key); switch (key) { case "width": @@ -73,73 +73,74 @@ function shapeClass($gbl, $loc) { } }); - $loc.isVisible = makeFunc(shapeIsVisible, "isVisible", [ self ]); + $loc.isVisible = makeFunc(shapeIsVisible, "isVisible", [self]); - $loc.setVisible = makeFunc(shapeSetVisible, "setVisible" [ - self, - { "value": bool } - ]); + $loc.setVisible = makeFunc( + shapeSetVisible, + "setVisible"[(self, { value: bool })] + ); - $loc.disableStyle = makeFunc(shapeDisableStyle, "disableStyle", [ self ]); + $loc.disableStyle = makeFunc(shapeDisableStyle, "disableStyle", [self]); - $loc.enableStyle = makeFunc(shapeEnableStyle, "enableStyle", [ self ]); + $loc.enableStyle = makeFunc(shapeEnableStyle, "enableStyle", [self]); $loc.getChild = makeFunc(shapeGetChild, "getChild", [ self, - { "shape": PShape } + { shape: PShape } ]); $loc.translate = makeFunc(shapeTranslate, "translate", [ self, - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] }, - { "z": [ int_, float_ ], optional } + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_], optional } ]); $loc.rotate = makeFunc(shapeRotate, "rotate", [ self, - { "angle": [ int_, float_ ] } + { angle: [int_, float_] } ]); $loc.rotateX = makeFunc(shapeRotateX, "rotateX", [ self, - { "angle": [ int_, float_ ] } + { angle: [int_, float_] } ]); $loc.rotateY = makeFunc(shapeRotateY, "rotateY", [ self, - { "angle": [ int_, float_ ] } + { angle: [int_, float_] } ]); $loc.rotateZ = makeFunc(shapeRotateZ, "rotateZ", [ self, - { "angle": [ int_, float_ ] } + { angle: [int_, float_] } ]); - $loc.scale = makeFunc(shapeScale, "scale" [ - self, - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ], optional }, - { "z": [ int_, float_ ], optional } - ]); + $loc.scale = makeFunc( + shapeScale, + "scale"[ + (self, + { x: [int_, float_] }, + { y: [int_, float_], optional }, + { z: [int_, float_], optional }) + ] + ); } export const PShapeBuilder = mod => buildClass(mod, shapeClass, "PShape", []); export default { - loadShape: makeFunc(processingProxy, "loadShape", [ - { "filename": str } - ]), + loadShape: makeFunc(processingProxy, "loadShape", [{ filename: str }]), shape: makeFunc(processingProxy, "shape", [ - { "sh": "PShape" }, - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] }, - { "width": [ int_, float_ ], optional }, - { "height": [ int_, float_ ], optional } + { sh: "PShape" }, + { x: [int_, float_] }, + { y: [int_, float_] }, + { width: [int_, float_], optional }, + { height: [int_, float_], optional } ]), shapeMode: makeFunc(processingProxy, "shapeMode", [ - { "img": int_, allowed: [ CORNER, CORNERS, CENTER ] } + { img: int_, allowed: [CORNER, CORNERS, CENTER] } ]) -}; \ No newline at end of file +}; diff --git a/src/skulpt.js b/src/skulpt.js index 6c21619..d983c26 100644 --- a/src/skulpt.js +++ b/src/skulpt.js @@ -1,8 +1,10 @@ /* global Sk, require */ -if (typeof(require) === "function") { +if (typeof require === "function") { var fs = require("fs"); - var skulpt = fs.readFileSync("bower_components/skulpt/skulpt.min.js").toString(); + var skulpt = fs + .readFileSync("bower_components/skulpt/skulpt.min.js") + .toString(); (1, eval)(skulpt); } diff --git a/src/string-functions.js b/src/string-functions.js index ef83e0a..70896fe 100644 --- a/src/string-functions.js +++ b/src/string-functions.js @@ -5,54 +5,49 @@ const { int_, float_, str, list } = Sk.builtin; export default { join: makeFunc(processingProxy, "join", [ - { "stringArray": list }, - { "separator": str } + { stringArray: list }, + { separator: str } ]), - match: makeFunc(processingProxy, "match", [ - { "str": str }, - { "regexp": str } - ]), + match: makeFunc(processingProxy, "match", [{ str: str }, { regexp: str }]), matchAll: makeFunc(processingProxy, "matchAll", [ - { "str": str }, - { "regexp": str } + { str: str }, + { regexp: str } ]), nf: makeFunc(processingProxy, "nf", [ - { "value": [ int_, float_, list ] }, - { "digits": int_ }, - { "right": int_, optional } + { value: [int_, float_, list] }, + { digits: int_ }, + { right: int_, optional } ]), nfc: makeFunc(processingProxy, "nfc", [ - { "value": [ int_, float_, list ] }, - { "right": int_, optional } + { value: [int_, float_, list] }, + { right: int_, optional } ]), nfp: makeFunc(processingProxy, "nfp", [ - { "value": [ int_, float_, list ] }, - { "digits": int_ }, - { "right": int_, optional } + { value: [int_, float_, list] }, + { digits: int_ }, + { right: int_, optional } ]), nfs: makeFunc(processingProxy, "nfs", [ - { "value": [ int_, float_, list ] }, - { "digits": int_ }, - { "right": int_, optional } + { value: [int_, float_, list] }, + { digits: int_ }, + { right: int_, optional } ]), split: makeFunc(processingProxy, "split", [ - { "string": str }, - { "delimiter": str } + { string: str }, + { delimiter: str } ]), splitTokens: makeFunc(processingProxy, "splitTokens", [ - { "string": str }, - { "delimiter": str, optional } + { string: str }, + { delimiter: str, optional } ]), - trim: makeFunc(processingProxy, "trim", [ - { "strOrArray": [str, list ]} - ]) -}; \ No newline at end of file + trim: makeFunc(processingProxy, "trim", [{ strOrArray: [str, list] }]) +}; diff --git a/src/structure.js b/src/structure.js index 03890fc..0729954 100644 --- a/src/structure.js +++ b/src/structure.js @@ -1,5 +1,14 @@ import { processing } from "./processing.js"; -import { processingProxy, makeFunc, optional, self, constructOptionalContectManager, cachedLazy, ignored, __isinitialised__ } from "./utils.js"; +import { + processingProxy, + makeFunc, + optional, + self, + constructOptionalContextManager, + cachedLazy, + ignored, + __isinitialised__ +} from "./utils.js"; import { remappedConstants } from "./constants.js"; import Sk from "./skulpt.js"; @@ -24,9 +33,9 @@ function noLoop() { function size(width, height, renderer) { if (renderer === undefined || renderer === P2D || renderer === JAVA2D) { - // monkey patching image to make sure toImageData returns something. - // 2017 Chrome 64 doesn't always return something the first call. - // this is a VERY HACKY way to deal with that synchronously. + // monkey patching image to make sure toImageData returns something. + // 2017 Chrome 64 doesn't always return something the first call. + // this is a VERY HACKY way to deal with that synchronously. processing.toImageData = function(x, y, w, h) { x = x !== undefined ? x : 0; y = y !== undefined ? y : 0; @@ -47,28 +56,43 @@ export default { noLoop: makeFunc(noLoop, "noLoop"), size: makeFunc(size, "size", [ - { "width": int_ }, - { "height": int_ }, - { "renderer": int_, allowed: [ P2D, JAVA2D, WEBGL, P3D, OPENGL, PDF, DXF ], optional } + { width: int_ }, + { height: int_ }, + { + renderer: int_, + allowed: [P2D, JAVA2D, WEBGL, P3D, OPENGL, PDF, DXF], + optional + } ]), exit: makeFunc(processingProxy, "exit"), redraw: makeFunc(processingProxy, "redraw"), - pushStyle: cachedLazy(constructOptionalContectManager, [{ - __call__: makeFunc(self => { - processingProxy.pushStyle(); - return self; - }, "__call__", [ self ]), - __enter__: makeFunc(self => self, "__enter__", [ self ]), - __exit__: makeFunc(() => processingProxy.popStyle(), "__exit__", [ - self, - { "exc_type": object, ignored }, - { "exc_value": object, ignored }, - { "traceback": object, ignored } - ]) - }, "pushStyle"], "pushStyle"), + pushStyle: cachedLazy( + constructOptionalContextManager, + [ + { + __call__: makeFunc( + self => { + processingProxy.pushStyle(); + return self; + }, + "__call__", + [self] + ), + __enter__: makeFunc(self => self, "__enter__", [self]), + __exit__: makeFunc(() => processingProxy.popStyle(), "__exit__", [ + self, + { exc_type: object, ignored }, + { exc_value: object, ignored }, + { traceback: object, ignored } + ]) + }, + "pushStyle" + ], + "pushStyle" + ), popStyle: makeFunc(processingProxy, "popStyle") -}; \ No newline at end of file +}; diff --git a/src/timeanddate.js b/src/timeanddate.js index 3da8635..43c7e1b 100644 --- a/src/timeanddate.js +++ b/src/timeanddate.js @@ -8,4 +8,4 @@ export default { month: makeFunc(processingProxy, "month"), second: makeFunc(processingProxy, "second"), year: makeFunc(processingProxy, "year") -}; \ No newline at end of file +}; diff --git a/src/transform.js b/src/transform.js index 30b563f..aad8090 100644 --- a/src/transform.js +++ b/src/transform.js @@ -1,72 +1,83 @@ import Sk from "./skulpt.js"; -import { processingProxy, makeFunc, optional, constructOptionalContectManager, cachedLazy, self, ignored } from "./utils.js"; +import { + processingProxy, + makeFunc, + optional, + constructOptionalContextManager, + cachedLazy, + self, + ignored +} from "./utils.js"; const { float_, int_, object } = Sk.builtin; export default { applyMatrix: makeFunc(processingProxy, "applyMatrix", [ - { "n00": [ int_, float_ ] }, - { "n01": [ int_, float_ ] }, - { "n02": [ int_, float_ ] }, - { "n03": [ int_, float_ ] }, - { "n04": [ int_, float_ ] }, - { "n05": [ int_, float_ ] }, - { "n06": [ int_, float_ ] }, - { "n07": [ int_, float_ ] }, - { "n08": [ int_, float_ ] }, - { "n09": [ int_, float_ ] }, - { "n10": [ int_, float_ ] }, - { "n11": [ int_, float_ ] }, - { "n12": [ int_, float_ ] }, - { "n13": [ int_, float_ ] }, - { "n14": [ int_, float_ ] }, - { "n15": [ int_, float_ ] } + { n00: [int_, float_] }, + { n01: [int_, float_] }, + { n02: [int_, float_] }, + { n03: [int_, float_] }, + { n04: [int_, float_] }, + { n05: [int_, float_] }, + { n06: [int_, float_] }, + { n07: [int_, float_] }, + { n08: [int_, float_] }, + { n09: [int_, float_] }, + { n10: [int_, float_] }, + { n11: [int_, float_] }, + { n12: [int_, float_] }, + { n13: [int_, float_] }, + { n14: [int_, float_] }, + { n15: [int_, float_] } ]), popMatrix: makeFunc(processingProxy, "popMatrix"), printMatrix: makeFunc(processingProxy, "printMatrix"), - pushMatrix: cachedLazy(constructOptionalContectManager, [{ - __call__: makeFunc(self => { - processingProxy.pushMatrix(); - return self; - }, "__call__", [ self ]), - __enter__: makeFunc(self => self, "__enter__", [ self ]), - __exit__: makeFunc(() => processingProxy.popMatrix(), "__exit__", [ - self, - { "exc_type": object, ignored }, - { "exc_value": object, ignored }, - { "traceback": object, ignored } - ]) - }, "pushMatrix"], "pushMatrix"), + pushMatrix: cachedLazy( + constructOptionalContextManager, + [ + { + __call__: makeFunc( + self => { + processingProxy.pushMatrix(); + return self; + }, + "__call__", + [self] + ), + __enter__: makeFunc(self => self, "__enter__", [self]), + __exit__: makeFunc(() => processingProxy.popMatrix(), "__exit__", [ + self, + { exc_type: object, ignored }, + { exc_value: object, ignored }, + { traceback: object, ignored } + ]) + }, + "pushMatrix" + ], + "pushMatrix" + ), resetMatrix: makeFunc(processingProxy, "resetMatrix"), - rotate: makeFunc(processingProxy, "rotate", [ - { "angle": [ int_, float_ ] } - ]), + rotate: makeFunc(processingProxy, "rotate", [{ angle: [int_, float_] }]), - rotateX: makeFunc(processingProxy, "rotateX", [ - { "angle": [ int_, float_ ] } - ]), + rotateX: makeFunc(processingProxy, "rotateX", [{ angle: [int_, float_] }]), - rotateY: makeFunc(processingProxy, "rotateY", [ - { "angle": [ int_, float_ ] } - ]), + rotateY: makeFunc(processingProxy, "rotateY", [{ angle: [int_, float_] }]), - rotateZ: makeFunc(processingProxy, "rotateZ", [ - { "angle": [ int_, float_ ] } - ]), + rotateZ: makeFunc(processingProxy, "rotateZ", [{ angle: [int_, float_] }]), scale: makeFunc(processingProxy, "scale", [ - { "size": [ int_, float_ ] }, - { "y": [ int_, float_ ], optional }, - { "z": [ int_, float_ ], optional } + { size: [int_, float_] }, + { y: [int_, float_], optional }, + { z: [int_, float_], optional } ]), translate: makeFunc(processingProxy, "translate", [ - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] }, - { "z": [ int_, float_ ], optional } + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_], optional } ]) -}; \ No newline at end of file +}; diff --git a/src/trigonometry.js b/src/trigonometry.js index 13ab073..7df8721 100644 --- a/src/trigonometry.js +++ b/src/trigonometry.js @@ -4,40 +4,24 @@ import { processingProxy, makeFunc } from "./utils.js"; const { int_, float_ } = Sk.builtin; export default { - degrees: makeFunc(processingProxy, "degrees", [ - { "angle": [ int_, float_ ] } - ]), + degrees: makeFunc(processingProxy, "degrees", [{ angle: [int_, float_] }]), - radians: makeFunc(processingProxy, "radians", [ - { "angle": [ int_, float_ ] } - ]), + radians: makeFunc(processingProxy, "radians", [{ angle: [int_, float_] }]), - cos: makeFunc(processingProxy, "cos", [ - { "angle": [ int_, float_ ] } - ]), + cos: makeFunc(processingProxy, "cos", [{ angle: [int_, float_] }]), - sin: makeFunc(processingProxy, "sin", [ - { "angle": [ int_, float_ ] } - ]), + sin: makeFunc(processingProxy, "sin", [{ angle: [int_, float_] }]), - tan: makeFunc(processingProxy, "tan", [ - { "angle": [ int_, float_ ] } - ]), + tan: makeFunc(processingProxy, "tan", [{ angle: [int_, float_] }]), - acos: makeFunc(processingProxy, "acos", [ - { "value": [ int_, float_ ] } - ]), + acos: makeFunc(processingProxy, "acos", [{ value: [int_, float_] }]), - asin: makeFunc(processingProxy, "asin", [ - { "value": [ int_, float_ ] } - ]), + asin: makeFunc(processingProxy, "asin", [{ value: [int_, float_] }]), - atan: makeFunc(processingProxy, "tan", [ - { "angle": [ int_, float_ ] } - ]), + atan: makeFunc(processingProxy, "tan", [{ angle: [int_, float_] }]), atan2: makeFunc(processingProxy, "atan2", [ - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] } + { x: [int_, float_] }, + { y: [int_, float_] } ]) }; diff --git a/src/utils.js b/src/utils.js index 0134393..fe24dc8 100644 --- a/src/utils.js +++ b/src/utils.js @@ -10,10 +10,7 @@ const { TypeError } = Sk.builtin; -const { - remapToJs, - remapToPy -} = Sk.ffi; +const { remapToJs, remapToPy } = Sk.ffi; const { buildClass, callsim } = Sk.misceval; @@ -36,29 +33,35 @@ function join(func, arr1, arr2) { } function pyCheckTypes(name, args) { - args.forEach((a) => { + args.forEach(a => { let [arg, template] = a; let keys = Object.keys(template); let argName = keys[0]; if (!Array.isArray(template[argName])) { - template[argName] = [ template[argName] ]; + template[argName] = [template[argName]]; } // if a is true i.e. a short cut if you don't want the type to be checked Any or self. // and it has to be really true not just truthy. - if (!template[argName].some(a => { - if (a === true) { - return true; - } - - if (typeof a === "string") { - return arg.tp$name === a; - } - - return arg instanceof a && (!a.allowed || arg in a.allowed); - })) { - throw new TypeError(`${name}: ${argName} (value: ${remapToJs(arg)}) not of type ${template[argName].map(t => t.tp$name)}`); + if ( + !template[argName].some(a => { + if (a === true) { + return true; + } + + if (typeof a === "string") { + return arg.tp$name === a; + } + + return arg instanceof a && (!a.allowed || arg in a.allowed); + }) + ) { + throw new TypeError( + `${name}: ${argName} (value: ${remapToJs(arg)}) not of type ${template[ + argName + ].map(t => t.tp$name)}` + ); } }); } @@ -71,9 +74,11 @@ export function makeFunc(thingToWrap, name, args_template) { if (typeof thingToWrap !== "function") { if (!thingToWrap[__isinitialised__]) { - throw new Error(`cannot call "${name}" outside "draw", "setup" or event handlers`); + throw new Error( + `cannot call "${name}" outside "draw", "setup" or event handlers` + ); } - + if (thingToWrap[name]) { functionToWrap = thingToWrap[name]; } @@ -87,25 +92,34 @@ export function makeFunc(thingToWrap, name, args_template) { let args = argsToArray(arguments).filter(a => a !== undefined); - pyCheckArgs(name, args, countNonOptionalArgs(largs_template), largs_template.length, false); + pyCheckArgs( + name, + args, + countNonOptionalArgs(largs_template), + largs_template.length, + false + ); - pyCheckTypes(name, join((l, r) => [l,r], args, largs_template)); + pyCheckTypes(name, join((l, r) => [l, r], args, largs_template)); - let js_args = - args.filter((a, i) => largs_template[i].ignored === undefined || ! largs_template[i].ignored) - .map((a, i) => { - let template = largs_template[i]; + let js_args = args + .filter( + (a, i) => + largs_template[i].ignored === undefined || !largs_template[i].ignored + ) + .map((a, i) => { + let template = largs_template[i]; - if (template === self) { - return a; - } + if (template === self) { + return a; + } - if (template.converter) { - return template.converter(remapToJs(a)); - } + if (template.converter) { + return template.converter(remapToJs(a)); + } - return remapToJs(a); - }); + return remapToJs(a); + }); let result = functionToWrap.apply(null, js_args); @@ -119,10 +133,12 @@ export function strToColor(input) { if (typeof input === "string") { let res = /#([A-F0-9]{6})/g.exec(input); if (res.length !== 2) { - throw new ValueError(`${input} not in the correct format for a color expecting "#AB12F4"`); + throw new ValueError( + `${input} not in the correct format for a color expecting "#AB12F4"` + ); } - return parseInt(res[1], 16) + 0xFF000000; + return parseInt(res[1], 16) + 0xff000000; } return input; @@ -132,41 +148,58 @@ export const optional = true; export const ignored = true; -export const self = { "self": true }; +export const self = { self: true }; -export const notImplemented = new func(() => { throw new NotImplementedError(); }); +export const notImplemented = new func(() => { + throw new NotImplementedError(); +}); export const __name__ = new str("processing"); -export const processingProxy = new Proxy({}, { - get(target, name) { - if (name === __isinitialised__) { - return processingInstance !== null; - } +export const processingProxy = new Proxy( + {}, + { + get(target, name) { + if (name === __isinitialised__) { + return processingInstance !== null; + } - if (name === "__frameRate" && processingInstance === null) { - return undefined; - } + if (name === "__frameRate" && processingInstance === null) { + return undefined; + } - return processingInstance[name]; + return processingInstance[name]; + } } -}); +); -function optionalContextManager(loc){ +function optionalContextManager(loc) { return ($glb, $loc) => { assign($loc, loc); }; } export function initUtils(mod) { - OptionalContextManager = (loc, name) => buildClass(mod, optionalContextManager(loc), "OptionalContextManager_" + name, []); + OptionalContextManager = (loc, name) => + buildClass( + mod, + optionalContextManager(loc), + "OptionalContextManager_" + name, + [] + ); } -export function constructOptionalContectManager(loc, name) { +export function constructOptionalContextManager(loc, name) { let funcs = keys(loc); - if (!funcs.includes("__call__") || !funcs.includes("__enter__") || !funcs.includes("__exit__")) { - throw new Error("The optional context manager needs a __call__, __enter__ and __exit__ function."); + if ( + !funcs.includes("__call__") || + !funcs.includes("__enter__") || + !funcs.includes("__exit__") + ) { + throw new Error( + "The optional context manager needs a __call__, __enter__ and __exit__ function." + ); } return callsim(OptionalContextManager(loc, name)); @@ -184,4 +217,4 @@ export function cachedLazy(func, args, id) { return res; }; -} \ No newline at end of file +} diff --git a/src/vector.js b/src/vector.js index d62dd66..30d2676 100644 --- a/src/vector.js +++ b/src/vector.js @@ -6,7 +6,6 @@ const { int_, float_ } = Sk.builtin; const { callsim, buildClass } = Sk.misceval; const { remapToPy } = Sk.ffi; - function vectorInit(self, x, y, z) { self.v = new processing.PVector(x, y, z); } @@ -76,12 +75,12 @@ function vectorLimit(self, value) { function vectorClass($gbl, $loc) { $loc.__init__ = makeFunc(vectorInit, "__init__", [ self, - { "x": int_, optional }, - { "y": int_, optional }, - { "z": int_, optional } + { x: int_, optional }, + { y: int_, optional }, + { z: int_, optional } ]); - $loc.__getattr__ = new Sk.builtin.func(function (self, key) { + $loc.__getattr__ = new Sk.builtin.func(function(self, key) { key = Sk.ffi.remapToJs(key); if (key === "x") { return remapToPy(self.v.x); @@ -92,69 +91,50 @@ function vectorClass($gbl, $loc) { } }); - $loc.get = makeFunc(vectorGet, "get", [ self ]), - - $loc.set = makeFunc(vectorSet, "set", [ + ($loc.get = makeFunc(vectorGet, "get", [self])), + ($loc.set = makeFunc(vectorSet, "set", [ self, - { "x": int_ }, - { "x": int_, optional }, - { "x": int_, optional } - ]); + { x: int_ }, + { x: int_, optional }, + { x: int_, optional } + ])); - $loc.mag = makeFunc(self => self.v.mag(), "mag", [ self ]); + $loc.mag = makeFunc(self => self.v.mag(), "mag", [self]); - $loc.add = makeFunc(vectorAdd, "add", [ - self, - { "vector": "PVector" } - ]); + $loc.add = makeFunc(vectorAdd, "add", [self, { vector: "PVector" }]); - $loc.sub = makeFunc(vectorSub, "sub", [ - self, - { "vector": "PVector" } - ]); + $loc.sub = makeFunc(vectorSub, "sub", [self, { vector: "PVector" }]); - $loc.mult = makeFunc(vectorMult, "mult", [ - self, - { "vector": "PVector" } - ]); + $loc.mult = makeFunc(vectorMult, "mult", [self, { vector: "PVector" }]); - $loc.div = makeFunc(vectorDiv, "div", [ - self, - { "vector": "PVector" } - ]); + $loc.div = makeFunc(vectorDiv, "div", [self, { vector: "PVector" }]); - $loc.dist = makeFunc(vectorDist, "dist", [ - self, - { "vector": "PVector" } - ]); + $loc.dist = makeFunc(vectorDist, "dist", [self, { vector: "PVector" }]); $loc.dot = makeFunc(vectorDot, "dot", [ self, - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ], optional }, - { "z": [ int_, float_ ], optional } + { x: [int_, float_] }, + { y: [int_, float_], optional }, + { z: [int_, float_], optional } ]); - $loc.cross = makeFunc(vectorCross, "cross", [ - self, - { "vector": "PVector" } - ]); + $loc.cross = makeFunc(vectorCross, "cross", [self, { vector: "PVector" }]); - $loc.normalize = makeFunc(self => self.normalize(), "normalize", [ self ]); + $loc.normalize = makeFunc(self => self.normalize(), "normalize", [self]); $loc.limit = makeFunc(vectorLimit, "limit", [ self, - { "value": [ int_, float_ ] } + { value: [int_, float_] } ]); $loc.angleBetween = makeFunc(vectorAngleBetween, "angleBetween", [ self, - { "vector": "PVector" } + { vector: "PVector" } ]); - $loc.array = makeFunc(self => self.v.array(), "array", [ self ]); + $loc.array = makeFunc(self => self.v.array(), "array", [self]); - $loc.__repr__ = makeFunc(self => self.v.toString(), "repr", [ self ]); + $loc.__repr__ = makeFunc(self => self.v.toString(), "repr", [self]); } -export default mod => buildClass(mod, vectorClass, "PVector", []); \ No newline at end of file +export default mod => buildClass(mod, vectorClass, "PVector", []); diff --git a/src/vertex.js b/src/vertex.js index 7e5ce2d..668eb1d 100644 --- a/src/vertex.js +++ b/src/vertex.js @@ -1,83 +1,147 @@ import Sk from "./skulpt.js"; import constants, { remappedConstants } from "./constants.js"; -import { processingProxy, makeFunc, optional, constructOptionalContectManager, self, cachedLazy, ignored } from "./utils.js"; +import { + processingProxy, + makeFunc, + optional, + constructOptionalContextManager, + self, + cachedLazy, + ignored +} from "./utils.js"; const { float_, int_, object } = Sk.builtin; -const { IMAGE, NORMALIZED, POINTS, LINES, TRIANGLES, TRIANGLE_FAN, TRIANGLE_STRIP, - QUADS, QUAD_STRIP, CLOSE } = remappedConstants; +const { + IMAGE, + NORMALIZED, + POINTS, + LINES, + TRIANGLES, + TRIANGLE_FAN, + TRIANGLE_STRIP, + QUADS, + QUAD_STRIP, + CLOSE +} = remappedConstants; export default { - beginShape: cachedLazy(constructOptionalContectManager, [{ - __call__: makeFunc((self, mode) => { - processingProxy.beginShape(mode); - return self; - }, "__call__", [ - self, - { "MODE": int_, allowed: [ POINTS, LINES, TRIANGLES, TRIANGLE_FAN, - TRIANGLE_STRIP, QUADS, QUAD_STRIP ], optional } - ]), - __enter__: makeFunc(self => self, "__enter__", [ self ]), - __exit__: makeFunc(() => processingProxy.endShape, "__exit__", [ - self, - { "exc_type": object, ignored }, - { "exc_value": object, ignored }, - { "traceback": object, ignored } - ]) - }, "beginShape"], "beginShape"), + beginShape: cachedLazy( + constructOptionalContextManager, + [ + { + __call__: makeFunc( + (self, mode) => { + processingProxy.beginShape(mode); + return self; + }, + "__call__", + [ + self, + { + MODE: int_, + allowed: [ + POINTS, + LINES, + TRIANGLES, + TRIANGLE_FAN, + TRIANGLE_STRIP, + QUADS, + QUAD_STRIP + ], + optional + } + ] + ), + __enter__: makeFunc(self => self, "__enter__", [self]), + __exit__: makeFunc(() => processingProxy.endShape, "__exit__", [ + self, + { exc_type: object, ignored }, + { exc_value: object, ignored }, + { traceback: object, ignored } + ]) + }, + "beginShape" + ], + "beginShape" + ), - beginClosedShape: cachedLazy(constructOptionalContectManager, [{ - __call__: makeFunc((self, mode) => { - processingProxy.beginShape(mode); - return self; - }, "__call__", [ - self, - { "MODE": int_, allowed: [ POINTS, LINES, TRIANGLES, TRIANGLE_FAN, - TRIANGLE_STRIP, QUADS, QUAD_STRIP ], optional } - ]), - __enter__: makeFunc(self => self, "__enter__" [ self ]), - __exit__: makeFunc(() => processingProxy.endShape(constants.CLOSE), "__exit__", [ - self, - { "exc_type": object, ignored }, - { "exc_value": object, ignored }, - { "traceback": object, ignored } - ]) - }, "beginClosedShape"], "beginClosedShape"), + beginClosedShape: cachedLazy( + constructOptionalContextManager, + [ + { + __call__: makeFunc( + (self, mode) => { + processingProxy.beginShape(mode); + return self; + }, + "__call__", + [ + self, + { + MODE: int_, + allowed: [ + POINTS, + LINES, + TRIANGLES, + TRIANGLE_FAN, + TRIANGLE_STRIP, + QUADS, + QUAD_STRIP + ], + optional + } + ] + ), + __enter__: makeFunc(self => self, "__enter__"[self]), + __exit__: makeFunc( + () => processingProxy.endShape(constants.CLOSE), + "__exit__", + [ + self, + { exc_type: object, ignored }, + { exc_value: object, ignored }, + { traceback: object, ignored } + ] + ) + }, + "beginClosedShape" + ], + "beginClosedShape" + ), endShape: makeFunc(processingProxy, "endShape", [ - { "MODE": int_, allowed: [ CLOSE ], optional } + { MODE: int_, allowed: [CLOSE], optional } ]), vertex: makeFunc(processingProxy, "vertex", [ - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] }, - { "z": [ int_, float_ ], optional }, - { "u": [ int_, float_ ], optional }, - { "v": [ int_, float_ ], optional } + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_], optional }, + { u: [int_, float_], optional }, + { v: [int_, float_], optional } ]), bezierVertex: makeFunc(processingProxy, "bezierVertex", [ - { "cx1": [ int_, float_ ] }, - { "cy1": [ int_, float_ ] }, - { "cz1": [ int_, float_ ] }, - { "cx2": [ int_, float_ ] }, - { "cy2": [ int_, float_ ] }, - { "cz2": [ int_, float_ ] }, - { "x": [ int_, float_ ], optional }, - { "y": [ int_, float_ ], optional }, - { "z": [ int_, float_ ], optional } + { cx1: [int_, float_] }, + { cy1: [int_, float_] }, + { cz1: [int_, float_] }, + { cx2: [int_, float_] }, + { cy2: [int_, float_] }, + { cz2: [int_, float_] }, + { x: [int_, float_], optional }, + { y: [int_, float_], optional }, + { z: [int_, float_], optional } ]), curveVertex: makeFunc(processingProxy, "curveVertex", [ - { "x": [ int_, float_ ] }, - { "y": [ int_, float_ ] }, - { "z": [ int_, float_ ], optional } + { x: [int_, float_] }, + { y: [int_, float_] }, + { z: [int_, float_], optional } ]), - texture: makeFunc(processingProxy, "texture", [ - { "img": "PImage" } - ]), + texture: makeFunc(processingProxy, "texture", [{ img: "PImage" }]), textureMode: makeFunc(processingProxy, "textureMode", [ - { "img": int_, allowed: [ IMAGE, NORMALIZED ] } + { img: int_, allowed: [IMAGE, NORMALIZED] } ]) -}; \ No newline at end of file +}; diff --git a/src/web.js b/src/web.js index 9ceb30e..fc20327 100644 --- a/src/web.js +++ b/src/web.js @@ -4,11 +4,9 @@ import { processingProxy, makeFunc, optional } from "./utils.js"; const { str } = Sk.builtin; export default { - link: makeFunc(processingProxy, "link" [ - { "url": str }, - { "target": str, optional } - ]), - status: makeFunc(processingProxy, "status", [ - { "text": str } - ]) -}; \ No newline at end of file + link: makeFunc( + processingProxy, + "link"[({ url: str }, { target: str, optional })] + ), + status: makeFunc(processingProxy, "status", [{ text: str }]) +};