diff --git a/.prettierrc.js b/.prettierrc.js index 4c41d26..0597365 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,4 +1,3 @@ -const {basePrettierConfig} = require('virmator/base-configs/base-prettierrc.js'); /** * @typedef {import('prettier-plugin-multiline-arrays').MultilineArrayOptions} MultilineOptions @@ -7,7 +6,25 @@ const {basePrettierConfig} = require('virmator/base-configs/base-prettierrc.js') * @type {PrettierOptions & MultilineOptions} */ const prettierConfig = { - ...basePrettierConfig, + arrowParens: 'always', + bracketSameLine: false, + bracketSpacing: false, + endOfLine: 'lf', + htmlWhitespaceSensitivity: 'ignore', + jsonRecursiveSort: true, + multilineArraysWrapThreshold: 1, + pluginSearchDirs: false, + printWidth: 100, + singleQuote: true, + tabWidth: 4, + trailingComma: 'all', + plugins: [ + 'prettier-plugin-toml', + 'prettier-plugin-packagejson', + 'prettier-plugin-multiline-arrays', + 'prettier-plugin-organize-imports', + 'prettier-plugin-jsdoc', +] }; module.exports = prettierConfig; diff --git a/README.md b/README.md index 064112f..f8c9b4d 100644 --- a/README.md +++ b/README.md @@ -116,12 +116,12 @@ The precedence of forcing wrapping goes as follows: Tested to be compatible with the following plugins. It is likely compatible with many others as well. This plugin must be placed in the order specified below. 1. `prettier-plugin-toml` -2. `prettier-plugin-sort-json` +2. `prettier-plugin-sort-json` (needs to be updated to v3) 3. `prettier-plugin-packagejson` 4. this plugin must be placed here 5. `prettier-plugin-organize-imports` 6. `prettier-plugin-jsdoc` -7. `prettier-plugin-interpolated-html-tags` +7. `prettier-plugin-interpolated-html-tags` (needs to be updated to v3) ## Dev diff --git a/package-lock.json b/package-lock.json index 2dc91e9..075123c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "2.0.0", "license": "(MIT or CC0 1.0)", "dependencies": { - "@augment-vir/common": "^15.3.0", + "@augment-vir/common": "^15.5.0", "proxy-vir": "^0.0.1" }, "devDependencies": { - "@augment-vir/chai": "^15.3.0", + "@augment-vir/chai": "^15.5.0", "@electrovir/nyc": "^15.1.0-fix0", "@istanbuljs/nyc-config-typescript": "^1.0.2", "@types/chai": "^4.3.5", @@ -23,24 +23,22 @@ "chai": "^4.3.7", "cross-env": "^7.0.3", "cspell": "^6.31.2", - "esbuild": "^0.18.13", + "esbuild": "^0.18.16", "istanbul-smart-text-reporter": "^1.1.2", "markdown-code-example-inserter": "^0.3.1", "mocha": "^10.2.0", "mocha-spec-reporter-with-file-names": "^0.0.3", "npm-check-updates": "^16.10.16", "prettier": "^3.0.0", - "prettier-plugin-interpolated-html-tags": "^0.0.4", - "prettier-plugin-jsdoc": "^0.4.2", + "prettier-plugin-jsdoc": "^1.0.1", "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-imports": "^3.2.3", "prettier-plugin-packagejson": "^2.4.5", - "prettier-plugin-sort-json": "^1.0.0", "prettier-plugin-toml": "^0.3.1", "test-as-package": "^0.0.4", "ts-node": "^10.9.1", "typescript": "5.1.6", - "virmator": "^7.2.1" + "virmator": "^7.2.5" } }, "node_modules/@ampproject/remapping": { @@ -57,31 +55,31 @@ } }, "node_modules/@augment-vir/chai": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/@augment-vir/chai/-/chai-15.3.0.tgz", - "integrity": "sha512-DnSY8R8JkQ+C+zfupNnn8W+p6d5ttcmA8uBXlg/k4kxICmt+wcCdWUCUZVmRuaROebQDBVN930t8IDbmLfdFQg==", + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/@augment-vir/chai/-/chai-15.5.0.tgz", + "integrity": "sha512-WI/edLvLcsqtAT3bFr6od9T3KDI00xKZFbLG4SaeqfaJSwUlCF/7hYYRFPBaHK+ydvyqFvxbsaNNJ2QEqJ0P3A==", "dev": true, "dependencies": { - "@augment-vir/common": "^15.3.0", - "@augment-vir/testing": "^15.3.0", - "type-fest": "^3.12.0" + "@augment-vir/common": "^15.5.0", + "@augment-vir/testing": "^15.5.0", + "type-fest": "^4.0.0" } }, "node_modules/@augment-vir/common": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-15.3.0.tgz", - "integrity": "sha512-V9ksJcSw3Ikxw9QaoWbyKYYS/s9ysc6xwq7Xms7fui6oWaCt7+SMv9B1K5Qot+tuM0+LK0/vtD8Ms+/rCnlYqQ==", + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-15.5.0.tgz", + "integrity": "sha512-4niDg+qKlyC9xjHyFz+BgsnfLR6pSWZ3Z82yayyrpkKCLLh0Bgp9XJfNd0AEfUxGltBKrt5YuoEtt2ux0woOiA==", "dependencies": { - "type-fest": "^3.12.0" + "type-fest": "^4.0.0" } }, "node_modules/@augment-vir/node-js": { - "version": "14.3.0", - "resolved": "https://registry.npmjs.org/@augment-vir/node-js/-/node-js-14.3.0.tgz", - "integrity": "sha512-Ym38XuOxq6bFgU01PQiJLnz1+yEWIDbHDTInf48V6rF+CEk6cdXoOefVzDOZY6ya9Xrj1CWiATq4SIwFF/FMgA==", + "version": "14.4.0", + "resolved": "https://registry.npmjs.org/@augment-vir/node-js/-/node-js-14.4.0.tgz", + "integrity": "sha512-eCMZd5dXLErx36PxGr8OjFPYhxQSr6O9lHLFy1mTiJcd/nrubgxZrzfgI0a8NZVYU7KD9xaJFG8uv3xDWpF2kQ==", "dev": true, "dependencies": { - "@augment-vir/common": "^14.3.0", + "@augment-vir/common": "^14.4.0", "ansi-colors": "^4.1.3", "axios": "^1.4.0", "fs-extra": "^11.1.1", @@ -98,15 +96,27 @@ "type-fest": "^3.11.1" } }, + "node_modules/@augment-vir/node-js/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@augment-vir/testing": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/@augment-vir/testing/-/testing-15.3.0.tgz", - "integrity": "sha512-jossTAsT5SO7uoLmMQKPtivP7PIvhrCHC+PYc3PLKOcelNg/sIYNOQW3sVW6aSH6200mCl0wifxfe7ZhL/TqRw==", + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/@augment-vir/testing/-/testing-15.5.0.tgz", + "integrity": "sha512-sIw71hgncE4clDOtf8EyvY5qHrDpLTwShXai0GXpi2p73bOoCdRNoW62UspuvdwwV0eaMEfWaZ5Y1oVI6nh0zw==", "dev": true, "dependencies": { - "@augment-vir/common": "^15.3.0", + "@augment-vir/common": "^15.5.0", "expect-type": "^0.15.0", - "type-fest": "^3.12.0" + "type-fest": "^4.0.0" } }, "node_modules/@babel/code-frame": { @@ -122,35 +132,35 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.5.tgz", - "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", + "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.5.tgz", - "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", + "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.5", - "@babel/helper-module-transforms": "^7.22.5", - "@babel/helpers": "^7.22.5", - "@babel/parser": "^7.22.5", + "@babel/generator": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-module-transforms": "^7.22.9", + "@babel/helpers": "^7.22.6", + "@babel/parser": "^7.22.7", "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", + "@babel/traverse": "^7.22.8", "@babel/types": "^7.22.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.2", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -161,9 +171,9 @@ } }, "node_modules/@babel/generator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.5.tgz", - "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", + "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", "dev": true, "dependencies": { "@babel/types": "^7.22.5", @@ -176,16 +186,16 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz", - "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", + "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.5", + "@babel/compat-data": "^7.22.9", "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.3", + "browserslist": "^4.21.9", "lru-cache": "^5.1.1", - "semver": "^6.3.0" + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -241,22 +251,22 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz", - "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==", + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", + "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-module-imports": "^7.22.5", "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.5" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-simple-access": { @@ -272,9 +282,9 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz", - "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, "dependencies": { "@babel/types": "^7.22.5" @@ -311,13 +321,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.5.tgz", - "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", + "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", "dev": true, "dependencies": { "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.5", + "@babel/traverse": "^7.22.6", "@babel/types": "^7.22.5" }, "engines": { @@ -410,9 +420,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz", - "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==", + "version": "7.22.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", + "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -422,9 +432,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz", - "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==", + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.6.tgz", + "integrity": "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==", "dev": true, "dependencies": { "regenerator-runtime": "^0.13.11" @@ -448,18 +458,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz", - "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==", + "version": "7.22.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", + "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", "dev": true, "dependencies": { "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.5", + "@babel/generator": "^7.22.7", "@babel/helper-environment-visitor": "^7.22.5", "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.5", - "@babel/parser": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.22.7", "@babel/types": "^7.22.5", "debug": "^4.1.0", "globals": "^11.1.0" @@ -577,9 +587,9 @@ } }, "node_modules/@cspell/dict-ada": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.0.1.tgz", - "integrity": "sha512-/E9o3nHrXOhYmQE43deKbxZcR3MIJAsa+66IzP9TXGHheKEx8b9dVMVVqydDDH8oom1H0U20NRPtu6KRVbT9xw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-4.0.2.tgz", + "integrity": "sha512-0kENOWQeHjUlfyId/aCM/mKXtkEgV0Zu2RhUXCBr4hHo9F9vph+Uu8Ww2b0i5a4ZixoIkudGA+eJvyxrG1jUpA==", "dev": true }, "node_modules/@cspell/dict-aws": { @@ -601,9 +611,9 @@ "dev": true }, "node_modules/@cspell/dict-cpp": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.0.3.tgz", - "integrity": "sha512-7sx/RFsf0hB3q8chx8OHYl9Kd+g0pqA1laphwaAQ+/jPwoAreYT3kNQWbJ3bIt/rMoORetFSQxckSbaJXwwqpw==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.0.4.tgz", + "integrity": "sha512-Vmz/CCb2d91ES5juaO8+CFWeTa2AFsbpR8bkCPJq+P8cRP16+37tY0zNXEBSK/1ur4MakaRf76jeQBijpZxw0Q==", "dev": true }, "node_modules/@cspell/dict-cryptocurrencies": { @@ -625,15 +635,15 @@ "dev": true }, "node_modules/@cspell/dict-dart": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.2.tgz", - "integrity": "sha512-jigcODm7Z4IFZ4vParwwP3IT0fIgRq/9VoxkXfrxBMsLBGGM2QltHBj7pl+joX+c4cOHxfyZktGJK1B1wFtR4Q==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-dart/-/dict-dart-2.0.3.tgz", + "integrity": "sha512-cLkwo1KT5CJY5N5RJVHks2genFkNCl/WLfj+0fFjqNR+tk3tBI1LY7ldr9piCtSFSm4x9pO1x6IV3kRUY1lLiw==", "dev": true }, "node_modules/@cspell/dict-data-science": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-1.0.7.tgz", - "integrity": "sha512-Q9VUFaarUpqM6CAmR8peP4o9alk0XQ4rgVoE2R2XalpC2cqPI8Hmg6QwMU2UPioSUcWMJCqLc/KzJti0gBMuxA==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@cspell/dict-data-science/-/dict-data-science-1.0.8.tgz", + "integrity": "sha512-uGx0rd3BftfZ5mvXtPxvLNkQ33y0ylNw4GpBAAfF3hgGtifKdvLSmphOGuNgDYUPpJ0+e025bsvtN0/ZZCzWTg==", "dev": true }, "node_modules/@cspell/dict-django": { @@ -643,9 +653,9 @@ "dev": true }, "node_modules/@cspell/dict-docker": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.6.tgz", - "integrity": "sha512-zCCiRTZ6EOQpBnSOm0/3rnKW1kCcAUDUA7SxJG3SuH6iZvKi3I8FEg8+O83WQUeXg0SyPNerD9F40JLnnJjJig==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@cspell/dict-docker/-/dict-docker-1.1.7.tgz", + "integrity": "sha512-XlXHAr822euV36GGsl2J1CkBIVg3fZ6879ZOg5dxTIssuhUOCiV2BuzKZmt6aIFmcdPmR14+9i9Xq+3zuxeX0A==", "dev": true }, "node_modules/@cspell/dict-dotnet": { @@ -661,9 +671,9 @@ "dev": true }, "node_modules/@cspell/dict-en_us": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.4.tgz", - "integrity": "sha512-mR2yqWmFip1zTKja2SqyVMbzuqEThqkEJk9M32bMDziPJpEyOIPvLA0UPmj3cyRKJkRuVF0bhDCE33O+at38hw==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.6.tgz", + "integrity": "sha512-odhgsjNZI9BtEOJdvqfAuv/3yz5aB1ngfBNaph7WSnYVt//9e3fhrElZ6/pIIkoyuGgeQPwz1fXt+tMgcnLSEQ==", "dev": true }, "node_modules/@cspell/dict-en-common-misspellings": { @@ -787,15 +797,15 @@ "dev": true }, "node_modules/@cspell/dict-public-licenses": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.2.tgz", - "integrity": "sha512-baKkbs/WGEV2lCWZoL0KBPh3uiPcul5GSDwmXEBAsR5McEW52LF94/b7xWM0EmSAc/y8ODc5LnPYC7RDRLi6LQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.3.tgz", + "integrity": "sha512-JSLEdpEYufQ1H+93UHi+axlqQm1fhgK6kpdLHp6uPHu//CsvETcqNVawjB+qOdI/g38JTMw5fBqSd0aGNxa6Dw==", "dev": true }, "node_modules/@cspell/dict-python": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.2.tgz", - "integrity": "sha512-Whcn4K8R0Ux/hcx/P9Fbx6i29GwTaXgT3LTt95AuCnV5RRLrzsqoyZkz851hcg5z4kjUQVMduDl3HECGgW/FNw==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.1.4.tgz", + "integrity": "sha512-4JJ6MjIyuZN4h2VkSxZxiQ55lVh6NccW/0H6rdu0aDz+E3uyFVFtlBp5kTY5jIA11PZqSZZpyowzGnwrJX6w0g==", "dev": true, "dependencies": { "@cspell/dict-data-science": "^1.0.0" @@ -832,9 +842,9 @@ "dev": true }, "node_modules/@cspell/dict-sql": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.0.tgz", - "integrity": "sha512-Bb+TNWUrTNNABO0bmfcYXiTlSt0RD6sB2MIY+rNlaMyIwug43jUjeYmkLz2tPkn3+2uvySeFEOMVYhMVfcuDKg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-2.1.1.tgz", + "integrity": "sha512-v1mswi9NF40+UDUMuI148YQPEQvWjac72P6ZsjlRdLjEiQEEMEsTQ+zlkIdnzC9QCNyJaqD5Liq9Mn78/8Zxtw==", "dev": true }, "node_modules/@cspell/dict-svelte": { @@ -947,9 +957,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.13.tgz", - "integrity": "sha512-KwqFhxRFMKZINHzCqf8eKxE0XqWlAVPRxwy6rc7CbVFxzUWB2sA/s3hbMZeemPdhN3fKBkqOaFhTbS8xJXYIWQ==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.16.tgz", + "integrity": "sha512-gCHjjQmA8L0soklKbLKA6pgsLk1byULuHe94lkZDzcO3/Ta+bbeewJioEn1Fr7kgy9NWNFy/C+MrBwC6I/WCug==", "cpu": [ "arm" ], @@ -963,9 +973,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.13.tgz", - "integrity": "sha512-j7NhycJUoUAG5kAzGf4fPWfd17N6SM3o1X6MlXVqfHvs2buFraCJzos9vbeWjLxOyBKHyPOnuCuipbhvbYtTAg==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.16.tgz", + "integrity": "sha512-wsCqSPqLz+6Ov+OM4EthU43DyYVVyfn15S4j1bJzylDpc1r1jZFFfJQNfDuT8SlgwuqpmpJXK4uPlHGw6ve7eA==", "cpu": [ "arm64" ], @@ -979,9 +989,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.13.tgz", - "integrity": "sha512-M2eZkRxR6WnWfVELHmv6MUoHbOqnzoTVSIxgtsyhm/NsgmL+uTmag/VVzdXvmahak1I6sOb1K/2movco5ikDJg==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.16.tgz", + "integrity": "sha512-ldsTXolyA3eTQ1//4DS+E15xl0H/3DTRJaRL0/0PgkqDsI0fV/FlOtD+h0u/AUJr+eOTlZv4aC9gvfppo3C4sw==", "cpu": [ "x64" ], @@ -995,9 +1005,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.13.tgz", - "integrity": "sha512-f5goG30YgR1GU+fxtaBRdSW3SBG9pZW834Mmhxa6terzcboz7P2R0k4lDxlkP7NYRIIdBbWp+VgwQbmMH4yV7w==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.16.tgz", + "integrity": "sha512-aBxruWCII+OtluORR/KvisEw0ALuw/qDQWvkoosA+c/ngC/Kwk0lLaZ+B++LLS481/VdydB2u6tYpWxUfnLAIw==", "cpu": [ "arm64" ], @@ -1011,9 +1021,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.13.tgz", - "integrity": "sha512-RIrxoKH5Eo+yE5BtaAIMZaiKutPhZjw+j0OCh8WdvKEKJQteacq0myZvBDLU+hOzQOZWJeDnuQ2xgSScKf1Ovw==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.16.tgz", + "integrity": "sha512-6w4Dbue280+rp3LnkgmriS1icOUZDyPuZo/9VsuMUTns7SYEiOaJ7Ca1cbhu9KVObAWfmdjUl4gwy9TIgiO5eA==", "cpu": [ "x64" ], @@ -1027,9 +1037,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.13.tgz", - "integrity": "sha512-AfRPhHWmj9jGyLgW/2FkYERKmYR+IjYxf2rtSLmhOrPGFh0KCETFzSjx/JX/HJnvIqHt/DRQD/KAaVsUKoI3Xg==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.16.tgz", + "integrity": "sha512-x35fCebhe9s979DGKbVAwXUOcTmCIE32AIqB9CB1GralMIvxdnMLAw5CnID17ipEw9/3MvDsusj/cspYt2ZLNQ==", "cpu": [ "arm64" ], @@ -1043,9 +1053,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.13.tgz", - "integrity": "sha512-pGzWWZJBInhIgdEwzn8VHUBang8UvFKsvjDkeJ2oyY5gZtAM6BaxK0QLCuZY+qoj/nx/lIaItH425rm/hloETA==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.16.tgz", + "integrity": "sha512-YM98f+PeNXF3GbxIJlUsj+McUWG1irguBHkszCIwfr3BXtXZsXo0vqybjUDFfu9a8Wr7uUD/YSmHib+EeGAFlg==", "cpu": [ "x64" ], @@ -1059,9 +1069,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.13.tgz", - "integrity": "sha512-4iMxLRMCxGyk7lEvkkvrxw4aJeC93YIIrfbBlUJ062kilUUnAiMb81eEkVvCVoh3ON283ans7+OQkuy1uHW+Hw==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.16.tgz", + "integrity": "sha512-b5ABb+5Ha2C9JkeZXV+b+OruR1tJ33ePmv9ZwMeETSEKlmu/WJ45XTTG+l6a2KDsQtJJ66qo/hbSGBtk0XVLHw==", "cpu": [ "arm" ], @@ -1075,9 +1085,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.13.tgz", - "integrity": "sha512-hCzZbVJEHV7QM77fHPv2qgBcWxgglGFGCxk6KfQx6PsVIdi1u09X7IvgE9QKqm38OpkzaAkPnnPqwRsltvLkIQ==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.16.tgz", + "integrity": "sha512-XIqhNUxJiuy+zsR77+H5Z2f7s4YRlriSJKtvx99nJuG5ATuJPjmZ9n0ANgnGlPCpXGSReFpgcJ7O3SMtzIFeiQ==", "cpu": [ "arm64" ], @@ -1091,9 +1101,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.13.tgz", - "integrity": "sha512-I3OKGbynl3AAIO6onXNrup/ttToE6Rv2XYfFgLK/wnr2J+1g+7k4asLrE+n7VMhaqX+BUnyWkCu27rl+62Adug==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.16.tgz", + "integrity": "sha512-no+pfEpwnRvIyH+txbBAWtjxPU9grslmTBfsmDndj7bnBmr55rOo/PfQmRfz7Qg9isswt1FP5hBbWb23fRWnow==", "cpu": [ "ia32" ], @@ -1107,9 +1117,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.13.tgz", - "integrity": "sha512-8pcKDApAsKc6WW51ZEVidSGwGbebYw2qKnO1VyD8xd6JN0RN6EUXfhXmDk9Vc4/U3Y4AoFTexQewQDJGsBXBpg==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.16.tgz", + "integrity": "sha512-Zbnczs9ZXjmo0oZSS0zbNlJbcwKXa/fcNhYQjahDs4Xg18UumpXG/lwM2lcSvHS3mTrRyCYZvJbmzYc4laRI1g==", "cpu": [ "loong64" ], @@ -1123,9 +1133,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.13.tgz", - "integrity": "sha512-6GU+J1PLiVqWx8yoCK4Z0GnfKyCGIH5L2KQipxOtbNPBs+qNDcMJr9euxnyJ6FkRPyMwaSkjejzPSISD9hb+gg==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.16.tgz", + "integrity": "sha512-YMF7hih1HVR/hQVa/ot4UVffc5ZlrzEb3k2ip0nZr1w6fnYypll9td2qcoMLvd3o8j3y6EbJM3MyIcXIVzXvQQ==", "cpu": [ "mips64el" ], @@ -1139,9 +1149,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.13.tgz", - "integrity": "sha512-pfn/OGZ8tyR8YCV7MlLl5hAit2cmS+j/ZZg9DdH0uxdCoJpV7+5DbuXrR+es4ayRVKIcfS9TTMCs60vqQDmh+w==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.16.tgz", + "integrity": "sha512-Wkz++LZ29lDwUyTSEnzDaaP5OveOgTU69q9IyIw9WqLRxM4BjTBjz9un4G6TOvehWpf/J3gYVFN96TjGHrbcNQ==", "cpu": [ "ppc64" ], @@ -1155,9 +1165,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.13.tgz", - "integrity": "sha512-aIbhU3LPg0lOSCfVeGHbmGYIqOtW6+yzO+Nfv57YblEK01oj0mFMtvDJlOaeAZ6z0FZ9D13oahi5aIl9JFphGg==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.16.tgz", + "integrity": "sha512-LFMKZ30tk78/mUv1ygvIP+568bwf4oN6reG/uczXnz6SvFn4e2QUFpUpZY9iSJT6Qpgstrhef/nMykIXZtZWGQ==", "cpu": [ "riscv64" ], @@ -1171,9 +1181,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.13.tgz", - "integrity": "sha512-Pct1QwF2sp+5LVi4Iu5Y+6JsGaV2Z2vm4O9Dd7XZ5tKYxEHjFtb140fiMcl5HM1iuv6xXO8O1Vrb1iJxHlv8UA==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.16.tgz", + "integrity": "sha512-3ZC0BgyYHYKfZo3AV2/66TD/I9tlSBaW7eWTEIkrQQKfJIifKMMttXl9FrAg+UT0SGYsCRLI35Gwdmm96vlOjg==", "cpu": [ "s390x" ], @@ -1187,9 +1197,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.13.tgz", - "integrity": "sha512-zTrIP0KzYP7O0+3ZnmzvUKgGtUvf4+piY8PIO3V8/GfmVd3ZyHJGz7Ht0np3P1wz+I8qJ4rjwJKqqEAbIEPngA==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.16.tgz", + "integrity": "sha512-xu86B3647DihHJHv/wx3NCz2Dg1gjQ8bbf9cVYZzWKY+gsvxYmn/lnVlqDRazObc3UMwoHpUhNYaZset4X8IPA==", "cpu": [ "x64" ], @@ -1203,9 +1213,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.13.tgz", - "integrity": "sha512-I6zs10TZeaHDYoGxENuksxE1sxqZpCp+agYeW039yqFwh3MgVvdmXL5NMveImOC6AtpLvE4xG5ujVic4NWFIDQ==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.16.tgz", + "integrity": "sha512-uVAgpimx9Ffw3xowtg/7qQPwHFx94yCje+DoBx+LNm2ePDpQXHrzE+Sb0Si2VBObYz+LcRps15cq+95YM7gkUw==", "cpu": [ "x64" ], @@ -1219,9 +1229,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.13.tgz", - "integrity": "sha512-W5C5nczhrt1y1xPG5bV+0M12p2vetOGlvs43LH8SopQ3z2AseIROu09VgRqydx5qFN7y9qCbpgHLx0kb0TcW7g==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.16.tgz", + "integrity": "sha512-6OjCQM9wf7z8/MBi6BOWaTL2AS/SZudsZtBziXMtNI8r/U41AxS9x7jn0ATOwVy08OotwkPqGRMkpPR2wcTJXA==", "cpu": [ "x64" ], @@ -1235,9 +1245,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.13.tgz", - "integrity": "sha512-X/xzuw4Hzpo/yq3YsfBbIsipNgmsm8mE/QeWbdGdTTeZ77fjxI2K0KP3AlhZ6gU3zKTw1bKoZTuKLnqcJ537qw==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.16.tgz", + "integrity": "sha512-ZoNkruFYJp9d1LbUYCh8awgQDvB9uOMZqlQ+gGEZR7v6C+N6u7vPr86c+Chih8niBR81Q/bHOSKGBK3brJyvkQ==", "cpu": [ "x64" ], @@ -1251,9 +1261,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.13.tgz", - "integrity": "sha512-4CGYdRQT/ILd+yLLE5i4VApMPfGE0RPc/wFQhlluDQCK09+b4JDbxzzjpgQqTPrdnP7r5KUtGVGZYclYiPuHrw==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.16.tgz", + "integrity": "sha512-+j4anzQ9hrs+iqO+/wa8UE6TVkKua1pXUb0XWFOx0FiAj6R9INJ+WE//1/Xo6FG1vB5EpH3ko+XcgwiDXTxcdw==", "cpu": [ "arm64" ], @@ -1267,9 +1277,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.13.tgz", - "integrity": "sha512-D+wKZaRhQI+MUGMH+DbEr4owC2D7XnF+uyGiZk38QbgzLcofFqIOwFs7ELmIeU45CQgfHNy9Q+LKW3cE8g37Kg==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.16.tgz", + "integrity": "sha512-5PFPmq3sSKTp9cT9dzvI67WNfRZGvEVctcZa1KGjDDu4n3H8k59Inbk0du1fz0KrAbKKNpJbdFXQMDUz7BG4rQ==", "cpu": [ "ia32" ], @@ -1283,9 +1293,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.13.tgz", - "integrity": "sha512-iVl6lehAfJS+VmpF3exKpNQ8b0eucf5VWfzR8S7xFve64NBNz2jPUgx1X93/kfnkfgP737O+i1k54SVQS7uVZA==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.16.tgz", + "integrity": "sha512-sCIVrrtcWN5Ua7jYXNG1xD199IalrbfV2+0k/2Zf2OyV2FtnQnMgdzgpRAbi4AWlKJj1jkX+M+fEGPQj6BQB4w==", "cpu": [ "x64" ], @@ -1658,17 +1668,17 @@ } }, "node_modules/@pkgr/utils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.1.tgz", - "integrity": "sha512-JOqwkgFEyi+OROIyq7l4Jy28h/WwhDnG/cPkXG2Z1iFbubB6jsHW1NDvmyOzTBxHr3yg68YGirmh1JUgMqa+9w==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", + "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", - "fast-glob": "^3.2.12", + "fast-glob": "^3.3.0", "is-glob": "^4.0.3", "open": "^9.1.0", "picocolors": "^1.0.0", - "tslib": "^2.5.0" + "tslib": "^2.6.0" }, "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" @@ -1705,9 +1715,9 @@ "dev": true }, "node_modules/@pnpm/npm-conf": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.0.tgz", - "integrity": "sha512-roLI1ul/GwzwcfcVpZYPdrgW2W/drLriObl1h+yLF5syc8/5ULWw2ALbCHUWF+4YltIqA3xFSbG4IwyJz37e9g==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.2.tgz", + "integrity": "sha512-UA91GwWPhFExt3IizW6bOeY/pQ0BkuNwKjk9iQW9KqxluGCrg4VenZ0/L+2Y0+ZOtme72EVvg6v0zo3AMQRCeA==", "dev": true, "dependencies": { "@pnpm/config.env-replace": "^1.1.0", @@ -1718,22 +1728,34 @@ "node": ">=12" } }, + "node_modules/@sigstore/bundle": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.0.0.tgz", + "integrity": "sha512-yLvrWDOh6uMOUlFCTJIZEnwOT9Xte7NPXUqVexEKGSF5XtBAuSg5du0kn3dRR0p47a4ah10Y0mNt8+uyeQXrBQ==", + "dev": true, + "dependencies": { + "@sigstore/protobuf-specs": "^0.2.0" + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + } + }, "node_modules/@sigstore/protobuf-specs": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz", - "integrity": "sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.0.tgz", + "integrity": "sha512-8ZhZKAVfXjIspDWwm3D3Kvj0ddbJ0HqDZ/pOs5cx88HpT8mVsotFrg7H1UMnXOuDHz6Zykwxn4mxG3QLuN+RUg==", "dev": true, "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@sigstore/tuf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.2.tgz", - "integrity": "sha512-vjwcYePJzM01Ha6oWWZ9gNcdIgnzyFxfqfWzph483DPJTH8Tb7f7bQRRll3CYVkyH56j0AgcPAcl6Vg95DPF+Q==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz", + "integrity": "sha512-2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==", "dev": true, "dependencies": { - "@sigstore/protobuf-specs": "^0.1.0", + "@sigstore/protobuf-specs": "^0.2.0", "tuf-js": "^1.1.7" }, "engines": { @@ -1741,9 +1763,9 @@ } }, "node_modules/@sindresorhus/is": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.4.1.tgz", - "integrity": "sha512-axlrvsHlHlFmKKMEg4VyvMzFr93JWJj4eIfXY1STVuO2fsImCa7ncaiG5gC8HKOX590AW5RtRsC41/B+OfrSqw==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-5.6.0.tgz", + "integrity": "sha512-TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g==", "dev": true, "engines": { "node": ">=14.16" @@ -1903,12 +1925,12 @@ } }, "node_modules/@types/hast": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz", - "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==", + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.5.tgz", + "integrity": "sha512-SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg==", "dev": true, "dependencies": { - "@types/unist": "*" + "@types/unist": "^2" } }, "node_modules/@types/http-cache-semantics": { @@ -1918,12 +1940,12 @@ "dev": true }, "node_modules/@types/mdast": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.11.tgz", - "integrity": "sha512-Y/uImid8aAwrEA24/1tcRZwpxX3pIFTSilcNDKSPn+Y2iDywSEachzRuvgAYYLR3wpGXAsMbv5lvKLDZLeYPAw==", + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz", + "integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==", "dev": true, "dependencies": { - "@types/unist": "*" + "@types/unist": "^2" } }, "node_modules/@types/minimatch": { @@ -1945,9 +1967,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.3.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.0.tgz", - "integrity": "sha512-cumHmIAf6On83X7yP+LrsEyUOf/YlociZelmpRYaGFydoaPdxdt80MAbu6vWerQT2COCp2nPvHdsbD7tHn/YlQ==", + "version": "20.4.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.4.tgz", + "integrity": "sha512-CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew==", "dev": true }, "node_modules/@types/parse5": { @@ -1963,9 +1985,9 @@ "dev": true }, "node_modules/@types/unist": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", - "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz", + "integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==", "dev": true }, "node_modules/abbrev": { @@ -1975,9 +1997,9 @@ "dev": true }, "node_modules/acorn": { - "version": "8.8.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", - "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -2223,9 +2245,9 @@ "dev": true }, "node_modules/boxen": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.0.tgz", - "integrity": "sha512-ScG8CDo8dj7McqCZ5hz4dIBp20xj4unQ2lXIDa7ff6RcZElCpuNzutdwzKVvRikfNjm7CFAlR3HJHcoHkDOExQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-7.1.1.tgz", + "integrity": "sha512-2hCgjEmP8YLWQ130n2FerGv7rYpfBmnmp9Uy2Le1vge6X3gZIfSmEzP5QTDElFxcvVcXlEn8Aq6MU/PZygIOog==", "dev": true, "dependencies": { "ansi-align": "^3.0.1", @@ -2269,9 +2291,9 @@ } }, "node_modules/boxen/node_modules/chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -2371,9 +2393,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.21.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.7.tgz", - "integrity": "sha512-BauCXrQ7I2ftSqd2mvKHGo85XR0u7Ru3C/Hxsy/0TkfCtjrmAbPdzLGasmoiBxplpDXlPvdjX9u7srIMfgasNA==", + "version": "4.21.9", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz", + "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==", "dev": true, "funding": [ { @@ -2390,8 +2412,8 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001489", - "electron-to-chromium": "^1.4.411", + "caniuse-lite": "^1.0.30001503", + "electron-to-chromium": "^1.4.431", "node-releases": "^2.0.12", "update-browserslist-db": "^1.0.11" }, @@ -2563,9 +2585,9 @@ } }, "node_modules/cacheable-request": { - "version": "10.2.10", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.10.tgz", - "integrity": "sha512-v6WB+Epm/qO4Hdlio/sfUn69r5Shgh39SsE9DSd4bIezP0mblOlObI+I0kUEM7J0JFc+I7pSeMeYaOYtX1N/VQ==", + "version": "10.2.12", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-10.2.12.tgz", + "integrity": "sha512-qtWGB5kn2OLjx47pYUkWicyOpK1vy9XZhq8yRTXOy+KAmjjESSRLx6SiExnnaGGUP1NM6/vmygMu0fGylNh9tw==", "dev": true, "dependencies": { "@types/http-cache-semantics": "^4.0.1", @@ -2614,9 +2636,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001499", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001499.tgz", - "integrity": "sha512-IhoQqRrW6WiecFcfZgoJS1YLEN1/HR1vHP5WNgjCARRW7KUNToHHTX3FrwCM+y4zkRa48D9rE90WFYc2IWhDWQ==", + "version": "1.0.30001517", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz", + "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==", "dev": true, "funding": [ { @@ -3721,9 +3743,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.427", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.427.tgz", - "integrity": "sha512-HK3r9l+Jm8dYAm1ctXEWIC+hV60zfcjS9UA5BDlYvnI5S7PU/yytjpvSrTNrSSRRkuu3tDyZhdkwIczh+0DWaw==", + "version": "1.4.468", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.468.tgz", + "integrity": "sha512-6M1qyhaJOt7rQtNti1lBA0GwclPH+oKCmsra/hkcWs5INLxfXXD/dtdnaKUYQu/pjOBP/8Osoe4mAcNvvzoFag==", "dev": true }, "node_modules/emoji-regex": { @@ -3773,9 +3795,9 @@ "dev": true }, "node_modules/esbuild": { - "version": "0.18.13", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.13.tgz", - "integrity": "sha512-vhg/WR/Oiu4oUIkVhmfcc23G6/zWuEQKFS+yiosSHe4aN6+DQRXIfeloYGibIfVhkr4wyfuVsGNLr+sQU1rWWw==", + "version": "0.18.16", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.16.tgz", + "integrity": "sha512-1xLsOXrDqwdHxyXb/x/SOyg59jpf/SH7YMvU5RNSU7z3TInaASNJWNFJ6iRvLvLETZMasF3d1DdZLg7sgRimRQ==", "dev": true, "hasInstallScript": true, "bin": { @@ -3785,28 +3807,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.13", - "@esbuild/android-arm64": "0.18.13", - "@esbuild/android-x64": "0.18.13", - "@esbuild/darwin-arm64": "0.18.13", - "@esbuild/darwin-x64": "0.18.13", - "@esbuild/freebsd-arm64": "0.18.13", - "@esbuild/freebsd-x64": "0.18.13", - "@esbuild/linux-arm": "0.18.13", - "@esbuild/linux-arm64": "0.18.13", - "@esbuild/linux-ia32": "0.18.13", - "@esbuild/linux-loong64": "0.18.13", - "@esbuild/linux-mips64el": "0.18.13", - "@esbuild/linux-ppc64": "0.18.13", - "@esbuild/linux-riscv64": "0.18.13", - "@esbuild/linux-s390x": "0.18.13", - "@esbuild/linux-x64": "0.18.13", - "@esbuild/netbsd-x64": "0.18.13", - "@esbuild/openbsd-x64": "0.18.13", - "@esbuild/sunos-x64": "0.18.13", - "@esbuild/win32-arm64": "0.18.13", - "@esbuild/win32-ia32": "0.18.13", - "@esbuild/win32-x64": "0.18.13" + "@esbuild/android-arm": "0.18.16", + "@esbuild/android-arm64": "0.18.16", + "@esbuild/android-x64": "0.18.16", + "@esbuild/darwin-arm64": "0.18.16", + "@esbuild/darwin-x64": "0.18.16", + "@esbuild/freebsd-arm64": "0.18.16", + "@esbuild/freebsd-x64": "0.18.16", + "@esbuild/linux-arm": "0.18.16", + "@esbuild/linux-arm64": "0.18.16", + "@esbuild/linux-ia32": "0.18.16", + "@esbuild/linux-loong64": "0.18.16", + "@esbuild/linux-mips64el": "0.18.16", + "@esbuild/linux-ppc64": "0.18.16", + "@esbuild/linux-riscv64": "0.18.16", + "@esbuild/linux-s390x": "0.18.16", + "@esbuild/linux-x64": "0.18.16", + "@esbuild/netbsd-x64": "0.18.16", + "@esbuild/openbsd-x64": "0.18.16", + "@esbuild/sunos-x64": "0.18.16", + "@esbuild/win32-arm64": "0.18.16", + "@esbuild/win32-ia32": "0.18.16", + "@esbuild/win32-x64": "0.18.16" } }, "node_modules/escalade": { @@ -3915,9 +3937,9 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.0.tgz", - "integrity": "sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", + "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -4347,9 +4369,9 @@ } }, "node_modules/got": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.0.tgz", - "integrity": "sha512-WTcaQ963xV97MN3x0/CbAriXFZcXCfgxVp91I+Ze6pawQOa7SgzwSx2zIJJsX+kTajMnVs0xcFD1TxZKFqhdnQ==", + "version": "12.6.1", + "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", + "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", "dev": true, "dependencies": { "@sindresorhus/is": "^5.2.0", @@ -5221,6 +5243,18 @@ "type-fest": "^3.11.1" } }, + "node_modules/istanbul-smart-text-reporter/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/jackspeak": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz", @@ -5337,9 +5371,9 @@ ] }, "node_modules/keyv": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz", - "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", + "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", "dev": true, "dependencies": { "json-buffer": "3.0.1" @@ -5599,6 +5633,18 @@ "node": ">=10" } }, + "node_modules/markdown-code-example-inserter/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/markdown-code-example-inserter/node_modules/typescript": { "version": "5.0.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz", @@ -6810,9 +6856,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.12", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.12.tgz", - "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==", + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", "dev": true }, "node_modules/nopt": { @@ -7004,16 +7050,16 @@ } }, "node_modules/npm-check-updates/node_modules/glob": { - "version": "10.2.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.7.tgz", - "integrity": "sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA==", + "version": "10.3.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz", + "integrity": "sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^2.0.3", "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2", - "path-scurry": "^1.7.0" + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" }, "bin": { "glob": "dist/cjs/src/bin.js" @@ -7067,15 +7113,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/npm-check-updates/node_modules/minipass": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", - "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/npm-check-updates/node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -7464,9 +7501,9 @@ } }, "node_modules/package-json": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.0.tgz", - "integrity": "sha512-hySwcV8RAWeAfPsXb9/HGSPn8lwDnv6fabH+obUZKX169QknRkRhPxd1yMubpKDskLFATkl3jHpNtVtDPFA0Wg==", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-8.1.1.tgz", + "integrity": "sha512-cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==", "dev": true, "dependencies": { "got": "^12.1.0", @@ -7633,23 +7670,14 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "9.1.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-9.1.2.tgz", - "integrity": "sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.0.tgz", + "integrity": "sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw==", "dev": true, "engines": { "node": "14 || >=16.14" } }, - "node_modules/path-scurry/node_modules/minipass": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", - "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -7713,32 +7741,10 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/prettier-plugin-interpolated-html-tags": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/prettier-plugin-interpolated-html-tags/-/prettier-plugin-interpolated-html-tags-0.0.4.tgz", - "integrity": "sha512-pVCqTfFfND4M/VZ7o9KMY5IYi/y/7cj4Ua4bIDGOLAcDwcZGypqa+GWRNTLl0dj3e2QqSyyQxQCZgS8csFN8Ow==", - "dev": true, - "dependencies": { - "@augment-vir/common": "^14.2.0", - "@augment-vir/node-js": "^14.2.0" - }, - "bin": { - "prettier-plugin-interpolated-html-tags": "dist/index.js" - } - }, - "node_modules/prettier-plugin-interpolated-html-tags/node_modules/@augment-vir/common": { - "version": "14.4.0", - "resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-14.4.0.tgz", - "integrity": "sha512-zmzHCl/CaRIT3WA/LbDOdla+Wy9mrU/yHOf+eUZgydn+VZ2AKLMK5UMRmeIYae60xas7U+h9Snn8wPNkG3kt9w==", - "dev": true, - "dependencies": { - "type-fest": "^3.11.1" - } - }, "node_modules/prettier-plugin-jsdoc": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/prettier-plugin-jsdoc/-/prettier-plugin-jsdoc-0.4.2.tgz", - "integrity": "sha512-w2jnAQm3z0GAG0bhzVJeehzDtrhGMSxJjit5ApCc2oxWfc7+jmLAkbtdOXaSpfwZz3IWkk+PiQPeRrLNpbM+Mw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prettier-plugin-jsdoc/-/prettier-plugin-jsdoc-1.0.1.tgz", + "integrity": "sha512-07q74MfX9m+xHK2+Lr4c+igiEzAKVDWhqkvlm65WoYJUlRiaV6STXcEtcZMhrPPYgNeQRgb9FJmgE/n+OI4MpQ==", "dev": true, "dependencies": { "binary-searching": "^2.0.5", @@ -7746,28 +7752,20 @@ "mdast-util-from-markdown": "^1.2.0" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.13.1 || >=16.0.0" }, "peerDependencies": { - "prettier": ">=2.1.2" + "prettier": "^3.0.0" } }, "node_modules/prettier-plugin-multiline-arrays": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/prettier-plugin-multiline-arrays/-/prettier-plugin-multiline-arrays-1.1.4.tgz", - "integrity": "sha512-c47t/UxtQQ0sHps5gvBj7HAY4S1h867ziL2UxQN+aqcZH+S7daZMj0FcEHD8PYyJn8M3916cGkJuJdc6X6YlJA==", - "dev": true, - "dependencies": { - "@augment-vir/common": "^14.2.0" - } - }, - "node_modules/prettier-plugin-multiline-arrays/node_modules/@augment-vir/common": { - "version": "14.4.0", - "resolved": "https://registry.npmjs.org/@augment-vir/common/-/common-14.4.0.tgz", - "integrity": "sha512-zmzHCl/CaRIT3WA/LbDOdla+Wy9mrU/yHOf+eUZgydn+VZ2AKLMK5UMRmeIYae60xas7U+h9Snn8wPNkG3kt9w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-multiline-arrays/-/prettier-plugin-multiline-arrays-2.0.0.tgz", + "integrity": "sha512-EFdtxNqEKSehtSZN2rHUtsA7dqV6fu1iJ4WU8fgR23Scfcf6mcVb3leOWmAkhhHEpwsNKPdSNN9pBX8Xx8AsCg==", "dev": true, "dependencies": { - "type-fest": "^3.11.1" + "@augment-vir/common": "^15.3.0", + "proxy-vir": "^0.0.1" } }, "node_modules/prettier-plugin-organize-imports": { @@ -7808,21 +7806,6 @@ } } }, - "node_modules/prettier-plugin-sort-json": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-sort-json/-/prettier-plugin-sort-json-1.0.0.tgz", - "integrity": "sha512-XgcaF/Sojax1vD6j53wNIByx0rp7ecang+A8W0eM+Ks3yBFu/qXjJNvUtC1lEWeYbNfmRs/d8FyYJCYozAVENw==", - "dev": true, - "dependencies": { - "@types/prettier": "^2.7.2" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "prettier": "^2.3.2" - } - }, "node_modules/prettier-plugin-toml": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/prettier-plugin-toml/-/prettier-plugin-toml-0.3.1.tgz", @@ -7948,6 +7931,17 @@ "type-fest": "^3.8.0" } }, + "node_modules/proxy-vir/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/pupa": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz", @@ -8643,9 +8637,9 @@ "optional": true }, "node_modules/semver": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", - "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -8748,13 +8742,14 @@ "dev": true }, "node_modules/sigstore": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.7.0.tgz", - "integrity": "sha512-KP7QULhWdlu3hlp+jw2EvgWKlOGOY9McLj/jrchLjHNlNPK0KWIwF919cbmOp6QiKXLmPijR2qH/5KYWlbtG9Q==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-1.8.0.tgz", + "integrity": "sha512-ogU8qtQ3VFBawRJ8wjsBEX/vIFeHuGs1fm4jZtjWQwjo8pfAt7T/rh+udlAN4+QUe0IzA8qRSc/YZ7dHP6kh+w==", "dev": true, "dependencies": { - "@sigstore/protobuf-specs": "^0.1.0", - "@sigstore/tuf": "^1.0.1", + "@sigstore/bundle": "^1.0.0", + "@sigstore/protobuf-specs": "^0.2.0", + "@sigstore/tuf": "^1.0.3", "make-fetch-happen": "^11.0.1" }, "bin": { @@ -9222,11 +9217,23 @@ } }, "node_modules/test-as-package/node_modules/@types/node": { - "version": "18.16.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.17.tgz", - "integrity": "sha512-QAkjjRA1N7gPJeAP4WLXZtYv6+eMXFNviqktCDt4GLcmCugMr5BcRHfkOjCQzvCsnMp+L79a54zBkbw356xv9Q==", + "version": "18.17.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.0.tgz", + "integrity": "sha512-GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg==", "dev": true }, + "node_modules/test-as-package/node_modules/type-fest": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/test-exclude": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", @@ -9352,9 +9359,9 @@ } }, "node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", + "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==", "dev": true }, "node_modules/tuf-js": { @@ -9381,11 +9388,11 @@ } }, "node_modules/type-fest": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.12.0.tgz", - "integrity": "sha512-qj9wWsnFvVEMUDbESiilKeXeHL7FwwiFcogfhfyjmvT968RXSvnl23f1JOClTHYItsi7o501C/7qVllscUP3oA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.0.0.tgz", + "integrity": "sha512-d/oYtUnPM9zar2fqqGLYPzgcY0qUlYK0evgNVti93xpzfjGkMgZHu9Lvgrkn0rqGXTgsFRxFamzjGoD9Uo+dgw==", "engines": { - "node": ">=14.16" + "node": ">=16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -9635,9 +9642,9 @@ } }, "node_modules/update-notifier/node_modules/chalk": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.2.0.tgz", - "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", "dev": true, "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -9862,13 +9869,13 @@ } }, "node_modules/virmator": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/virmator/-/virmator-7.2.1.tgz", - "integrity": "sha512-TSfZwq5G5+g6Od2xD+FXokQOalMgqBelnJEnEo3XgwIim4JYVFUYaAbbgmgBFQKPvl5YdnFgSWki1qblftKFpA==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/virmator/-/virmator-7.2.5.tgz", + "integrity": "sha512-F2ArCN4btw1a572y6bQ9LJbSbw+z+qzjKWjPrKLlWah+JEIzHkXrhfQdBJHxZRKhYSendRXFSFHVvLBbJ0nGuQ==", "dev": true, "dependencies": { - "@augment-vir/common": "^15.3.0", - "@augment-vir/node-js": "^15.3.0", + "@augment-vir/common": "^15.4.0", + "@augment-vir/node-js": "^15.4.0", "ansi-colors": "^4.1.3", "concurrently": "^8.2.0", "glob": "^8.1.0", @@ -9886,29 +9893,17 @@ } }, "node_modules/virmator/node_modules/@augment-vir/node-js": { - "version": "15.3.0", - "resolved": "https://registry.npmjs.org/@augment-vir/node-js/-/node-js-15.3.0.tgz", - "integrity": "sha512-y9gSir34VTPBisZhTwuITt7zoiESWtjOpb0WZ2BPCQuzQOfmbBPrZvmI1Zz7v2jpFp3XL8XF7sSwLdyXI0kKcQ==", + "version": "15.5.0", + "resolved": "https://registry.npmjs.org/@augment-vir/node-js/-/node-js-15.5.0.tgz", + "integrity": "sha512-XhCLo3gsnuoAl8NWqb7IpLdKPNws5BtrWNNapfTyd2m1FEck0U6Hv6/yJ1AbaQlwd2g33COatPUOeErpyLLC4g==", "dev": true, "dependencies": { - "@augment-vir/common": "^15.3.0", + "@augment-vir/common": "^15.5.0", "ansi-colors": "^4.1.3", "axios": "^1.4.0", "fs-extra": "^11.1.1", "ts-node": "^10.9.1", - "type-fest": "^3.12.0" - } - }, - "node_modules/virmator/node_modules/@augment-vir/node-js/node_modules/type-fest": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", - "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", - "dev": true, - "engines": { - "node": ">=14.16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type-fest": "^4.0.0" } }, "node_modules/virmator/node_modules/brace-expansion": { @@ -9970,18 +9965,6 @@ "node": ">=10" } }, - "node_modules/virmator/node_modules/type-fest": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.0.0.tgz", - "integrity": "sha512-d/oYtUnPM9zar2fqqGLYPzgcY0qUlYK0evgNVti93xpzfjGkMgZHu9Lvgrkn0rqGXTgsFRxFamzjGoD9Uo+dgw==", - "dev": true, - "engines": { - "node": ">=16" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/vscode-languageserver-textdocument": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz", diff --git a/package.json b/package.json index c9fef94..b28b893 100644 --- a/package.json +++ b/package.json @@ -41,11 +41,11 @@ "test:types": "tsc --noEmit" }, "dependencies": { - "@augment-vir/common": "^15.3.0", + "@augment-vir/common": "^15.5.0", "proxy-vir": "^0.0.1" }, "devDependencies": { - "@augment-vir/chai": "^15.3.0", + "@augment-vir/chai": "^15.5.0", "@electrovir/nyc": "^15.1.0-fix0", "@istanbuljs/nyc-config-typescript": "^1.0.2", "@types/chai": "^4.3.5", @@ -55,24 +55,22 @@ "chai": "^4.3.7", "cross-env": "^7.0.3", "cspell": "^6.31.2", - "esbuild": "^0.18.13", + "esbuild": "^0.18.16", "istanbul-smart-text-reporter": "^1.1.2", "markdown-code-example-inserter": "^0.3.1", "mocha": "^10.2.0", "mocha-spec-reporter-with-file-names": "^0.0.3", "npm-check-updates": "^16.10.16", "prettier": "^3.0.0", - "prettier-plugin-interpolated-html-tags": "^0.0.4", - "prettier-plugin-jsdoc": "^0.4.2", + "prettier-plugin-jsdoc": "^1.0.1", "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-imports": "^3.2.3", "prettier-plugin-packagejson": "^2.4.5", - "prettier-plugin-sort-json": "^1.0.0", "prettier-plugin-toml": "^0.3.1", "test-as-package": "^0.0.4", "ts-node": "^10.9.1", "typescript": "5.1.6", - "virmator": "^7.2.1" + "virmator": "^7.2.5" }, "overrides": { "semver": "^7.5.2" diff --git a/src/index.ts b/src/index.ts index 4150971..8ab0175 100644 --- a/src/index.ts +++ b/src/index.ts @@ -17,22 +17,16 @@ import {MultilineArrayOptions, defaultMultilineArrayOptions, optionHelp} from '. import {wrapParser} from './preprocessing'; import {multilineArrayPrinter} from './printer/multiline-array-printer'; + // exports in case others want to utilize these export * from './options'; export {pluginMarker} from './plugin-marker'; -export const languages: SupportLanguage[] = getSupportInfo().languages.filter(({name}) => - [ - 'JavaScript', - 'TypeScript', - 'JSON', - 'JSON5', - 'JSON with Comments', - 'JSON.stringify', - ].includes(name), -); -export const parsers: Record> = mapObjectValues( +async function loadPlugin(): Promise { + + +const parsers: Record> = mapObjectValues( { typescript: tsParsers.typescript, babel: babelParsers.babel, @@ -41,16 +35,16 @@ export const parsers: Record> = mapObjectValues( json5: babelParsers.json5, }, (languageName, parserEntry) => { - return wrapParser(parserEntry, languageName); + return wrapParser(parserEntry as any, languageName); }, ); -export const printers: Record> = { +const printers: Record> = { estree: multilineArrayPrinter, 'estree-json': multilineArrayPrinter, }; -export const options: Record = getObjectTypedKeys( +const options: Record = getObjectTypedKeys( defaultMultilineArrayOptions, ).reduce((accum, key) => { const defaultValue = defaultMultilineArrayOptions[key]; @@ -64,19 +58,38 @@ export const options: Record = getOb since: '0.0.1', default: defaultValue as any, description: optionHelp[key], - }; + } as any; accum[key] = supportOption; return accum; }, {} as Record); -export const defaultOptions: Partial & Required = +const defaultOptions: Partial & Required = defaultMultilineArrayOptions; + +const languages: SupportLanguage[] = (await getSupportInfo()).languages.filter(({name}) => + [ + 'JavaScript', + 'TypeScript', + 'JSON', + 'JSON5', + 'JSON with Comments', + 'JSON.stringify', + ].includes(name), +); -/** Not actually exported. Just for type checking purposes. */ -const plugin: Plugin = { + const plugin: Plugin = { options, printers, defaultOptions, parsers, languages, + }; + return plugin; +} + +/** + * + * this doesn't work because it return a promise, but how else can we access the languages? + */ +export default loadPlugin(); diff --git a/src/preprocessing.ts b/src/preprocessing.ts index dea23cf..bad5645 100644 --- a/src/preprocessing.ts +++ b/src/preprocessing.ts @@ -61,7 +61,10 @@ export function wrapParser(originalParser: Parser, parserName: string) { initialTarget: originalParser, }); + console.log('attaching the preprocessor', originalParser); function multilineArraysPluginPreprocess(text: string, options: ParserOptions) { + + console.log('firing the preprocessor'); const pluginsWithRelevantParsers = findPluginsByParserName(parserName, options); pluginsWithRelevantParsers.forEach((plugin) => { const currentParser = plugin.parsers?.[parserName]; diff --git a/src/printer/insert-new-lines-into-arguments.ts b/src/printer/insert-new-lines-into-arguments.ts index b2fcbc6..dc4844d 100644 --- a/src/printer/insert-new-lines-into-arguments.ts +++ b/src/printer/insert-new-lines-into-arguments.ts @@ -50,10 +50,10 @@ export function insertLinesIntoArguments( codePath = 'indent'; } // case 2. sibling is concat - else if (isDocCommand(openingSibling) && openingSibling.type === 'concat') { - findingSiblingChildren = openingSibling.parts; - codePath = 'concat'; - } + // else if (isDocCommand(openingSibling) && openingSibling.type === 'concat') { + // findingSiblingChildren = openingSibling.parts; + // codePath = 'concat'; + // } // case 3. sibling is group else if (openingSibling.type === 'group') { const originalBreakValue = openingSibling.break; diff --git a/src/printer/insert-new-lines.ts b/src/printer/insert-new-lines.ts index d3430fe..ccad3fe 100644 --- a/src/printer/insert-new-lines.ts +++ b/src/printer/insert-new-lines.ts @@ -92,12 +92,13 @@ function insertLinesIntoArray( console.info({firstIndentContentsChild: startingLine}); } if (!isDocCommand(startingLine) || startingLine.type !== 'line') { - if (isDocCommand(startingLine) && startingLine.type === 'concat') { - undoAllMutations(); - return false; - } else { + // // todo: I think this needs to check for arrays now instead of concat + // if (isDocCommand(startingLine) && startingLine.type === 'concat') { + // undoAllMutations(); + // return false; + // } else { throw new Error(`${found} first indent child was not a line.`); - } + // } } indentContents[0] = ''; undoMutations.push(() => { @@ -330,35 +331,35 @@ function insertLinesIntoArray( parentToMutate[siblingIndex] = commaSibling; }); } - } else if (isDocCommand(currentDoc) && currentDoc.type === 'concat') { - const firstPart = currentDoc.parts[0]; - const secondPart = currentDoc.parts[1]; - if (debug) { - console.info('got concat child doc'); - console.info(currentDoc.parts, {firstPart, secondPart}); - console.info( - isDocCommand(firstPart), - isDocCommand(secondPart), - (firstPart as any).type === 'line', - (firstPart as any).hard, - (secondPart as any).type === 'break-parent', - ); - } - if ( - isDocCommand(firstPart) && - isDocCommand(secondPart) && - firstPart.type === 'line' && - firstPart.hard && - secondPart.type === 'break-parent' - ) { - if (debug) { - console.info('concat child was indeed a line break'); - } - forceFinalLineBreakExists = true; - return false; - } else if (debug) { - console.info('concat child doc was not a line break'); - } + // } else if (isDocCommand(currentDoc) && currentDoc.type === 'concat') { + // const firstPart = currentDoc.parts[0]; + // const secondPart = currentDoc.parts[1]; + // if (debug) { + // console.info('got concat child doc'); + // console.info(currentDoc.parts, {firstPart, secondPart}); + // console.info( + // isDocCommand(firstPart), + // isDocCommand(secondPart), + // (firstPart as any).type === 'line', + // (firstPart as any).hard, + // (secondPart as any).type === 'break-parent', + // ); + // } + // if ( + // isDocCommand(firstPart) && + // isDocCommand(secondPart) && + // firstPart.type === 'line' && + // firstPart.hard && + // secondPart.type === 'break-parent' + // ) { + // if (debug) { + // console.info('concat child was indeed a line break'); + // } + // forceFinalLineBreakExists = true; + // return false; + // } else if (debug) { + // console.info('concat child doc was not a line break'); + // } } return true; }, diff --git a/src/test/run-tests.ts b/src/test/run-tests.ts index 18ef30a..399d32b 100644 --- a/src/test/run-tests.ts +++ b/src/test/run-tests.ts @@ -6,12 +6,12 @@ import {stripColor} from '../augments/string'; import {MultilineArrayOptions} from '../options'; import {repoConfig} from './prettier-config'; -function runPrettierFormat( +async function runPrettierFormat( code: string, extension: string, options: Partial = {}, parser: string | undefined, -): string { +): Promise { if (extension.startsWith('.')) { extension = extension.slice(1); } @@ -32,7 +32,7 @@ function runPrettierFormat( plugins, }; - return prettierFormat(code, prettierOptions); + return await prettierFormat(code, prettierOptions); } export type MultilineArrayTest = { @@ -58,11 +58,11 @@ function removeIndent(input: string): string { export function runTests(extension: string, tests: MultilineArrayTest[], parser: string) { tests.forEach((test) => { - function testCallback() { + async function testCallback() { try { const inputCode = removeIndent(test.code); const expected = removeIndent(test.expect ?? test.code); - const formatted = runPrettierFormat(inputCode, extension, test.options, parser); + const formatted = await runPrettierFormat(inputCode, extension, test.options, parser); assert.strictEqual(formatted, expected); if (formatted !== expected) { allPassed = false; @@ -83,9 +83,7 @@ export function runTests(extension: string, tests: MultilineArrayTest[], parser: if (test.force) { forced = true; - it.only(test.it, () => { - testCallback(); - }); + it.only(test.it, testCallback); } else if (test.exclude) { it.skip(test.it, testCallback); } else { diff --git a/src/test/typescript-tests.ts b/src/test/typescript-tests.ts index 115d9b2..db112f8 100644 --- a/src/test/typescript-tests.ts +++ b/src/test/typescript-tests.ts @@ -190,6 +190,7 @@ export const typescriptTests: MultilineArrayTest[] = [ options: { multilineArraysWrapThreshold: 10, }, + force: true, }, { it: 'an array without wrapping should only take up one line', diff --git a/tsconfig.json b/tsconfig.json index 10172ce..e9b27f0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,7 @@ "esModuleInterop": true, "exactOptionalPropertyTypes": true, "forceConsistentCasingInFileNames": true, - "module": "CommonJS", + "module": "node16", "moduleResolution": "Node", "noImplicitAny": true, "noImplicitOverride": true, @@ -18,7 +18,7 @@ "skipDefaultLibCheck": true, "skipLibCheck": true, "strict": true, - "target": "ESNext", + "target": "ES2021", "useUnknownInCatchVariables": true }, "exclude": [