From 4bca4010e4f63f94756298abf7610aabd82fe7f2 Mon Sep 17 00:00:00 2001 From: Joe Bond Date: Thu, 21 Sep 2023 13:14:04 +0100 Subject: [PATCH 1/8] Fixed lock files --- package-lock.json | 12 +- package.json | 2 +- yarn.lock | 389 +++++++++++++++++++--------------------------- 3 files changed, 161 insertions(+), 242 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5aea65ac0..223e52437 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,6 @@ "d3-tip": "0.9.1", "datetime": "^0.0.3", "js-date": "^0.1.3", - "process": "^0.11.10", "purescript": "^0.15.10" }, "devDependencies": { @@ -29,7 +28,7 @@ "purescript-psa": "0.8.2", "purs-backend-es": "1.1.0", "purs-tidy": "^0.9.3", - "spago": "0.20.9" + "spago": "^0.20.9" } }, "node_modules/@codemirror/commands": { @@ -3413,14 +3412,6 @@ "node": ">=0.10.0" } }, - "node_modules/process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "engines": { - "node": ">= 0.6.0" - } - }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", @@ -4340,7 +4331,6 @@ "integrity": "sha512-r5TUxnYn9HawlQyMswlhIk24BGFSN2KGbqgZFZrn47GjTpMscU14xkt9CqTWgoSQYsoZieG+3dUtOxUQ7GYD7w==", "dev": true, "hasInstallScript": true, - "license": "MIT", "dependencies": { "make-fetch-happen": "^9.1.0", "tar": "^6.1.11" diff --git a/package.json b/package.json index 3183adc66..0f9172055 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,6 @@ "purescript-psa": "0.8.2", "purs-backend-es": "1.1.0", "purs-tidy": "^0.9.3", - "spago": "0.20.9" + "spago": "^0.20.9" } } diff --git a/yarn.lock b/yarn.lock index e7b810a92..39fdfa7b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -24,12 +24,12 @@ "@lezer/lr" "^1.0.0" style-mod "^4.0.0" -"@codemirror/state@6.2.0", "@codemirror/state@^6.0.0", "@codemirror/state@^6.1.4", "@codemirror/state@^6.2.0": +"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.4", "@codemirror/state@^6.2.0", "@codemirror/state@6.2.0": version "6.2.0" resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.2.0.tgz" integrity sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA== -"@codemirror/view@6.9.3", "@codemirror/view@^6.0.0": +"@codemirror/view@^6.0.0", "@codemirror/view@6.9.3": version "6.9.3" resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.9.3.tgz" integrity sha512-BJ5mvEIhFM+SrNwc5X8pLIvMM9ffjkviVbxpg84Xk2OE8ZyKaEbId8kX+nAYEEso7+qnbwsXe1bkAHsasebMow== @@ -43,11 +43,6 @@ resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@esbuild/linux-loong64@0.15.1": - version "0.15.1" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.1.tgz#f293d9442201fa7448248f05590139bb8e521856" - integrity sha512-1tORADNFK9QS4KYyUyh3Td9WGrdiI1rSoKvY6A43+9G0kPujBuT4lIGyoK0AweOSO1aRIR28xQUfiJCUa78bUw== - "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3": version "1.1.3" resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz" @@ -152,7 +147,7 @@ accepts@~1.3.4: mime-types "~2.1.24" negotiator "0.6.2" -agent-base@6, agent-base@^6.0.2: +agent-base@^6.0.2, agent-base@6: version "6.0.2" resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -267,7 +262,7 @@ balanced-match@^1.0.0: resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz" integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= -base64id@2.0.0, base64id@~2.0.0: +base64id@~2.0.0, base64id@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== @@ -438,7 +433,7 @@ chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chokidar@3.5.3, chokidar@^3.5.1: +chokidar@^3.5.1, chokidar@3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -498,17 +493,17 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - color-name@~1.1.4: version "1.1.4" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -commander@2, commander@^2.18.0: +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +commander@^2.18.0, commander@2: version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -602,7 +597,7 @@ cyclist@^1.0.1: resolved "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz" integrity sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA== -d3-array@2, d3-array@>=2.5, d3-array@^2.3.0: +d3-array@^2.3.0, d3-array@>=2.5, d3-array@2: version "2.12.1" resolved "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz" integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ== @@ -762,16 +757,16 @@ d3-scale@3: d3-time "^2.1.1" d3-time-format "2 - 3" -d3-selection@2: - version "2.0.0" - resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz" - integrity sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA== - d3-selection@^1.3.0: version "1.4.2" resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz" integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg== +d3-selection@2: + version "2.0.0" + resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz" + integrity sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA== + d3-shape@2: version "2.1.0" resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-2.1.0.tgz" @@ -786,7 +781,7 @@ d3-shape@2: dependencies: d3-time "1 - 2" -"d3-time@1 - 2", d3-time@2, d3-time@^2.1.1: +d3-time@^2.1.1, "d3-time@1 - 2", d3-time@2: version "2.1.1" resolved "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz" integrity sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ== @@ -876,20 +871,6 @@ datetime@^0.0.3: dependencies: vows ">=0.5.4" -debug@2.6.9: - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4, debug@4.3.4, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: - version "4.3.4" - resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - debug@^3.0.0: version "3.2.6" resolved "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz" @@ -904,6 +885,20 @@ debug@^4.1.0: dependencies: ms "2.1.2" +debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@4, debug@4.3.4: + version "4.3.4" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +debug@2.6.9: + version "2.6.9" + resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + decamelize@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz" @@ -924,16 +919,16 @@ di@^0.0.1: resolved "https://registry.npmjs.org/di/-/di-0.0.1.tgz" integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= -diff@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - diff@^4.0.1: version "4.0.2" resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +diff@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" + integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== + dom-serialize@^2.2.1: version "2.2.1" resolved "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz" @@ -1024,106 +1019,11 @@ err-code@^2.0.2: resolved "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== -esbuild-android-64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.1.tgz#f609a37348a3784ae632e88517d2e5f579984806" - integrity sha512-q5kkJZsgLIkyh5e2ZJl4/kXKIueBKtjVMEihP9WCHadqhH6+F9qiycE7fBwUb/g2B15mYlmMBXjp8VmOT3J2gA== - -esbuild-android-arm64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.1.tgz#94b064dfa87bacbfb623313ead8338d357175a10" - integrity sha512-IQuZOzqMaFceLlKJJA27CXAdh+Mzh2ZblHMmcNIu/wxb6iX1zgYXlPWle62iHnmNCtfAux1mzQvmNsP9aLhemA== - -esbuild-darwin-64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.1.tgz#d15ed63dada464c18a8245199294df5b22c865ff" - integrity sha512-tyouWLyxwM/Y2fy/reuIvAvVB+KVQwuY9IVyV7LH5CGkJYxgtLb8xVEiwHFF8TG2uo9a2fqdgWffados4YA6Aw== - -esbuild-darwin-arm64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.1.tgz#c8c6a8949faa88cccbc508143662d53a111d7ee0" - integrity sha512-fb4V1eB1nir3zJwsS75itsbahkbM71XuqUDJVH8iyBLS8VIQD7MWWAAekea2l9keueGfsn0+wTyDluMT+kg8Cw== - -esbuild-freebsd-64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.1.tgz#4ebbbd954e2e72cf35e78185f4da810a8c3fce2f" - integrity sha512-1KxEv/FUPlQtUSOjFCwR8FVNEskB5LmkbfW9FNJ7lhpG+4RsLiHWw4Sl2Y1/S+aKX7inyWxLA05zYV6XAzO8DA== - -esbuild-freebsd-arm64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.1.tgz#a377942ed5b2578f9d8e8aea1396db59df5e1742" - integrity sha512-ueUMGSNrcuHwAadioxBdfOCO4+bTVeI68a147BQ/AFFIrf4XJNow4UXxguvQlZO+ZYaVz6EztaL6mHslKie2Rw== - -esbuild-linux-32@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.1.tgz#7226edd9517ee0bdc0ea7a8be1b5047d31de9426" - integrity sha512-K5WWcN2OZkZ6arFN3+hi1leKc0at9ukKGrXK9Ia94kQOesBphTSmsNK/Gy/AoVoIa0bWrHtxDijS9j9+dz86oA== - esbuild-linux-64@0.15.1: version "0.15.1" resolved "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.1.tgz" integrity sha512-+haiVm83DfRi9x8M+GgR4f4LtSN8lnEIG8XMGK8/FYpkYNQiKb398GxeHp2yvoMpX8IPvmWCt215tAm5BBNfZQ== -esbuild-linux-arm64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.1.tgz#4a33a9b9dc95d537264aaf05a3e3fdbf6fb8cce5" - integrity sha512-TP0BCVZEVu/aoVaZe2sn1vpvo63j0LPiH8rvd7AegqOfTwb+mcxLxpgyYwkibafUCMxnIrKdUTsSJeusoMhcLg== - -esbuild-linux-arm@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.1.tgz#31773327a2c8edfd77c7cf12ded141b2db0b25c6" - integrity sha512-qjAkEDcFhVNYwG2xgaDg/hA8JABoMvjzAzE6g1K8kR516oNkKbVf6rN68UrsQaV1zq1qR3dbVeMv/Ul2bheppA== - -esbuild-linux-mips64le@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.1.tgz#714b8c49886349d2a599f05fae5cb7dc5e574658" - integrity sha512-8vzQzp+kwrn1Y+OjvfFaLS8uL8aR39WnAtxOHwjB72s9g18kHFlE8IQLS9dWDQgKpBSFq9kazsJE65dSVmz+VA== - -esbuild-linux-ppc64le@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.1.tgz#5df1ec88d850745de2ce23d1a4117d04d36b8a32" - integrity sha512-QlWSOgC2Ad53Xvf7ZivXU7wM2y29YhQUrd50PjK0QJ3psh/eYSQx77PTe1iWm7Ovjiqv1wPKEAyC7CbyJUgriw== - -esbuild-linux-riscv64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.1.tgz#3ccf408ec4682630862310e28038d30639e2623c" - integrity sha512-/PRNgNsiwb7G2n3rB5WcHinCwKj0OqUmtu8cdakV4CLNWnFnfChEGEJX1x5n8RcGD3xPUlI5CgqFe0/oBcUh+A== - -esbuild-linux-s390x@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.1.tgz#1340260371f01703fe91376d9550f0bcf709d7a4" - integrity sha512-TScRbO4mi4AUUXzIQ8sb6ZXhGkCb/PlJ82qFfBE6xxsioae/d6XaSdaha/+OUTvmPeoro3lNf3vwdw27v3wEgw== - -esbuild-netbsd-64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.1.tgz#b3c31b64a88379d0a16f44ffc66a0c879a4105ae" - integrity sha512-ES2pbK8QfsMZbdPkgjkLwWfnEGtPa0vYzVFLQn7GFgP+RiemY+ulH7WWQ8ezMt9rZl4XAR3y14yKLGX0gsBLaw== - -esbuild-openbsd-64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.1.tgz#2447e8734a8fccfa91f4cbfc2816b09ec38d468f" - integrity sha512-DxNWji11AxSEny4HzSKu21Skia8tEPQI1N+XO/RqVOJComOvsFLq+QeooKsK2caOsQIKl9mO14Hh+px+zFabMA== - -esbuild-sunos-64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.1.tgz#bca632708b8fc124a15477433ad2ae22f3726e0d" - integrity sha512-lwZoWlv893qtQQx5H4QQCh2mcYzGbxEz09ESFdd4cHcUCfjb193bSAy6jPxW2efBx2fHEo2sw43TRtAkpCf+XQ== - -esbuild-windows-32@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.1.tgz#c5577ed48901075772db1332ed5098b0a3cf6e2f" - integrity sha512-jEFz8DxP+Hh67fk9XMoyLUqPjjoCT6m4bnl36aze0XpPZDuQm0SBDlG/ciOBCjzHDsu/MYUNwxVezvUT3sXh1A== - -esbuild-windows-64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.1.tgz#4fd2d9c62b37e98adff350a2763622c5c0e27c21" - integrity sha512-bUetnfw4xXKBTOQx4sTzoENJVEdgAN29ZTLRtnMseRzsMO8pjObQMsRPpPL3Cstt6FJhj3k3uScHc5VnfC9QkA== - -esbuild-windows-arm64@0.15.1: - version "0.15.1" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.1.tgz#6243dd249fccb7b6993096da51173d97a2714b37" - integrity sha512-oN0JMj7fQZOiqJ/f/wc8lkxjvWwj5Yz0ZhOeU90JFaPZAfafNnysi6GS95glY5uwLUUJz/RNc84cb0dK2qT89A== - esbuild@0.15.1: version "0.15.1" resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.15.1.tgz" @@ -1161,16 +1061,16 @@ escape-html@~1.0.3: resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@4.0.0: + version "4.0.0" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + eventemitter3@^4.0.0: version "4.0.4" resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz" @@ -1262,14 +1162,6 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - find-up@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz" @@ -1278,6 +1170,14 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + flat@^5.0.2: version "5.0.2" resolved "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz" @@ -1342,11 +1242,6 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" - integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== - get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz" @@ -1379,18 +1274,6 @@ glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob@7.2.0: - version "7.2.0" - resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - 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" - glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: version "7.1.6" resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz" @@ -1426,6 +1309,18 @@ glob@^8.0.1: minimatch "^5.0.1" once "^1.3.0" +glob@7.2.0: + version "7.2.0" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz" + integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== + dependencies: + 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" + globby@^6.1.0: version "6.1.0" resolved "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz" @@ -1528,13 +1423,6 @@ humanize-url@^1.0.0: normalize-url "^1.0.0" strip-url-auth "^1.0.0" -iconv-lite@0.4, iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - iconv-lite@^0.6.2: version "0.6.3" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" @@ -1542,6 +1430,13 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" +iconv-lite@0.4, iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + iferr@^0.1.5: version "0.1.5" resolved "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz" @@ -1570,7 +1465,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: +inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3, inherits@2: version "2.0.4" resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -1701,7 +1596,7 @@ karma-mocha@2.0.1: dependencies: minimist "^1.2.3" -karma@6.4.0: +karma@>=0.13, karma@6.4.0: version "6.4.0" resolved "https://registry.npmjs.org/karma/-/karma-6.4.0.tgz" integrity sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w== @@ -1750,14 +1645,6 @@ lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.4: resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - log-symbols@^2.1.0: version "2.2.0" resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz" @@ -1772,6 +1659,14 @@ log-symbols@^3.0.0: dependencies: chalk "^2.4.2" +log-symbols@4.1.0: + version "4.1.0" + resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== + dependencies: + chalk "^4.1.0" + is-unicode-supported "^0.1.0" + log-update@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz" @@ -1895,13 +1790,6 @@ mimic-fn@^2.1.0: resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - minimatch@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz" @@ -1923,6 +1811,13 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" +minimatch@5.0.1: + version "5.0.1" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" + integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6: version "1.2.8" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz" @@ -2016,7 +1911,12 @@ mkdirp@^0.5.1, mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mkdirp@^1.0.3, mkdirp@^1.0.4: +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + +mkdirp@^1.0.4: version "1.0.4" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== @@ -2061,17 +1961,27 @@ move-concurrently@^1.0.1: rimraf "^2.5.4" run-queue "^1.0.3" -ms@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +ms@^2.0.0: + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -ms@2.1.2, ms@^2.1.2: +ms@^2.1.2, ms@2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.0.0, ms@^2.1.1: +ms@2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.3: version "2.1.3" resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -2081,16 +1991,16 @@ nanoid@3.3.3: resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz" integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - negotiator@^0.6.2, negotiator@^0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz" @@ -2394,7 +2304,7 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6, readable-stream@~2.3.6, "readable-stream@1 || 2": version "2.3.8" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz" integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA== @@ -2449,7 +2359,14 @@ rimraf@^2.5.4, rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.0: + version "3.0.2" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -2473,7 +2390,12 @@ safe-buffer@^5.1.0: resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@~5.1.0: + version "5.1.2" + resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -2607,7 +2529,7 @@ source-map@^0.6.1: resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -spago@0.20.9: +spago@^0.20.9: version "0.20.9" resolved "https://registry.npmjs.org/spago/-/spago-0.20.9.tgz" integrity sha512-r5TUxnYn9HawlQyMswlhIk24BGFSN2KGbqgZFZrn47GjTpMscU14xkt9CqTWgoSQYsoZieG+3dUtOxUQ7GYD7w== @@ -2668,6 +2590,13 @@ strict-uri-encode@^1.0.0: resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz" integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + string-width@^4.1.0, string-width@^4.2.0: version "4.2.0" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz" @@ -2677,13 +2606,6 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" @@ -2725,13 +2647,6 @@ style-mod@^4.0.0: resolved "https://registry.npmjs.org/style-mod/-/style-mod-4.0.2.tgz" integrity sha512-C4myMmRTO8iaC5Gg+N1ftK2WT4eXUTMAa+HEFPPrfVeO/NtqLTtAmV1HbqnuGtLwCek44Ra76fdGUkSqjiMPcQ== -supports-color@8.1.1: - version "8.1.1" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" @@ -2746,6 +2661,13 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@8.1.1: + version "8.1.1" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + tar@^6.0.2, tar@^6.1.11: version "6.1.11" resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz" @@ -2848,7 +2770,7 @@ universalify@^0.1.0: resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -unpipe@1.0.0, unpipe@~1.0.0: +unpipe@~1.0.0, unpipe@1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= @@ -2887,7 +2809,7 @@ vows@>=0.5.4: eyes "~0.1.6" glob "^7.1.2" -vscode-jsonrpc@8.0.2, vscode-jsonrpc@^8.0.0-next.2: +vscode-jsonrpc@^8.0.0-next.2, vscode-jsonrpc@8.0.2: version "8.0.2" resolved "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz" integrity sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ== @@ -2934,7 +2856,14 @@ which@^1.2.1, which@^1.3.1: dependencies: isexe "^2.0.0" -which@^2.0.1, which@^2.0.2: +which@^2.0.1: + version "2.0.2" + resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +which@^2.0.2: version "2.0.2" resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -2999,16 +2928,16 @@ yallist@^4.0.0: resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - yargs-parser@^20.2.2: version "20.2.9" resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz" integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== +yargs-parser@20.2.4: + version "20.2.4" + resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + yargs-unparser@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz" @@ -3019,7 +2948,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.1.1: +yargs@^16.1.1, yargs@16.2.0: version "16.2.0" resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== From fa59157887daa654efcfea96b74732b501a10c46 Mon Sep 17 00:00:00 2001 From: Roly Perera Date: Tue, 10 Oct 2023 09:14:32 +0100 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=A7=A9=20[consolidate]:=20Minor=20twe?= =?UTF-8?q?aks.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/Benchmark/Util.purs | 5 ++++- test/Util.purs | 13 ++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/test/Benchmark/Util.purs b/test/Benchmark/Util.purs index a70ce6027..5a577b745 100644 --- a/test/Benchmark/Util.purs +++ b/test/Benchmark/Util.purs @@ -7,6 +7,7 @@ import Data.Array (intersperse, fromFoldable) as A import Data.Int (toNumber) import Data.List (fold) import Data.Map (Map, singleton, unionWith, fromFoldable, keys, values) +import Data.Newtype (class Newtype, over2) import Effect.Class (class MonadEffect, liftEffect) import Test.Spec.Microtime (microtime) import Util (type (×), (×)) @@ -29,8 +30,10 @@ instance Show BenchAcc where newtype BenchRow = BenchRow (Map String Number) +derive instance Newtype BenchRow _ + instance Semigroup BenchRow where - append (BenchRow row1) (BenchRow row2) = BenchRow (unionWith (+) row1 row2) + append = unionWith (+) `flip over2` BenchRow instance Monoid BenchRow where mempty = BenchRow diff --git a/test/Util.purs b/test/Util.purs index 9a032b5ba..218fd477f 100644 --- a/test/Util.purs +++ b/test/Util.purs @@ -77,14 +77,13 @@ testTrace s γ { δv, bwd_expect, fwd_expect } = do traceGC (erase <$> γ) e -- | Backward - (γ𝔹 × e𝔹) <- bench "Trace-Bwd" $ \_ -> do - let γ𝔹 × e𝔹 × _ = eval.bwd (δv (botOf v)) - pure (γ𝔹 × e𝔹) + (γ𝔹 × e𝔹 × _) <- bench "Trace-Bwd" $ \_ -> + pure (eval.bwd (δv (botOf v))) let s𝔹 = desug𝔹.bwd e𝔹 -- | Forward (round-tripping) let e𝔹' = desug𝔹.fwd s𝔹 - v𝔹 <- bench "Trace-Fwd" $ \_ -> do + v𝔹 <- bench "Trace-Fwd" $ \_ -> pure (eval.fwd (γ𝔹 × e𝔹' × top)) -- | Check backward selections @@ -121,10 +120,10 @@ testGraph s gconfig { δv, bwd_expect, fwd_expect } is_bench = do pure (select𝔹s vα αs_out' × αs_out') -- | Check backward selections - unless (null bwd_expect) do + unless (null bwd_expect) $ checkPretty "Graph-based source selection" bwd_expect s𝔹 -- | Check round-trip selections - unless (isGraphical v𝔹) do + unless (isGraphical v𝔹) $ checkPretty "Graph-based value" fwd_expect v𝔹 αs_out `shouldSatisfy "fwd ⚬ bwd round-tripping property"` (flip subset αs_out') @@ -139,7 +138,7 @@ testGraph s gconfig { δv, bwd_expect, fwd_expect } is_bench = do pure (select𝔹s eα αs_in_dual) -- | Backward (all outputs selected) - e𝔹_all <- bench "Graph-BwdAll" $ \_ -> do + e𝔹_all <- bench "Graph-BwdAll" $ \_ -> pure (select𝔹s eα $ eval.bwd (vertices vα)) -- | De Morgan dual of forward From b282330c77c048cdb8a94cf1cd9589585f5bab3f Mon Sep 17 00:00:00 2001 From: Roly Perera Date: Tue, 10 Oct 2023 09:20:16 +0100 Subject: [PATCH 3/8] =?UTF-8?q?=F0=9F=A7=A9=20[consolidate]:=20Simplify.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/Benchmark.purs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/Benchmark.purs b/test/Benchmark.purs index e0e78f29d..6f295c17b 100644 --- a/test/Benchmark.purs +++ b/test/Benchmark.purs @@ -6,10 +6,8 @@ module Test.Benchmark import Prelude hiding (add) import Benchmark.Util (BenchAcc(..), BenchRow) -import Control.Apply (lift2) import Data.Array (concat) import Data.Traversable (sequence) -import Data.Tuple (Tuple(..)) import Effect (Effect) import Effect.Aff (Aff, launchAff_) import Effect.Class.Console (logShow) @@ -22,7 +20,7 @@ main = launchAff_ do let iter = 1 arr = concat ([ bench_misc, bench_desugaring, bench_bwd, bench_graphics ] <#> ((#) (iter × true))) - outs <- sequence $ map (\(str × row) -> lift2 Tuple (pure str) row) arr + outs <- sequence $ (\(str × row) -> (str × _) <$> row) <$> arr logShow (BenchAcc outs) bench_desugaring :: (Int × Boolean) -> Array (String × Aff BenchRow) From 04215b4c804ef8202fed260ed573c060bd1f5828 Mon Sep 17 00:00:00 2001 From: Roly Perera Date: Tue, 10 Oct 2023 09:22:40 +0100 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=A7=A9=20[remove-unused]:=20Packages.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- spago.dhall | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spago.dhall b/spago.dhall index 26403767e..e86ff6238 100644 --- a/spago.dhall +++ b/spago.dhall @@ -11,7 +11,6 @@ You can edit this file as you like. , "bifunctors" , "console" , "control" - , "datetime" , "debug" , "effect" , "either" @@ -19,17 +18,13 @@ You can edit this file as you like. , "exists" , "foldable-traversable" , "foreign-object" - , "heterogeneous" , "http-methods" , "identity" , "integers" - , "js-date" - , "lazy" , "lists" , "maybe" , "newtype" , "nonempty" - , "now" , "numbers" , "ordered-collections" , "parsing" From 5e0313eef10857a5483a5e03326c1bd97f8b64ae Mon Sep 17 00:00:00 2001 From: Roly Perera Date: Tue, 10 Oct 2023 09:39:27 +0100 Subject: [PATCH 5/8] =?UTF-8?q?=F0=9F=A7=A9=20[refactor]:=20Require=20arra?= =?UTF-8?q?y=20of=20benchmarks=20to=20be=20non-empty.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - test/Benchmark.purs | 13 +++++-------- test/Benchmark/Util.purs | 5 +++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 051336e43..48f2229e1 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,6 @@ "build-app": "yarn clean-app && spago build --purs-args '--strict --censor-codes=UserDefinedWarning' && purs-backend-es bundle-app --main App.Main --to dist/app/app.js", "clean-ex" : "rm -rf dist/ex && mkdir -p dist/ex && cp -r fluid dist/ex && cp web/index.html dist/ex && cp -r web/css dist/ex", "build-ex" : "yarn clean-ex && spago build --purs-args '--strict --censor-codes=UserDefinedWarning' && purs-backend-es bundle-app --main Example.Example --to dist/ex/app.js", - "example": "npx http-serve dist/ex -a 127.0.0.1", "serve-app": "yarn build-app && npx http-serve dist/app -a 127.0.0.1 -c-1", "clean-tests": "rm -rf dist/tests && mkdir -p dist/tests && cp web/tests.html dist/tests", "clean-bench": "rm -rf dist/benches && mkdir -p dist/benches && cp -r fluid dist/benches && cp web/index.html dist/benches && cp -r web/css dist/benches", diff --git a/test/Benchmark.purs b/test/Benchmark.purs index 6f295c17b..28a84da45 100644 --- a/test/Benchmark.purs +++ b/test/Benchmark.purs @@ -1,19 +1,16 @@ -module Test.Benchmark - ( --bench_desugaring - main - ) where - -import Prelude hiding (add) +module Test.Benchmark where +import Prelude import Benchmark.Util (BenchAcc(..), BenchRow) import Data.Array (concat) +import Data.Array.NonEmpty (fromArray) import Data.Traversable (sequence) import Effect (Effect) import Effect.Aff (Aff, launchAff_) import Effect.Class.Console (logShow) import Test.Many (many, bwdMany, withDatasetMany) import Test.Spec.Specs (misc_cases, bwd_cases, desugar_cases, graphics_cases) -import Util (type (×), (×)) +import Util (type (×), definitely, (×)) main :: Effect Unit main = launchAff_ do @@ -21,7 +18,7 @@ main = launchAff_ do iter = 1 arr = concat ([ bench_misc, bench_desugaring, bench_bwd, bench_graphics ] <#> ((#) (iter × true))) outs <- sequence $ (\(str × row) -> (str × _) <$> row) <$> arr - logShow (BenchAcc outs) + logShow (BenchAcc $ definitely "More than one benchmark" $ fromArray outs) bench_desugaring :: (Int × Boolean) -> Array (String × Aff BenchRow) bench_desugaring = many desugar_cases diff --git a/test/Benchmark/Util.purs b/test/Benchmark/Util.purs index 5a577b745..d8681e89a 100644 --- a/test/Benchmark/Util.purs +++ b/test/Benchmark/Util.purs @@ -4,6 +4,7 @@ import Prelude import Control.Monad.Writer.Class (class MonadWriter, tell) import Data.Array (intersperse, fromFoldable) as A +import Data.Array.NonEmpty (NonEmptyArray, toArray) import Data.Int (toNumber) import Data.List (fold) import Data.Map (Map, singleton, unionWith, fromFoldable, keys, values) @@ -12,11 +13,11 @@ import Effect.Class (class MonadEffect, liftEffect) import Test.Spec.Microtime (microtime) import Util (type (×), (×)) -newtype BenchAcc = BenchAcc (Array (String × BenchRow)) +newtype BenchAcc = BenchAcc (NonEmptyArray (String × BenchRow)) instance Show BenchAcc where show (BenchAcc rows) = - fold $ A.intersperse "\n" ([ showHeader ] <> (showRow <$> rows)) + fold $ A.intersperse "\n" ([ showHeader ] <> (toArray $ showRow <$> rows)) where BenchRow empty_row = mempty From c2503969f32ca56b73702fd6c59b296c5526cf60 Mon Sep 17 00:00:00 2001 From: Roly Perera Date: Tue, 10 Oct 2023 09:48:32 +0100 Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=A7=A9=20[consolidate]:=20Monoid=20un?= =?UTF-8?q?it=20for=20BenchRow=20can=20just=20be=20empty=20map.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/Benchmark.purs | 2 +- test/Benchmark/Util.purs | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/test/Benchmark.purs b/test/Benchmark.purs index 28a84da45..dbf28807d 100644 --- a/test/Benchmark.purs +++ b/test/Benchmark.purs @@ -18,7 +18,7 @@ main = launchAff_ do iter = 1 arr = concat ([ bench_misc, bench_desugaring, bench_bwd, bench_graphics ] <#> ((#) (iter × true))) outs <- sequence $ (\(str × row) -> (str × _) <$> row) <$> arr - logShow (BenchAcc $ definitely "More than one benchmark" $ fromArray outs) + logShow $ BenchAcc $ definitely "More than one benchmark" $ fromArray outs bench_desugaring :: (Int × Boolean) -> Array (String × Aff BenchRow) bench_desugaring = many desugar_cases diff --git a/test/Benchmark/Util.purs b/test/Benchmark/Util.purs index d8681e89a..64180758e 100644 --- a/test/Benchmark/Util.purs +++ b/test/Benchmark/Util.purs @@ -4,11 +4,13 @@ import Prelude import Control.Monad.Writer.Class (class MonadWriter, tell) import Data.Array (intersperse, fromFoldable) as A -import Data.Array.NonEmpty (NonEmptyArray, toArray) +import Data.Array.NonEmpty (NonEmptyArray, head, toArray) import Data.Int (toNumber) import Data.List (fold) -import Data.Map (Map, singleton, unionWith, fromFoldable, keys, values) +import Data.Map (Map, singleton, unionWith, keys, values) +import Data.Map (empty) as M import Data.Newtype (class Newtype, over2) +import Data.Tuple (snd) import Effect.Class (class MonadEffect, liftEffect) import Test.Spec.Microtime (microtime) import Util (type (×), (×)) @@ -19,11 +21,11 @@ instance Show BenchAcc where show (BenchAcc rows) = fold $ A.intersperse "\n" ([ showHeader ] <> (toArray $ showRow <$> rows)) where - BenchRow empty_row = mempty + BenchRow firstRow = head rows # snd showHeader :: String showHeader = - fold $ A.intersperse "," ([ "Test-Name" ] <> A.fromFoldable (keys empty_row)) + fold $ A.intersperse "," ([ "Test-Name" ] <> A.fromFoldable (keys firstRow)) showRow :: String × BenchRow -> String showRow (test_name × (BenchRow row)) = @@ -37,8 +39,7 @@ instance Semigroup BenchRow where append = unionWith (+) `flip over2` BenchRow instance Monoid BenchRow where - mempty = BenchRow - (fromFoldable [ ("Trace-Eval" × 0.0), ("Trace-Bwd" × 0.0), ("Trace-Fwd" × 0.0), ("Graph-Eval" × 0.0), ("Graph-Bwd" × 0.0), ("Graph-Fwd" × 0.0), ("Graph-BwdDual" × 0.0), ("Graph-BwdAll" × 0.0), ("Graph-FwdDual" × 0.0), ("Graph-FwdAsDeMorgan" × 0.0) ]) + mempty = BenchRow M.empty tdiff :: Number -> Number -> Number tdiff x y = sub y x From 9c2488a2a3d17d14b8f1d75efe17544221fbf958 Mon Sep 17 00:00:00 2001 From: Roly Perera Date: Tue, 10 Oct 2023 09:54:20 +0100 Subject: [PATCH 7/8] =?UTF-8?q?=F0=9F=A7=A9=20[consolidate]:=20Inline=20td?= =?UTF-8?q?iff.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/Benchmark/Util.purs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/Benchmark/Util.purs b/test/Benchmark/Util.purs index 64180758e..e5e5dd7a0 100644 --- a/test/Benchmark/Util.purs +++ b/test/Benchmark/Util.purs @@ -41,9 +41,6 @@ instance Semigroup BenchRow where instance Monoid BenchRow where mempty = BenchRow M.empty -tdiff :: Number -> Number -> Number -tdiff x y = sub y x - preciseTime :: forall m. MonadEffect m => m Number preciseTime = liftEffect microtime @@ -52,7 +49,7 @@ bench name prog = do t1 <- preciseTime r <- prog unit t2 <- preciseTime - tell (BenchRow $ singleton name (tdiff t1 t2)) + tell (BenchRow $ singleton name (t2 `sub` t1)) pure r divRow :: BenchRow -> Int -> BenchRow From 94db95d521f914d4e56496381660a30980f7fc2c Mon Sep 17 00:00:00 2001 From: Roly Perera Date: Tue, 10 Oct 2023 10:01:17 +0100 Subject: [PATCH 8/8] =?UTF-8?q?=F0=9F=A7=A9=20[consolidate]:=20preciseTime?= =?UTF-8?q?=20as=20local.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/Benchmark/Util.purs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/Benchmark/Util.purs b/test/Benchmark/Util.purs index e5e5dd7a0..01c210b85 100644 --- a/test/Benchmark/Util.purs +++ b/test/Benchmark/Util.purs @@ -41,9 +41,6 @@ instance Semigroup BenchRow where instance Monoid BenchRow where mempty = BenchRow M.empty -preciseTime :: forall m. MonadEffect m => m Number -preciseTime = liftEffect microtime - bench :: forall m a. MonadEffect m => MonadWriter BenchRow m => String -> (Unit -> m a) -> m a bench name prog = do t1 <- preciseTime @@ -51,7 +48,9 @@ bench name prog = do t2 <- preciseTime tell (BenchRow $ singleton name (t2 `sub` t1)) pure r + where + preciseTime :: m Number + preciseTime = liftEffect microtime divRow :: BenchRow -> Int -> BenchRow -divRow (BenchRow row) n = BenchRow (map (_ `div` toNumber n) row) - +divRow (BenchRow row) n = BenchRow ((_ `div` toNumber n) <$> row)