From 9758043bf6fd256b1a6d2e9ff733d3a6a8fca87f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 00:29:45 +0000 Subject: [PATCH 1/5] Bump prettier from 2.8.8 to 3.0.0 Bumps [prettier](https://github.com/prettier/prettier) from 2.8.8 to 3.0.0. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.0.0) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3ddf61a..ead0849 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "eslint-plugin-jsdoc": "^46.2.6", "eslint-plugin-prettier": "^4.0.0", "jest": "^27.0.3", - "prettier": "^2.5.1", + "prettier": "^3.0.0", "ts-jest": "^27.0.1", "typescript": "^4.6.0" }, diff --git a/yarn.lock b/yarn.lock index 8fe4c4c..e2ed923 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2736,10 +2736,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.5.1: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.0.tgz#e7b19f691245a21d618c68bc54dc06122f6105ae" + integrity sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g== pretty-format@^27.0.0, pretty-format@^27.5.1: version "27.5.1" From c947149757b53e05dd1d713e9c6e67dbf81af7b9 Mon Sep 17 00:00:00 2001 From: Noah Manneschmidt Date: Tue, 11 Jul 2023 09:59:43 -0700 Subject: [PATCH 2/5] Upgrade to alpha eslint plugin --- package.json | 2 +- yarn.lock | 200 ++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 185 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index ead0849..9066900 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "eslint-config-prettier": "^8.5.0", "eslint-plugin-jest": "^27.1.4", "eslint-plugin-jsdoc": "^46.2.6", - "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-prettier": "^5.0.0-alpha.2", "jest": "^27.0.3", "prettier": "^3.0.0", "ts-jest": "^27.0.1", diff --git a/yarn.lock b/yarn.lock index e2ed923..76a7179 100644 --- a/yarn.lock +++ b/yarn.lock @@ -582,6 +582,18 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@pkgr/utils@^2.3.1": + version "2.4.2" + resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.2.tgz#9e638bbe9a6a6f165580dc943f138fd3309a2cbc" + integrity sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw== + dependencies: + cross-spawn "^7.0.3" + fast-glob "^3.3.0" + is-glob "^4.0.3" + open "^9.1.0" + picocolors "^1.0.0" + tslib "^2.6.0" + "@sinonjs/commons@^1.7.0": version "1.8.3" resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" @@ -851,12 +863,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4: - version "8.8.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" - integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== - -acorn@^8.9.0: +acorn@^8.2.4, acorn@^8.9.0: version "8.9.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59" integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ== @@ -1010,6 +1017,18 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +big-integer@^1.6.44: + version "1.6.51" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" + integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== + +bplist-parser@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e" + integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw== + dependencies: + big-integer "^1.6.44" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -1065,6 +1084,13 @@ builtin-modules@^3.3.0: resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== +bundle-name@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a" + integrity sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw== + dependencies: + run-applescript "^5.0.0" + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -1251,6 +1277,29 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +default-browser-id@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c" + integrity sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA== + dependencies: + bplist-parser "^0.2.0" + untildify "^4.0.0" + +default-browser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-4.0.0.tgz#53c9894f8810bf86696de117a6ce9085a3cbc7da" + integrity sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA== + dependencies: + bundle-name "^3.0.0" + default-browser-id "^3.0.0" + execa "^7.1.1" + titleize "^3.0.0" + +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -1368,12 +1417,13 @@ eslint-plugin-jsdoc@^46.2.6: semver "^7.5.1" spdx-expression-parse "^3.0.1" -eslint-plugin-prettier@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b" - integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ== +eslint-plugin-prettier@^5.0.0-alpha.2: + version "5.0.0-alpha.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0-alpha.2.tgz#4dd7edf88ff9bc13a3bbd91c059aae267dac4576" + integrity sha512-F6YBCbrRzvZwcINw3crm1+/uX/i+rJYaFErPtwCfUoPLywRfY7pwBtI3yMe5OpIotuaiws8cd29oM80ca6NQSQ== dependencies: prettier-linter-helpers "^1.0.0" + synckit "^0.8.5" eslint-scope@^5.1.1: version "5.1.1" @@ -1499,6 +1549,21 @@ execa@^5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" +execa@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-7.1.1.tgz#3eb3c83d239488e7b409d48e8813b76bb55c9c43" + integrity sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.1" + human-signals "^4.3.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^3.0.7" + strip-final-newline "^3.0.0" + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -1524,10 +1589,10 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^3.2.9: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== +fast-glob@^3.2.9, fast-glob@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.0.tgz#7c40cb491e1e2ed5664749e87bfb516dbe8727c0" + integrity sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -1646,7 +1711,7 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-stream@^6.0.0: +get-stream@^6.0.0, get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== @@ -1762,6 +1827,11 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== +human-signals@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" + integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== + iconv-lite@0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -1827,6 +1897,16 @@ is-core-module@^2.8.1: dependencies: has "^1.0.3" +is-docker@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== + +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -1849,6 +1929,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: dependencies: is-extglob "^2.1.1" +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -1869,11 +1956,23 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== +is-stream@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac" + integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA== + is-typedarray@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -2530,6 +2629,11 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc" + integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw== + minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -2574,6 +2678,13 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" +npm-run-path@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.1.0.tgz#bc62f7f3f6952d9894bd08944ba011a6ee7b7e00" + integrity sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q== + dependencies: + path-key "^4.0.0" + nwsapi@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" @@ -2593,6 +2704,23 @@ onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" +onetime@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4" + integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ== + dependencies: + mimic-fn "^4.0.0" + +open@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6" + integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg== + dependencies: + default-browser "^4.0.0" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^2.2.0" + optionator@^0.8.1: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" @@ -2687,6 +2815,11 @@ path-key@^3.0.0, path-key@^3.1.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== +path-key@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18" + integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ== + path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" @@ -2836,6 +2969,13 @@ rimraf@^3.0.0, rimraf@^3.0.2: dependencies: glob "^7.1.3" +run-applescript@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c" + integrity sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg== + dependencies: + execa "^5.0.0" + run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -2879,7 +3019,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.2, signal-exit@^3.0.3: +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -2981,6 +3121,11 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-final-newline@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd" + integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw== + strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" @@ -3025,6 +3170,14 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== +synckit@^0.8.5: + version "0.8.5" + resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.5.tgz#b7f4358f9bb559437f9f167eb6bc46b3c9818fa3" + integrity sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q== + dependencies: + "@pkgr/utils" "^2.3.1" + tslib "^2.5.0" + terminal-link@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" @@ -3052,6 +3205,11 @@ throat@^6.0.1: resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375" integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w== +titleize@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53" + integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ== + tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -3105,6 +3263,11 @@ tslib@^1.8.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== +tslib@^2.5.0, tslib@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" + integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -3158,6 +3321,11 @@ universalify@^0.2.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== +untildify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" + integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" From 3b4010656c27c5d35fe08466ea8744330af4eb98 Mon Sep 17 00:00:00 2001 From: Noah Manneschmidt Date: Tue, 11 Jul 2023 10:05:32 -0700 Subject: [PATCH 3/5] Reformat project --- src/__tests__/main.test.ts | 2 +- src/__tests__/parseSimfile.test.ts | 4 ++-- src/calculateStats.ts | 4 ++-- src/main.ts | 2 +- src/parseDwi.ts | 16 ++++++++-------- src/parseSm.ts | 22 +++++++++++----------- src/parseSong.ts | 4 ++-- src/parseSsc.ts | 26 +++++++++++++------------- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/__tests__/main.test.ts b/src/__tests__/main.test.ts index c9bf610..4efb097 100644 --- a/src/__tests__/main.test.ts +++ b/src/__tests__/main.test.ts @@ -11,7 +11,7 @@ describe("parseAllPacks", () => { parseAllPacks(packsRoot).map((p) => ({ name: p.name, songs: p.songCount, - })) + })), ).toMatchInlineSnapshot(` Array [ Object { diff --git a/src/__tests__/parseSimfile.test.ts b/src/__tests__/parseSimfile.test.ts index aa4d0e5..42f1b72 100644 --- a/src/__tests__/parseSimfile.test.ts +++ b/src/__tests__/parseSimfile.test.ts @@ -172,7 +172,7 @@ describe("parseSong", () => { test("single varied bpm song", () => { const simfile = parseSong( - path.join(packsRoot, "A20-(beta)", "Silly Love") + path.join(packsRoot, "A20-(beta)", "Silly Love"), )!; scrubDataForSnapshot(simfile); expect(simfile).toMatchInlineSnapshot(` @@ -1448,7 +1448,7 @@ describe("parseSong", () => { test("single new song", () => { const simfile = parseSong( - path.join(packsRoot, "Club Fantastic Season 2", "TerpZone") + path.join(packsRoot, "Club Fantastic Season 2", "TerpZone"), )!; scrubDataForSnapshot(simfile); expect(simfile).toMatchInlineSnapshot(` diff --git a/src/calculateStats.ts b/src/calculateStats.ts index 773f67f..3327b20 100644 --- a/src/calculateStats.ts +++ b/src/calculateStats.ts @@ -21,7 +21,7 @@ function isFreeze(d: Arrow["direction"]): boolean { function isGallop( d: Arrow, p: Arrow | undefined, - g: Arrow | undefined + g: Arrow | undefined, ): boolean { if (!p) { return false; @@ -79,7 +79,7 @@ export function calculateStats(chart: Stepchart): Stats { const jumps = chart.arrows.filter((a) => isJump(a.direction)); const freezes = chart.arrows.filter((a) => isFreeze(a.direction)); const gallops = chart.arrows.filter((a, i, array) => - isGallop(a, array[i - 1], array[i - 2]) + isGallop(a, array[i - 1], array[i - 2]), ); const jacks = chart.arrows.filter((a, i, array) => isJack(a, array[i - 1])); diff --git a/src/main.ts b/src/main.ts index e6136d8..fa7f85a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -66,7 +66,7 @@ export function parsePack(dir: string): PackWithSongs { } } catch (e) { reportError( - `parseStepchart failed for '${songFolder}': ${printMaybeError(e)}` + `parseStepchart failed for '${songFolder}': ${printMaybeError(e)}`, ); } }); diff --git a/src/parseDwi.ts b/src/parseDwi.ts index 04c36e7..0c7c97b 100644 --- a/src/parseDwi.ts +++ b/src/parseDwi.ts @@ -49,7 +49,7 @@ type ArrowParseResult = { */ function combinePadsIntoOneStream( p1: ArrowParseResult, - p2: ArrowParseResult + p2: ArrowParseResult, ): ArrowParseResult { const arrows = p1.arrows .concat(p2.arrows) @@ -106,7 +106,7 @@ function combinePadsIntoOneStream( */ function findFirstNonEmptyMeasure( p1Notes: string, - p2Notes: string | undefined + p2Notes: string | undefined, ): number { let i = 0; @@ -129,7 +129,7 @@ function findFirstNonEmptyMeasure( */ function parseArrowStream( notes: string, - firstNonEmptyMeasureIndex: number + firstNonEmptyMeasureIndex: number, ): ArrowParseResult { const arrows: Arrow[] = []; const freezes: FreezeLocation[] = []; @@ -174,7 +174,7 @@ function parseArrowStream( const of = openFreezes[d as FreezeLocation["direction"]]; if (!of) { reportError( - "error parsing dwi freezes, tried to close a freeze that never opened" + "error parsing dwi freezes, tried to close a freeze that never opened", ); } else { of.endOffset = curOffset.n / curOffset.d + 0.25; @@ -210,7 +210,7 @@ function parseArrowStream( arrows.push({ direction: dwiToSMDirection[note].replace( /1/g, - "2" + "2", ) as Arrow["direction"], quantization: determineBeat(curOffset), offset: curOffset.n / curOffset.d, @@ -260,7 +260,7 @@ function findBanner(titlePath: string): string | null { const files = fs.readdirSync(titlePath); const bannerFile = files.find( - (f) => f.endsWith(".png") && !f.endsWith("-bg.png") + (f) => f.endsWith(".png") && !f.endsWith("-bg.png"), ); return bannerFile ?? null; @@ -303,7 +303,7 @@ export function parseDwi(dwi: string, titlePath?: string): RawSimfile { const firstNonEmptyMeasureIndex = findFirstNonEmptyMeasure( notes, - playerTwoNotes + playerTwoNotes, ); let arrowResult = parseArrowStream(notes, firstNonEmptyMeasureIndex); @@ -311,7 +311,7 @@ export function parseDwi(dwi: string, titlePath?: string): RawSimfile { if (mode === "double") { const playerTwoResult = parseArrowStream( playerTwoNotes, - firstNonEmptyMeasureIndex + firstNonEmptyMeasureIndex, ); arrowResult = combinePadsIntoOneStream(arrowResult, playerTwoResult); diff --git a/src/parseSm.ts b/src/parseSm.ts index d3d85c9..acbc7ea 100644 --- a/src/parseSm.ts +++ b/src/parseSm.ts @@ -75,7 +75,7 @@ function isRest(line: string): boolean { function findFirstNonEmptyMeasure( mode: "single" | "double", lines: string[], - i: number + i: number, ): { firstNonEmptyMeasureIndex: number; numMeasuresSkipped: number } { let numMeasuresSkipped = 0; let measureIndex = i; @@ -98,7 +98,7 @@ function findFirstNonEmptyMeasure( } throw new Error( - "findFirstNonEmptyMeasure, failed to find a non-empty measure in entire song" + "findFirstNonEmptyMeasure, failed to find a non-empty measure in entire song", ); } @@ -133,7 +133,7 @@ export function parseSm(sm: string): RawSimfile { */ function parseStops( stopsString: string | null, - emptyOffsetInMeasures: number + emptyOffsetInMeasures: number, ) { if (!stopsString) { return []; @@ -187,14 +187,14 @@ export function parseSm(sm: string): RawSimfile { lines: string[], i: number, mode: string, - difficulty: string + difficulty: string, ): FreezeLocation[] { const freezes: FreezeLocation[] = []; const open: Record | undefined> = {}; let curOffset = new Fraction(0); let curMeasureFraction = new Fraction(1).div( - getMeasureLength(lines, i) || 1 + getMeasureLength(lines, i) || 1, ); for (; i < lines.length && !concludesANoteTag(lines[i]); ++i) { @@ -206,7 +206,7 @@ export function parseSm(sm: string): RawSimfile { if (line[0] === ",") { curMeasureFraction = new Fraction(1).div( - getMeasureLength(lines, i + 1) || 1 + getMeasureLength(lines, i + 1) || 1, ); continue; } @@ -226,7 +226,7 @@ export function parseSm(sm: string): RawSimfile { if (cleanedLine[d] === "2" || cleanedLine[d] === "4") { if (open[d]) { reportError( - `${sc.title}, ${mode}, ${difficulty} -- error parsing freezes, found a new starting freeze before a previous one finished` + `${sc.title}, ${mode}, ${difficulty} -- error parsing freezes, found a new starting freeze before a previous one finished`, ); } else { const startBeatFraction = curOffset; @@ -239,7 +239,7 @@ export function parseSm(sm: string): RawSimfile { const thisFreeze = open[d]; if (!thisFreeze) { reportError( - `${sc.title}, ${mode}, ${difficulty} -- error parsing freezes, tried to close a freeze that never opened` + `${sc.title}, ${mode}, ${difficulty} -- error parsing freezes, tried to close a freeze that never opened`, ); } else { const endBeatFraction = curOffset.add(new Fraction(1).div(4)); @@ -290,7 +290,7 @@ export function parseSm(sm: string): RawSimfile { // in case the measure is size zero, fall back to dividing by one // this is just being defensive, this would mean the stepfile has no notes in it let curMeasureFraction = new Fraction(1).div( - getMeasureLength(lines, i) || 1 + getMeasureLength(lines, i) || 1, ); for (; i < lines.length && !concludesANoteTag(lines[i]); ++i) { @@ -304,7 +304,7 @@ export function parseSm(sm: string): RawSimfile { if (line.startsWith(",")) { curMeasureFraction = new Fraction(1).div( - getMeasureLength(lines, i + 1) || 1 + getMeasureLength(lines, i + 1) || 1, ); continue; } @@ -395,7 +395,7 @@ export function parseSm(sm: string): RawSimfile { return sc as RawSimfile; } catch (e) { throw new Error( - `error parsing ${sm.substring(0, 300)}\n${printMaybeError(e)}` + `error parsing ${sm.substring(0, 300)}\n${printMaybeError(e)}`, ); } } diff --git a/src/parseSong.ts b/src/parseSong.ts index 5767ef9..f1e5da5 100644 --- a/src/parseSong.ts +++ b/src/parseSong.ts @@ -115,12 +115,12 @@ export function parseSong(songDirPath: string): Omit | null { const fileContents = fs.readFileSync(stepchartPath); const { images, ...rawStepchart } = parser( fileContents.toString(), - songDirPath + songDirPath, ); if (!Object.keys(rawStepchart.charts).length) { throw new Error( - `Failed to parse any charts from song: ${rawStepchart.title}` + `Failed to parse any charts from song: ${rawStepchart.title}`, ); } diff --git a/src/parseSsc.ts b/src/parseSsc.ts index 9a3c790..20d7df1 100644 --- a/src/parseSsc.ts +++ b/src/parseSsc.ts @@ -80,7 +80,7 @@ function isRest(line: string): boolean { function findFirstNonEmptyMeasure( mode: "single" | "double", lines: string[], - i: number + i: number, ): { firstNonEmptyMeasureIndex: number; numMeasuresSkipped: number } { let numMeasuresSkipped = 0; let measureIndex = i; @@ -103,7 +103,7 @@ function findFirstNonEmptyMeasure( } throw new Error( - "findFirstNonEmptyMeasure, failed to find a non-empty measure in entire song" + "findFirstNonEmptyMeasure, failed to find a non-empty measure in entire song", ); } @@ -138,7 +138,7 @@ export function parseSsc(ssc: string): RawSimfile { */ function parseStops( stopsString: string | null, - emptyOffsetInMeasures: number + emptyOffsetInMeasures: number, ) { if (!stopsString) { return []; @@ -192,14 +192,14 @@ export function parseSsc(ssc: string): RawSimfile { lines: string[], i: number, mode: string, - difficulty: string + difficulty: string, ): FreezeLocation[] { const freezes: FreezeLocation[] = []; const open: Record | undefined> = {}; let curOffset = new Fraction(0); let curMeasureFraction = new Fraction(1).div( - getMeasureLength(lines, i) || 1 + getMeasureLength(lines, i) || 1, ); for (; i < lines.length && !concludesANoteTag(lines[i]); ++i) { @@ -211,7 +211,7 @@ export function parseSsc(ssc: string): RawSimfile { if (line[0] === ",") { curMeasureFraction = new Fraction(1).div( - getMeasureLength(lines, i + 1) || 1 + getMeasureLength(lines, i + 1) || 1, ); continue; } @@ -231,7 +231,7 @@ export function parseSsc(ssc: string): RawSimfile { if (cleanedLine[d] === "2" || cleanedLine[d] === "4") { if (open[d]) { reportError( - `${sc.title}, ${mode}, ${difficulty} -- error parsing freezes, found a new starting freeze before a previous one finished` + `${sc.title}, ${mode}, ${difficulty} -- error parsing freezes, found a new starting freeze before a previous one finished`, ); } else { const startBeatFraction = curOffset; @@ -244,7 +244,7 @@ export function parseSsc(ssc: string): RawSimfile { const thisFreeze = open[d]; if (!thisFreeze) { reportError( - `${sc.title}, ${mode}, ${difficulty} -- error parsing freezes, tried to close a freeze that never opened` + `${sc.title}, ${mode}, ${difficulty} -- error parsing freezes, tried to close a freeze that never opened`, ); } else { const endBeatFraction = curOffset.add(new Fraction(1).div(4)); @@ -271,7 +271,7 @@ export function parseSsc(ssc: string): RawSimfile { function parseNotes(lines: string[], i: number, bpmString: string): number { if (!currentChart || !currentChart.mode || !currentChart.difficulty) { throw new Error( - "parseSsc: Can't parse notes before mode and difficulty are ready" + "parseSsc: Can't parse notes before mode and difficulty are ready", ); } // move past #NOTES into the note metadata @@ -289,7 +289,7 @@ export function parseSsc(ssc: string): RawSimfile { // in case the measure is size zero, fall back to dividing by one // this is just being defensive, this would mean the stepfile has no notes in it let curMeasureFraction = new Fraction(1).div( - getMeasureLength(lines, i) || 1 + getMeasureLength(lines, i) || 1, ); for (; i < lines.length && !concludesANoteTag(lines[i]); ++i) { @@ -303,7 +303,7 @@ export function parseSsc(ssc: string): RawSimfile { if (line.startsWith(",")) { curMeasureFraction = new Fraction(1).div( - getMeasureLength(lines, i + 1) || 1 + getMeasureLength(lines, i + 1) || 1, ); continue; } @@ -323,7 +323,7 @@ export function parseSsc(ssc: string): RawSimfile { lines, firstMeasureIndex, currentChart.mode, - currentChart.difficulty + currentChart.difficulty, ); currentChart.chart = { @@ -442,7 +442,7 @@ export function parseSsc(ssc: string): RawSimfile { return sc as RawSimfile; } catch (e) { throw new Error( - `error parsing ${ssc.substring(0, 300)}\n${printMaybeError(e)}` + `error parsing ${ssc.substring(0, 300)}\n${printMaybeError(e)}`, ); } } From 0c62e30b30ca6ce6df49365c10218a50b19d9666 Mon Sep 17 00:00:00 2001 From: Noah Manneschmidt Date: Tue, 11 Jul 2023 10:16:59 -0700 Subject: [PATCH 4/5] Reformat fraction.ts --- src/fraction.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/fraction.ts b/src/fraction.ts index c26f3be..ba2718b 100644 --- a/src/fraction.ts +++ b/src/fraction.ts @@ -21,7 +21,10 @@ function gcd(a: number, b: number) { } export class Fraction { - constructor(public n: number, public d: number = 1) {} + constructor( + public n: number, + public d: number = 1, + ) {} add(f: Fraction) { if (f.d === this.d) { From ddcc6e0f6e76a061e4857646fe84fb1975f8460e Mon Sep 17 00:00:00 2001 From: Noah Manneschmidt Date: Tue, 11 Jul 2023 10:20:28 -0700 Subject: [PATCH 5/5] add format script --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 3f62ecf..9c4ef86 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "sideEffects": "false", "scripts": { "test": "jest", + "format": "prettier --write src/**/*.ts", "lint": "eslint --max-warnings 0 ./src", "build": "tsc -p tsconfig.json", "clean": "rm -rf dist build",