diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7f1e45b22..b0ac4f1fc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,15 +4,16 @@ ## Example +### Input + ```java -// Input -// Output +``` + +### Output + +```java ``` ## Relative issues or prs: - - diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index 2ccebc9f3..e7894f111 100644 --- a/.github/workflows/binaries.yml +++ b/.github/workflows/binaries.yml @@ -22,14 +22,6 @@ jobs: sudo apt update sudo apt install jq npm i -g pkg - - name: Installing/Linking dependencies - run: | - cd $GITHUB_WORKSPACE/prettier-java/packages/java-parser - npm i - npm link - cd $GITHUB_WORKSPACE/prettier-java/packages/prettier-plugin-java - npm i - npm link java-parser - name: Checkout Prettier uses: actions/checkout@v2 with: diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml index 0214676c4..c34ec8583 100644 --- a/.github/workflows/github-ci.yml +++ b/.github/workflows/github-ci.yml @@ -46,6 +46,6 @@ jobs: - name: Install dependencies run: yarn - name: Build prettier-plugin-java - run: yarn run build:prettier-plugin-java + run: yarn run build - name: Run e2e tests - run: yarn run test:prettier-plugin-java test:${{ matrix.test_repository }} + run: yarn run test:${{ matrix.test_repository }} diff --git a/.github/workflows/github-pages-deploy.yml b/.github/workflows/github-pages-deploy.yml index 4649bf2ac..19f969d9b 100644 --- a/.github/workflows/github-pages-deploy.yml +++ b/.github/workflows/github-pages-deploy.yml @@ -23,10 +23,10 @@ jobs: cache: yarn - name: Install prettier-plugin-java dependencies - working-directory: ./packages/prettier-plugin-java + working-directory: . run: yarn install --frozen-lockfile - name: Build prettier-plugin-java - working-directory: ./packages/prettier-plugin-java + working-directory: . run: yarn build - name: Install dependencies diff --git a/.github/workflows/github-pages-test.yml b/.github/workflows/github-pages-test.yml index f7304cf53..13df28cb7 100644 --- a/.github/workflows/github-pages-test.yml +++ b/.github/workflows/github-pages-test.yml @@ -23,10 +23,10 @@ jobs: cache: yarn - name: Install prettier-plugin-java dependencies - working-directory: ./packages/prettier-plugin-java + working-directory: . run: yarn install --frozen-lockfile - name: Build prettier-plugin-java - working-directory: ./packages/prettier-plugin-java + working-directory: . run: yarn build - name: Install dependencies diff --git a/.gitignore b/.gitignore index 4e88ca13d..26d273e71 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,21 @@ -node_modules -*.log +# Dependencies +/node_modules + +# Production +/dist + +# Editors +/.idea /.vscode + +# Tests +/samples +/test-samples/**/* +!/test-samples/.eslintrc.json + +# Misc .DS_Store -.idea + +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/packages/prettier-plugin-java/.mocharc.json b/.mocharc.json similarity index 100% rename from packages/prettier-plugin-java/.mocharc.json rename to .mocharc.json diff --git a/.prettierignore b/.prettierignore index 374290225..aae835171 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,10 +1,6 @@ -samples -lerna.json -packages/prettier-plugin-java/samples -packages/prettier-plugin-java/test-samples -packages/prettier-plugin-java/README.md -packages/prettier-plugin-java/dist -CHANGELOG* -website/build -website/.docusaurus /.nx/workspace-data +/src/tree-sitter-java.d.ts +/website/.docusaurus +/website/build +/CHANGELOG.md +/lerna.json diff --git a/CHANGELOG.md b/CHANGELOG.md index c768226a4..1dc22c0ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,85 @@ -# Latest v2.6.7 +# Latest v2.8.1 + +## What's Changed +* fix: indent ternary binary expressions in return statements by @jtkiesel in https://github.com/jhipster/prettier-java/pull/803 + +**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.8.0...prettier-plugin-java@2.8.1 + +# v2.8.0 + +## What's Changed +* feat: improve class/enum/interface/record clause wrapping/indentation by @jtkiesel in https://github.com/jhipster/prettier-java/pull/783 +* fix: break empty switch/rule, try/catch/finally, and if blocks by @jtkiesel in https://github.com/jhipster/prettier-java/pull/791 +* feat: support `prettier-ignore-start`/`-end` in addition to `@formatter:off`/`:on` by @jtkiesel in https://github.com/jhipster/prettier-java/pull/796 +* fix: improve binary expression assignment breaking by @jtkiesel in https://github.com/jhipster/prettier-java/pull/797 +* fix: proper breaking of parenthesized expressions by @jtkiesel in https://github.com/jhipster/prettier-java/pull/800 + +**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.7...prettier-plugin-java@2.8.0 + +# v2.7.7 + +## What's Changed +* fix: remove extra indent from ternary/lambda expressions in parentheses by @jtkiesel in https://github.com/jhipster/prettier-java/pull/787 + +**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.6...prettier-plugin-java@2.7.7 + +# v2.7.6 + +## What's Changed +* fix: indent non-block switch rule bodies with leading comments by @jtkiesel in https://github.com/jhipster/prettier-java/pull/778 +* fix: ternary comment placement and indentation by @jtkiesel in https://github.com/jhipster/prettier-java/pull/780 +* fix: avoid unwrapping empty array initializer with comments by @jtkiesel in https://github.com/jhipster/prettier-java/pull/784 + +**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.5...prettier-plugin-java@2.7.6 + +# v2.7.5 + +## What's Changed +* fix: eliminate repeated printer function execution from our naively-implemented 'call' helper by @jtkiesel in https://github.com/jhipster/prettier-java/pull/771 +* fix: correct indentation of some method argument lists containing lambda bodies by @jtkiesel in https://github.com/jhipster/prettier-java/pull/772 +* fix: correct indentation of non-root instanceof expressions by @jtkiesel in https://github.com/jhipster/prettier-java/pull/773 +* fix: indent binary expressions in annotation element value or argument lists by @jtkiesel in https://github.com/jhipster/prettier-java/pull/774 +* fix: break nested ternaries together by @jtkiesel in https://github.com/jhipster/prettier-java/pull/775 + +**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.4...prettier-plugin-java@2.7.5 + +# v2.7.4 + +## What's Changed +* fix: print class type arguments and dots in the proper order by @jtkiesel in https://github.com/jhipster/prettier-java/pull/754 +* fix: revert connection of trailing semicolon to trailingComma option by @jtkiesel in https://github.com/jhipster/prettier-java/pull/755 + +**Full Changelog**: https://github.com/jhipster/prettier-java/compare/prettier-plugin-java@2.7.3...prettier-plugin-java@2.7.4 + +# v2.7.3 + +## What's Changed +* fix: align arrowParens option's default with Prettier by @jtkiesel in https://github.com/jhipster/prettier-java/pull/749 + +# v2.7.2 + +## What's Changed +* docs: Add arrowParens and experimentalOperatorPosition options to plugin and website playground by @jtkiesel in https://github.com/jhipster/prettier-java/pull/743 +* Fix update-test-outputs script to use test-specific prettier options. by @motlin in https://github.com/jhipster/prettier-java/pull/741 +* chore: add packageManager field to package.json for corepack by @mshima in https://github.com/jhipster/prettier-java/pull/744 +* chore: fix generated types by @mshima in https://github.com/jhipster/prettier-java/pull/747 +* chore: run lerna repair by @mshima in https://github.com/jhipster/prettier-java/pull/745 + +# v2.7.1 + +## What's Changed +* feat: support `experimentalOperatorPosition` option (issue #534) by @jtkiesel in #731 +* fix: make formatting of comments on if statements stable (issue #592) by @jtkiesel in #731 +* fix: break nested statements without braces at the top level first (issue #720) by @jtkiesel in #731 +* fix: do not add a blank line at the end of embedded Java (issue #737) by @jtkiesel in #731 + +# v2.6.8 + +## What's Changed +* fix: break hugged lambda body when closing parenthesis wraps by @jtkiesel in https://github.com/jhipster/prettier-java/pull/721 +* fix: limit TypePattern's VariableDeclaratorList to a single VariableDeclarator by @jtkiesel in https://github.com/jhipster/prettier-java/pull/734 + +# v2.6.7 ## Fixes @@ -15,6 +96,29 @@ - Support dims in record patterns (Issue [#707](https://github.com/jhipster/prettier-java/issues/707) closed by [#708](https://github.com/jhipster/prettier-java/pull/708) by [@clementdessoude](https://github.com/clementdessoude)) +# v2.6.5 + +## Fixes + +- Print comment before first binary operator without failing (Issue #685) fixed by #688 by @jtkiesel +- Add whitespace between label and statement (Issue #686) fixed by #689 by @jtkiesel +- Break and indent assignments like declarations (Issue #687) fixed by #690 by @jtkiesel + +# v2.6.4 + +## Fixes + +- Add es5 as trailingComma option (Issue #652) fixed by #655 by @jtkiesel +- Add types to exports in package.json (Issue #663) fixed by #664 by @mshima +- Hug lambdas without blocks (Issue #650) fixed by #653 by @jtkiesel +- Align with JDK 22 spec (Issue #665) fixed by #666 by @jtkiesel + +## Misc + +- Update advanced_usage.md with current working configuration for IntelliJ (#669 by @tfield) +- Update trailingComma option on advanced_usage.md (#451 by @jslivane) +- Automate GitHub Pages deployment (#672 by @jtkiesel) + # v2.6.0 ## Enhancements diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 974e2e11d..c1e20b9a1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing to Prettier +# Contributing to Prettier Java To get up and running, install the dependencies and run the full build: @@ -13,54 +13,8 @@ You can also inspect the other available dev flows scripts: yarn run ``` -## Linking the java-parser to the printer - -If you want to use the main java-parser for the prettier-plugin-java (printer), you will need to link it by running these commands in the root folder: - -```bash -cd packages/java-parser -yarn link -cd ../prettier-plugin-java -yarn link java-parser -``` - -To unlink the java-parser, run the following command inside packages/prettier-plugin-java. - -```bash -yarn unlink java-parser -``` - ## Testing your changes -### java-parser - -In this section, we suppose you are in the packages/java-parser folder. - -When working on the parser, you can test the java-parser inside scripts/single-sample-runner.js. This is a simple way to check the impact of your changes on the built CST. -You can then print the CST with this code: - -```javascript -console.log( - JSON.stringify( - resultingCST, - (key, value) => (key !== "START_CHARS_HINT" ? value : undefined), - 2 - ) -); -``` - -You can also run the parser tests with the following command: - -```bash -yarn test -``` - -It will basically clone some java repositories and try to parse every java file. - -### prettier-java-plugin - -In this section, we suppose you are in the packages/prettier-plugin-java folder. - If you would like to check the impact of your changes on a sample code, edit the scripts/single-printer-run/\_input.java file and run ```bash @@ -91,7 +45,7 @@ node scripts/update-test-ouput.js It will simply update all the tests located in test/unit-test folder. -If you would like to run all the prettier-java-plugin tests, simple use the following command: +If you would like to run all the tests, simple use the following command: ```bash yarn test diff --git a/README.md b/README.md index f6a8c103f..0ba15133a 100644 --- a/README.md +++ b/README.md @@ -1,164 +1,98 @@ -![Github Actions Build Status](https://github.com/jhipster/prettier-java/actions/workflows/github-ci.yml/badge.svg?branch=main) +[![Prettier Java Banner](https://raw.githubusercontent.com/jhipster/prettier-java/main/logo/prettier-java-banner-light.svg)](https://www.jhipster.tech/prettier-java/) -# Prettier Java +# Prettier Java Plugin -![Prettier Java Banner](./logo/prettier-java-wide-dark.svg#gh-dark-mode-only) -![Prettier Java Banner](./logo/prettier-java-wide-light.svg#gh-light-mode-only) +[![CI Status](https://img.shields.io/github/actions/workflow/status/jhipster/prettier-java/github-ci.yml?branch=main&style=flat-square&label=CI)](https://github.com/jhipster/prettier-java/actions/workflows/github-ci.yml?query=branch%3Amain) [![npm version](https://img.shields.io/npm/v/prettier-plugin-java.svg?style=flat-square)](https://www.npmjs.com/package/prettier-plugin-java) [![weekly downloads from npm](https://img.shields.io/npm/dw/prettier-plugin-java.svg?style=flat-square)](https://www.npmjs.com/package/prettier-plugin-java) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier#badge) ## Intro Prettier is an opinionated code formatter. It enforces a consistent style by parsing your code and re-printing it with its own rules that take the maximum line length into account, wrapping code when necessary. -## How it works +This plugin adds support for the Java language to Prettier. -A Prettier plugin must first parse the source code of the target language -into a traversable data structure (Usually an **A**bstract **S**yntax **T**ree) -and then print out that data structure in a "pretty" style. +### Input -Prettier-Java uses a [Java-Parser](./packages/java-parser) implemented in JavaScript using the -[Chevrotain Parser Building Toolkit for JavaScript](https://github.com/SAP/chevrotain). -What this means is that unlike many other Prettier plugins, -`prettier-java` has **no additional runtime pre-requisites** (e.g: Python executable). -It could even be used inside a browser. + +```java +public class HelloWorld { +public static void main(String[] args) {System.out.println("Hello World!");;;;;} -## Subpackages - -This project contains 2 packages: - -- [prettier-plugin-java](./packages/prettier-plugin-java) A plugin for - [Prettier](https://prettier.io/) to format Java code - - [![npm-prettier-plugin-java][npm-prettier-plugin-java-image]][npm-prettier-plugin-java-url] - -* [java-parser](./packages/java-parser) A Java Parser using [Chevrotain](https://github.com/SAP/chevrotain) which output a **C**oncrete **S**yntax **T**ree - - [![npm-java-parser][npm-java-parser-image]][npm-java-parser-url] - -[npm-prettier-plugin-java-image]: https://img.shields.io/npm/v/prettier-plugin-java.svg?color=blue&label=prettier-plugin-java&logo=prettier-plugin-java -[npm-prettier-plugin-java-url]: https://www.npmjs.com/package/prettier-plugin-java -[npm-java-parser-image]: https://img.shields.io/npm/v/java-parser.svg?color=blue&label=java-parser&logo=java-parser -[npm-java-parser-url]: https://www.npmjs.com/package/java-parser - -## Install - -### Pre-requirements - -- [Node version](https://nodejs.org/en/download/releases/) 10+ -- [Prettier](https://github.com/prettier/prettier) - -### Install Prettier and Prettier-Java plugin - -```bash -# Local installation -npm install prettier-plugin-java --save-dev - -# Or globally -npm install -g prettier prettier-plugin-java +@Override +public String toString() { + return "Hello World"; +} + public int sum(int argument1,int argument2,int argument3,int argument4,int argument5 + ) { + return argument1+argument2+ argument3 +argument4 + argument5; + } +} ``` -or with yarn: - -```bash -# Local installation -yarn add prettier-plugin-java --dev - -# Or globally -yarn global add prettier prettier-plugin-java +### Output + +```java +public class HelloWorld { + + public static void main(String[] args) { + System.out.println("Hello World!"); + } + + @Override + public String toString() { + return "Hello World"; + } + + public int sum( + int argument1, + int argument2, + int argument3, + int argument4, + int argument5 + ) { + return argument1 + argument2 + argument3 + argument4 + argument5; + } +} ``` -Note: If you want to install the prettier-plugin-java globally, you should also install the prettier package globally. +### Playground -## Usage +You can give the plugin a try in our [playground](https://www.jhipster.tech/prettier-java/playground)! -To reformat all your Java files, you first need to create `.prettierrc.yaml` with following content: - -```yaml -plugins: - - prettier-plugin-java -``` +## Getting Started -Then run: +### Installation -```bash -# If you have installed the package locally -npx prettier --write "**/*.java" +npm: -# Or globally -prettier --write "**/*.java" +```shell +npm install --save-dev --save-exact prettier prettier-plugin-java ``` -To see **IDE configuration** or other advanced usage: please go to the [Advanced Usage](./docs/advanced_usage.md) section +Yarn: -## Maven plugin - -A neat maven plugin for prettier-java was made by developers from HubSpot. \ -Add it to the `plugins` section of your `build` configuration - -```xml - - - - com.hubspot.maven.plugins - prettier-maven-plugin - - 0.8 - - - +```shell +yarn add --dev --exact prettier prettier-plugin-java ``` -If you would like to use this plugin, we recommend you to check their [project](https://github.com/HubSpot/prettier-maven-plugin) as is it well documented. - -## Organize imports - -Prettier-java is currently sorting imports according to the [Google Java Style guide](https://google.github.io/styleguide/javaguide.html#s3.3-import-statements). - -If you are using an IDE such as IntelliJ, you might want to configure it to match with Prettier-java. +### Usage -For IntelliJ, you can use this configuration: -![IntelliJ config](./docs/intellij_imports_config.png) +npm: -You can also import the Checkstyle configuration provided in the next section. - -For VSCode with [Language Support for Java](https://marketplace.visualstudio.com/items?itemName=redhat.java), you can use this configuration (`settings.json`): - -```json -{ - "java.completion.importOrder": ["#"] -} +```shell +npx prettier --plugin=prettier-plugin-java --write "**/*.java" ``` -## Checkstyle configuration - -You can use Prettier in combination with other linter, like Checkstyle. - -Here is one [Checkstyle Prettier compatible configuration](./docs/checkstyle/checkstyle.xml) you can use to start with ! +Yarn: -You can directly import the config into IntelliJ Idea for instance: - -![Import Checkstyle configuration](./docs/checkstyle/import-checkstyle-configuration.gif) - -## Indent configuration - -In `.prettierrc.yaml`, you can configure the indent: - -For using four spaces: - -```yaml -tabWidth: 4 +```shell +yarn exec prettier --plugin=prettier-plugin-java --write "**/*.java" ``` -For more configuration options such as using tabs, maximum line length, and more see . +### Integration -## Contributing - -Contributions are very welcome. -See the [contribution guide](./CONTRIBUTING.md) to get started. -And the [Help Wanted](https://github.com/jhipster/prettier-java/labels/help%20wanted) issues. +- [Editors](docs/advanced_usage.md#ide-integrations) +- [Spotless](https://github.com/diffplug/spotless) lets you run Prettier from [Gradle](https://github.com/diffplug/spotless/tree/main/plugin-gradle#prettier) or [Maven](https://github.com/diffplug/spotless/tree/main/plugin-maven#prettier) -## Credits - -Special thanks to [@thorbenvh8](https://github.com/thorbenvh8) for creating the original `prettier-java` -plugin and the associated Java Parser implemented in JavaScript. +## Contributing -We would also like to thank the [Chevrotain](https://github.com/SAP/chevrotain/graphs/contributors) and [Prettier](https://github.com/prettier/prettier/graphs/contributors) contributors which made this possible. +See [CONTRIBUTING.md](CONTRIBUTING.md). diff --git a/RELEASE.md b/RELEASE.md deleted file mode 100644 index 045776727..000000000 --- a/RELEASE.md +++ /dev/null @@ -1,57 +0,0 @@ -# RELEASE - -For core contributors, when you want to do a release, follow these steps: - -Go into your local project. - -Be sure to have an origin and upstream. The origin is your fork. The upstream is the official project. You should have something like that: - -``` -➜ git remote -v -origin git@github.com:pascalgrimaud/prettier-java.git (fetch) -origin git@github.com:pascalgrimaud/prettier-java.git (push) -upstream git@github.com:jhipster/prettier-java (fetch) -upstream git@github.com:jhipster/prettier-java (push) -``` - -Update `main` branch and `release` branch in your fork. - -``` -git checkout release -git fetch upstream -git rebase upstream/release - -git checkout main -git rebase upstream/main -``` - -Be sure your dependencies is up-to-dated: - -``` -yarn -``` - -In `main` branch, launch the release, and answer the questions. It will: - -- change the version (patch, minor or major, accordingly to what you choose) -- tag the version -- push main branch to upstream -- push the tag to upstream - -``` -yarn run lerna:version -``` - -Then, if everything looks OK, merge the main branch to the release branch locally, then push the release branch: - -``` -git checkout release -git merge main -git push upstream/release -``` - -The Azure Pipelines will build the release branch and publish to NPM. -Then, you need to check if the release is correctly published at: - -- https://www.npmjs.com/package/prettier-plugin-java -- https://www.npmjs.com/package/java-parser diff --git a/benchmark/benchmark.js b/benchmark/benchmark.js index 09bc283b4..47189f917 100644 --- a/benchmark/benchmark.js +++ b/benchmark/benchmark.js @@ -2,9 +2,9 @@ import fs from "node:fs"; import path from "node:path"; import { bench, do_not_optimize, run } from "mitata"; import prettier from "prettier"; -import javaPlugin from "prettier-plugin-java"; +import javaPlugin from "../dist/index.js"; -const dir = "../packages/prettier-plugin-java/samples"; +const dir = "samples"; const files = fs .readdirSync(dir, { recursive: true }) .filter(file => file.endsWith(".java")) diff --git a/benchmark/package.json b/benchmark/package.json deleted file mode 100644 index 365fead13..000000000 --- a/benchmark/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "benchmark", - "version": "1.0.1", - "private": true, - "description": "Benchmark for comparing Parsers", - "type": "module", - "exports": "./benchmark.js", - "scripts": { - "start": "node benchmark.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/jhipster/prettier-java.git" - }, - "author": "", - "license": "Apache-2.0", - "bugs": { - "url": "https://github.com/jhipster/prettier-java/issues" - }, - "homepage": "https://github.com/jhipster/prettier-java#readme", - "devDependencies": { - "mitata": "^1.0.34", - "prettier": "^3.0.0" - } -} diff --git a/docs/checkstyle/checkstyle.xml b/docs/checkstyle/checkstyle.xml deleted file mode 100644 index 8d7dddf19..000000000 --- a/docs/checkstyle/checkstyle.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/checkstyle/import-checkstyle-configuration.gif b/docs/checkstyle/import-checkstyle-configuration.gif deleted file mode 100644 index 7f63280d1..000000000 Binary files a/docs/checkstyle/import-checkstyle-configuration.gif and /dev/null differ diff --git a/docs/intellij_imports_config.png b/docs/intellij_imports_config.png deleted file mode 100644 index 0a360cdae..000000000 Binary files a/docs/intellij_imports_config.png and /dev/null differ diff --git a/eslint.config.js b/eslint.config.js new file mode 100644 index 000000000..15d21a60c --- /dev/null +++ b/eslint.config.js @@ -0,0 +1,14 @@ +import js from "@eslint/js"; +import globals from "globals"; +import tseslint from "typescript-eslint"; +import { defineConfig } from "eslint/config"; + +export default defineConfig([ + { + files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], + plugins: { js }, + extends: ["js/recommended"], + languageOptions: { globals: { ...globals.browser, ...globals.node } } + }, + tseslint.configs.recommended +]); diff --git a/eslint.config.mjs b/eslint.config.mjs deleted file mode 100644 index 38e57bc6e..000000000 --- a/eslint.config.mjs +++ /dev/null @@ -1,75 +0,0 @@ -import globals from "globals"; -import path from "node:path"; -import { fileURLToPath } from "node:url"; -import js from "@eslint/js"; -import { FlatCompat } from "@eslint/eslintrc"; - -const __filename = fileURLToPath(import.meta.url); -const __dirname = path.dirname(__filename); -const compat = new FlatCompat({ - baseDirectory: __dirname, - recommendedConfig: js.configs.recommended, - allConfig: js.configs.all -}); - -export default [ - { - ignores: [ - "packages/java-parser/samples", - "packages/prettier-plugin-java/samples", - "packages/prettier-plugin-java/test-samples", - "**/node_modules", - "packages/prettier-plugin-java/dist", - "**/babel.config.js", - "website/.docusaurus" - ] - }, - ...compat.extends("eslint:recommended"), - { - languageOptions: { - globals: { - ...globals.node - }, - ecmaVersion: 2020, - sourceType: "module" - }, - rules: { - "no-fallthrough": "off", - curly: "error", - "no-else-return": "error", - "no-inner-declarations": "error", - "no-unneeded-ternary": "error", - "no-useless-return": "error", - "no-console": "error", - "no-var": "error", - "one-var": ["error", "never"], - "prefer-arrow-callback": "error", - "prefer-const": "error", - "react/no-deprecated": "off", - strict: "error", - "symbol-description": "error", - yoda: [ - "error", - "never", - { - exceptRange: true - } - ] - } - }, - { - files: ["packages/*/test/**/*.js"], - languageOptions: { - globals: { - context: true, - describe: true, - it: true, - before: true, - after: true - } - }, - rules: { - strict: "off" - } - } -]; diff --git a/lerna.json b/lerna.json index 583169131..a8006dfa8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,8 +1,4 @@ { - "packages": [ - "packages/*", - "benchmark" - ], "npmClient": "yarn", "version": "independent", "$schema": "node_modules/lerna/schemas/lerna-schema.json" diff --git a/package.json b/package.json index 30ff8dc96..3b916189e 100644 --- a/package.json +++ b/package.json @@ -1,25 +1,36 @@ { - "name": "root", - "private": true, - "homepage": "https://www.jhipster.tech/prettier-java/", - "workspaces": [ - "packages/*", - "benchmark" + "name": "prettier-plugin-java", + "version": "2.8.1", + "description": "Prettier Java Plugin", + "homepage": "https://jhipster.github.io/prettier-java/", + "repository": "https://github.com/jhipster/prettier-java", + "license": "Apache-2.0", + "type": "module", + "exports": { + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + }, + "files": [ + "dist" ], "scripts": { - "prepare": "husky", - "lerna:version": "lerna version --exact --no-private", - "lerna:publish": "lerna publish from-git --yes", + "build": "tsc && cp src/tree-sitter-java_orchard.wasm dist/", "ci": "yarn build && yarn lint && yarn format:validate && yarn test", - "ci:all": "yarn run ci && yarn run test:prettier-plugin-java test:e2e-jhipster1 && yarn run test:prettier-plugin-java test:e2e-jhipster2", - "test": "lerna run test --stream", - "test:prettier-plugin-java": "lerna --stream --scope=prettier-plugin-java run", - "lint": "eslint packages/**/*.js", + "clone-samples": "node scripts/clone-samples.js", "format:fix": "prettier --write \"**/*.@(js|json|ts)\"", "format:validate": "prettier --list-different \"**/*.@(js|json|ts)\"", - "build": "yarn build:prettier-plugin-java", - "build:prettier-plugin-java": "cd packages/prettier-plugin-java && yarn build && cd ../..", - "update-test-outputs": "node packages/prettier-plugin-java/scripts/update-test-output.js" + "postinstall": "cp node_modules/tree-sitter-java-orchard/tree-sitter-java_orchard.wasm src/ && dts-tree-sitter node_modules/tree-sitter-java-orchard > src/tree-sitter-java.d.ts", + "lerna:publish": "lerna publish from-git --yes", + "lerna:version": "lerna version --exact --no-private", + "lint": "eslint src/**/*.ts", + "prepare": "husky", + "test": "yarn run test:unit && yarn run test:e2e-core", + "test:all": "yarn run test && yarn run test:e2e-jhipster1 && yarn run test:e2e-jhipster2", + "test:e2e-core": "node scripts/clone-samples e2e-core && mocha \"test/repository-test/core-test.ts\"", + "test:e2e-jhipster1": "node scripts/clone-samples e2e-jhipster1 && mocha \"test/repository-test/jhipster-1-test.ts\"", + "test:e2e-jhipster2": "node scripts/clone-samples e2e-jhipster2 && mocha \"test/repository-test/jhipster-2-test.ts\"", + "test:unit": "mocha \"test/unit-test/**/*.spec.ts\" \"test/unit-test/**/*-spec.ts\"", + "update-test-outputs": "node scripts/update-test-output.js" }, "lint-staged": { "*.json": [ @@ -30,19 +41,36 @@ "prettier --write" ] }, + "dependencies": { + "tree-sitter-java-orchard": "0.5.4", + "web-tree-sitter": "0.26.6" + }, "devDependencies": { - "chai": "5.1.2", - "eslint": "9.14.0", - "eslint-config-google": "0.14.0", - "eslint-config-prettier": "9.1.0", - "fs-extra": "11.2.0", - "husky": "9.1.6", - "klaw-sync": "6.0.0", - "lerna": "8.1.9", - "lint-staged": "15.2.10", - "mocha": "10.8.2", + "@asgerf/dts-tree-sitter": "^0.21.0", + "@eslint/js": "^10.0.1", + "@types/chai": "^5.0.1", + "@types/emscripten": "^1.41.5", + "@types/fs-extra": "^11.0.4", + "@types/klaw-sync": "^6.0.5", + "@types/mocha": "^10.0.10", + "@types/node": "^18.19.64", + "chai": "^5.1.2", + "eslint": "^10.0.3", + "fs-extra": "^11.2.0", + "globals": "^17.4.0", + "husky": "^9.1.6", + "klaw-sync": "^6.0.0", + "lerna": "^8.1.9", + "lint-staged": "^15.2.10", + "mitata": "^1.0.34", + "mocha": "^10.8.2", "prettier": "^3.0.0", - "sinon": "19.0.2" + "ts-node": "^10.9.2", + "typescript": "^5.6.3", + "typescript-eslint": "^8.57.0" + }, + "peerDependencies": { + "prettier": "^3.0.0" }, "packageManager": "yarn@1.22.22" } diff --git a/packages/prettier-plugin-java/.gitignore b/packages/prettier-plugin-java/.gitignore deleted file mode 100644 index 9e589ec97..000000000 --- a/packages/prettier-plugin-java/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -dist/ -test-samples/**/* -scripts/single-printer-run -samples/**/* -!test-samples/.eslintrc.json diff --git a/packages/prettier-plugin-java/.npmignore b/packages/prettier-plugin-java/.npmignore deleted file mode 100644 index f9dbe2fd3..000000000 --- a/packages/prettier-plugin-java/.npmignore +++ /dev/null @@ -1,9 +0,0 @@ -docs -scripts -test -test-samples -samples -*.log -src -dist/test -*-spec.js diff --git a/packages/prettier-plugin-java/README.md b/packages/prettier-plugin-java/README.md deleted file mode 100644 index bc6075df8..000000000 --- a/packages/prettier-plugin-java/README.md +++ /dev/null @@ -1,158 +0,0 @@ -[![npm](https://img.shields.io/npm/v/prettier-plugin-java.svg)](https://www.npmjs.com/package/prettier-plugin-java) - -# prettier-plugin-java - -![Prettier Java Banner](https://raw.githubusercontent.com/jhipster/prettier-java/main/logo/prettier-java-banner-light.svg) - -Prettier is an opinionated code formatter which forces a certain coding style. It makes the code consistent through an entire project. - -This plugin allows the support of Java on Prettier. - -The plugin implementation is pretty straightforward as it uses [java-parser](../java-parser) (thanks to Chevrotain) visitor to traverse the **C**oncrete **S**yntax **T**ree and apply the format processing on each node (it uses Prettier API). - -## Installation - -### Pre-requirements - -Since the plugin is meant to be used with Prettier, you need to install it: - -`npm install --save-dev --save-exact prettier` - -or - -`yarn add prettier --dev --exact` - -### Install plugin - -`npm install prettier-plugin-java --save-dev` - -or - -`yarn add prettier-plugin-java --dev` - -### CLI - -If you installed Prettier globally and want to format java code via the CLI, run the following command: - -`npm install -g prettier-plugin-java` - -The plugin will be automatically loaded, check [here](https://prettier.io/docs/en/plugins.html#using-plugins) for more. - -## Usage - -### CLI - -```bash -prettier --write MyJavaFile.java -``` - -If the plugin is not automatically loaded: - -```bash -# Example where the plugin is locate in node_modules -prettier --write MyJavaFile.java --plugin=./node_modules/prettier-plugin-java -``` - -### API - -```javascript -const prettier = require("prettier"); -const javaText = ` -public class HelloWorldExample{ - public static void main(String args[]){ - System.out.println("Hello World !"); - } -} -`; - -const formattedText = prettier.format(javaText, { - parser: "java", - tabWidth: 2 -}); -``` - -## Example of formatted code - -### Input - -```java -public class HelloWorld { -public static void main(String[] args) {System.out.println("Hello World!");;;;;} - -@Override -public String toString() { - return "Hello World"; -} - public int sum(int argument1,int argument2,int argument3,int argument4,int argument5 - ) { - return argument1+argument2+ argument3 +argument4 + argument5; - } -} -``` - -### Output - -```java -public class HelloWorld { - - public static void main(String[] args) { - System.out.println("Hello World!"); - } - - @Override - public String toString() { - return "Hello World"; - } - - public int sum( - int argument1, - int argument2, - int argument3, - int argument4, - int argument5 - ) { - return argument1 + argument2 + argument3 + argument4 + argument5; - } -} -``` - -## Options -We added a custom option ```entrypoint``` in order to run prettier on code snippet. - -### Usage -```prettier --write MyJava.java --entrypoint compilationUnit``` \ -[Here](https://github.com/jhipster/prettier-java/blob/main/packages/prettier-plugin-java/src/options.js) is the exhaustive list of all entrypoints. - -### Example -MyJavaCode.java content: -```java -public void myfunction() { - mymethod.is().very().very().very().very().very().very().very().very().very().very().very().very().very().very().big(); -} -``` - -Run: \ -```prettier --write MyJavaCode.java --entrypoint classBodyDeclaration``` - -Result: -```java -public void myfunction() { - mymethod - .is() - .very() - .very() - .very() - .very() - .very() - .very() - .very() - .very() - .very() - .very() - .very() - .very() - .very() - .very() - .big(); -} -``` diff --git a/packages/prettier-plugin-java/docs/modifiers.md b/packages/prettier-plugin-java/docs/modifiers.md deleted file mode 100644 index e1fbf74af..000000000 --- a/packages/prettier-plugin-java/docs/modifiers.md +++ /dev/null @@ -1,122 +0,0 @@ -# Modifier formatting - -### Modifier sorting - -Class, method, and field modifiers will be sorted according to the order in the -JLS (sections [8.1.1](https://docs.oracle.com/javase/specs/jls/se11/html/jls-8.html#jls-8.1.1), -[8.3.1](https://docs.oracle.com/javase/specs/jls/se11/html/jls-8.html#jls-8.3.1), -[8.4.3](https://docs.oracle.com/javase/specs/jls/se11/html/jls-8.html#jls-8.4.3), -and [9.4](https://docs.oracle.com/javase/specs/jls/se11/html/jls-9.html#jls-9.4)). -The overall ordering is: - -- public -- protected -- private -- abstract -- default -- static -- final -- transient -- volatile -- synchronized -- native -- strictfp - -#### Examples - -Input: - -```java -final private static String S = "abc"; -``` - -Output: - -```java -private static final String S = "abc"; -``` - -Input: - -```java -final public class C {...} -``` - -Output: - -```java -public final class C {...} -``` - -Input: - -```java -static private void foo() {} -``` - -Output: - -```java -private static void foo() {} -``` - -### Interaction with annotations - -Class, field, and method annotations will be moved ahead of modifier keywords -and placed on a separate line. The exception is method annotations that come -after all modifier keywords, in which case the annotation will maintain the -same position. This is to support annotations whose intent is to qualify the -method's return type, rather than the method itself (for example: `public @Nullable String myMethod()`). - -#### Examples - -Input: - -```java -@Annotation final private static String S = "abc"; -``` - -Output: - -```java -@Annotation -private static final String S = "abc"; -``` - -Input: - -```java -final private static @Annotation String S = "abc"; -``` - -Output: - -```java -@Annotation -private static final String S = "abc"; -``` - -Input: - -```java -final public @Nullable String myMethod {} -``` - -Output: - -```java -public final @Nullable String myMethod {} -``` - -Input: - -```java -final @Override public String myMethod {} -``` - -Output: - -```java -@Override -public final String myMethod {} -``` diff --git a/packages/prettier-plugin-java/package.json b/packages/prettier-plugin-java/package.json deleted file mode 100644 index 009501653..000000000 --- a/packages/prettier-plugin-java/package.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "prettier-plugin-java", - "version": "2.8.1", - "description": "Prettier Java Plugin", - "type": "module", - "exports": { - "types": "./dist/index.d.ts", - "default": "./dist/index.js" - }, - "files": [ - "dist" - ], - "homepage": "https://jhipster.github.io/prettier-java/", - "repository": "https://github.com/jhipster/prettier-java", - "license": "Apache-2.0", - "dependencies": { - "tree-sitter-java-orchard": "0.5.4", - "web-tree-sitter": "0.26.6" - }, - "scripts": { - "test": "yarn run test:unit && yarn run test:e2e-core", - "test:unit": "mocha \"test/unit-test/**/*.spec.ts\" \"test/unit-test/**/*-spec.ts\"", - "test:e2e-core": "node scripts/clone-samples e2e-core && mocha \"test/repository-test/core-test.ts\"", - "test:e2e-jhipster1": "node scripts/clone-samples e2e-jhipster1 && mocha \"test/repository-test/jhipster-1-test.ts\"", - "test:e2e-jhipster2": "node scripts/clone-samples e2e-jhipster2 && mocha \"test/repository-test/jhipster-2-test.ts\"", - "test:all": "yarn run test && yarn run test:e2e-jhipster1 && yarn run test:e2e-jhipster2", - "clone-samples": "node scripts/clone-samples.js", - "build": "tsc && cp src/tree-sitter-java_orchard.wasm dist/", - "build:watch": "tsc --inlineSourceMap -w", - "generate": "cp ../../node_modules/tree-sitter-java-orchard/tree-sitter-java_orchard.wasm src/ && dts-tree-sitter ../../node_modules/tree-sitter-java-orchard > src/tree-sitter-java.d.ts" - }, - "devDependencies": { - "@asgerf/dts-tree-sitter": "0.21.0", - "@types/chai": "5.0.1", - "@types/emscripten": "1.41.5", - "@types/fs-extra": "11.0.4", - "@types/jest": "29.5.14", - "@types/klaw-sync": "6.0.5", - "@types/node": "18.19.64", - "@types/sinon": "17.0.3", - "ts-node": "10.9.2", - "typescript": "5.6.3" - }, - "peerDependencies": { - "prettier": "^3.0.0" - } -} diff --git a/packages/prettier-plugin-java/scripts/clone-samples.js b/scripts/clone-samples.js similarity index 100% rename from packages/prettier-plugin-java/scripts/clone-samples.js rename to scripts/clone-samples.js diff --git a/scripts/deploy.sh b/scripts/deploy.sh deleted file mode 100644 index 06cfd6a94..000000000 --- a/scripts/deploy.sh +++ /dev/null @@ -1,6 +0,0 @@ -echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc -# lerna would fail if there are uncommited files in the git working tree -# but it won't tell us what are the files, the "git status" command will help -# debug CI failures (e.g in travis) -git status -yarn run lerna:publish diff --git a/packages/prettier-plugin-java/scripts/single-printer-run/_input.java b/scripts/single-printer-run/_input.java similarity index 100% rename from packages/prettier-plugin-java/scripts/single-printer-run/_input.java rename to scripts/single-printer-run/_input.java diff --git a/packages/prettier-plugin-java/scripts/single-printer-run/_output.java b/scripts/single-printer-run/_output.java similarity index 100% rename from packages/prettier-plugin-java/scripts/single-printer-run/_output.java rename to scripts/single-printer-run/_output.java diff --git a/packages/prettier-plugin-java/scripts/update-test-output.js b/scripts/update-test-output.js similarity index 100% rename from packages/prettier-plugin-java/scripts/update-test-output.js rename to scripts/update-test-output.js diff --git a/packages/prettier-plugin-java/src/comments.ts b/src/comments.ts similarity index 100% rename from packages/prettier-plugin-java/src/comments.ts rename to src/comments.ts diff --git a/packages/prettier-plugin-java/src/index.ts b/src/index.ts similarity index 100% rename from packages/prettier-plugin-java/src/index.ts rename to src/index.ts diff --git a/packages/prettier-plugin-java/src/options.ts b/src/options.ts similarity index 100% rename from packages/prettier-plugin-java/src/options.ts rename to src/options.ts diff --git a/packages/prettier-plugin-java/src/parser.ts b/src/parser.ts similarity index 100% rename from packages/prettier-plugin-java/src/parser.ts rename to src/parser.ts diff --git a/packages/prettier-plugin-java/src/printer.ts b/src/printer.ts similarity index 100% rename from packages/prettier-plugin-java/src/printer.ts rename to src/printer.ts diff --git a/packages/prettier-plugin-java/src/printers/arrays.ts b/src/printers/arrays.ts similarity index 100% rename from packages/prettier-plugin-java/src/printers/arrays.ts rename to src/printers/arrays.ts diff --git a/packages/prettier-plugin-java/src/printers/blocks-and-statements.ts b/src/printers/blocks-and-statements.ts similarity index 100% rename from packages/prettier-plugin-java/src/printers/blocks-and-statements.ts rename to src/printers/blocks-and-statements.ts diff --git a/packages/prettier-plugin-java/src/printers/classes.ts b/src/printers/classes.ts similarity index 99% rename from packages/prettier-plugin-java/src/printers/classes.ts rename to src/printers/classes.ts index 592812b04..baddfbd75 100644 --- a/packages/prettier-plugin-java/src/printers/classes.ts +++ b/src/printers/classes.ts @@ -357,7 +357,7 @@ export default { const enumBodyDeclarationsIndex = path.node.namedChildren.findIndex( ({ type }) => type === SyntaxType.EnumBodyDeclarations ); - let declarations: Doc[] = []; + const declarations: Doc[] = []; if (enumBodyDeclarationsIndex !== -1) { const hasDeclarations = path.node.namedChildren[enumBodyDeclarationsIndex].namedChildren diff --git a/packages/prettier-plugin-java/src/printers/expressions.ts b/src/printers/expressions.ts similarity index 98% rename from packages/prettier-plugin-java/src/printers/expressions.ts rename to src/printers/expressions.ts index e78e63a38..151bb4259 100644 --- a/packages/prettier-plugin-java/src/printers/expressions.ts +++ b/src/printers/expressions.ts @@ -37,7 +37,6 @@ export default { const signatureDocs: Doc[] = []; let bodyDoc: Doc | undefined; const bodyComments: Doc[] = []; - let shouldBreakChain = false; const shouldPrintAsChain = !( args && @@ -80,7 +79,7 @@ export default { !functionBody!.comments?.some( ({ leading }) => leading && hasNewline(options.originalText, functionBody!.end.index) - ) && mayBreakAfterShortPrefix(functionBody!, bodyDoc!); + ) && mayBreakAfterShortPrefix(functionBody!); const isCallee = path.node.fieldName === "object" && @@ -88,8 +87,7 @@ export default { const chainGroupId = Symbol("arrow-chain"); const signaturesDoc = printArrowFunctionSignatures(path, { - signatureDocs, - shouldBreak: shouldBreakChain + signatureDocs }); let shouldBreakSignatures = false; let shouldIndentSignatures = false; @@ -693,7 +691,7 @@ function printLambdaExpressionSignature( return parts; } -function mayBreakAfterShortPrefix(functionBody: JavaNode, bodyDoc: Doc) { +function mayBreakAfterShortPrefix(functionBody: JavaNode) { return ( functionBody.type === SyntaxType.ArrayCreationExpression || functionBody.type === SyntaxType.LambdaExpression || @@ -703,7 +701,7 @@ function mayBreakAfterShortPrefix(functionBody: JavaNode, bodyDoc: Doc) { function printArrowFunctionSignatures( path: JavaNodePath, - { signatureDocs, shouldBreak }: { signatureDocs: Doc[]; shouldBreak: boolean } + { signatureDocs }: { signatureDocs: Doc[] } ) { if (signatureDocs.length === 1) { return signatureDocs[0]; @@ -715,24 +713,21 @@ function printArrowFunctionSignatures( parent?.type === SyntaxType.MethodInvocation) || parent?.type === SyntaxType.BinaryExpression ) { - return group( - [ - signatureDocs[0], - " ->", - indent([line, join([" ->", line], signatureDocs.slice(1))]) - ], - { shouldBreak } - ); + return group([ + signatureDocs[0], + " ->", + indent([line, join([" ->", line], signatureDocs.slice(1))]) + ]); } if ( node.fieldName === "object" && parent?.type === SyntaxType.MethodInvocation ) { - return group(join([" ->", line], signatureDocs), { shouldBreak }); + return group(join([" ->", line], signatureDocs)); } - return group(indent(join([" ->", line], signatureDocs)), { shouldBreak }); + return group(indent(join([" ->", line], signatureDocs))); } function shouldPrintParamsWithoutParens( diff --git a/packages/prettier-plugin-java/src/printers/helpers.ts b/src/printers/helpers.ts similarity index 99% rename from packages/prettier-plugin-java/src/printers/helpers.ts rename to src/printers/helpers.ts index 41cfef674..f98d7c82d 100644 --- a/packages/prettier-plugin-java/src/printers/helpers.ts +++ b/src/printers/helpers.ts @@ -24,10 +24,10 @@ export function hasChild( return path.node[fieldName] != null; } -export function definedKeys, K extends keyof T>( - obj: T, - options?: K[] -) { +export function definedKeys< + T extends Record, + K extends keyof T +>(obj: T, options?: K[]) { return (options ?? (Object.keys(obj) as K[])).filter( key => obj[key] !== undefined ); diff --git a/packages/prettier-plugin-java/src/printers/index.ts b/src/printers/index.ts similarity index 100% rename from packages/prettier-plugin-java/src/printers/index.ts rename to src/printers/index.ts diff --git a/packages/prettier-plugin-java/src/printers/interfaces.ts b/src/printers/interfaces.ts similarity index 100% rename from packages/prettier-plugin-java/src/printers/interfaces.ts rename to src/printers/interfaces.ts diff --git a/packages/prettier-plugin-java/src/printers/lexical-structure.ts b/src/printers/lexical-structure.ts similarity index 100% rename from packages/prettier-plugin-java/src/printers/lexical-structure.ts rename to src/printers/lexical-structure.ts diff --git a/packages/prettier-plugin-java/src/printers/names.ts b/src/printers/names.ts similarity index 100% rename from packages/prettier-plugin-java/src/printers/names.ts rename to src/printers/names.ts diff --git a/packages/prettier-plugin-java/src/printers/packages-and-modules.ts b/src/printers/packages-and-modules.ts similarity index 100% rename from packages/prettier-plugin-java/src/printers/packages-and-modules.ts rename to src/printers/packages-and-modules.ts diff --git a/packages/prettier-plugin-java/src/printers/types-values-and-variables.ts b/src/printers/types-values-and-variables.ts similarity index 100% rename from packages/prettier-plugin-java/src/printers/types-values-and-variables.ts rename to src/printers/types-values-and-variables.ts diff --git a/packages/prettier-plugin-java/src/tree-sitter-java.d.ts b/src/tree-sitter-java.d.ts similarity index 94% rename from packages/prettier-plugin-java/src/tree-sitter-java.d.ts rename to src/tree-sitter-java.d.ts index 1f0192078..175c91330 100644 --- a/packages/prettier-plugin-java/src/tree-sitter-java.d.ts +++ b/src/tree-sitter-java.d.ts @@ -12,8 +12,7 @@ export class Parser { } export type Options = { - bufferSize?: number; - includedRanges?: Range[]; + bufferSize?: number, includedRanges?: Range[]; }; export type Point = { @@ -22,10 +21,10 @@ export type Point = { }; export type Range = { - startIndex: number; - endIndex: number; - startPosition: Point; - endPosition: Point; + startIndex: number, + endIndex: number, + startPosition: Point, + endPosition: Point }; export type Edit = { @@ -100,15 +99,8 @@ interface SyntaxNodeBase { descendantForPosition(position: Point): SyntaxNode; descendantForPosition(startPosition: Point, endPosition: Point): SyntaxNode; namedDescendantForPosition(position: Point): SyntaxNode; - namedDescendantForPosition( - startPosition: Point, - endPosition: Point - ): SyntaxNode; - descendantsOfType( - types: T | readonly T[], - startPosition?: Point, - endPosition?: Point - ): NodeOfType[]; + namedDescendantForPosition(startPosition: Point, endPosition: Point): SyntaxNode; + descendantsOfType(types: T | readonly T[], startPosition?: Point, endPosition?: Point): NodeOfType[]; closest(types: T | readonly T[]): NamedNode | null; walk(): TreeCursor; @@ -213,7 +205,7 @@ export class LookaheadIterable { } interface NamedNodeBase extends SyntaxNodeBase { - isNamed: true; + isNamed: true; } /** An unnamed node with the given type string. */ @@ -222,20 +214,12 @@ export interface UnnamedNode extends SyntaxNodeBase { isNamed: false; } -type PickNamedType = Node extends { - type: T; - isNamed: true; -} - ? Node - : never; +type PickNamedType = Node extends { type: T; isNamed: true } ? Node : never; type PickType = Node extends { type: T } ? Node : never; /** A named node with the given `type` string. */ -export type NamedNode = PickNamedType< - SyntaxNode, - T ->; +export type NamedNode = PickNamedType; /** * A node with the given `type` string. @@ -249,9 +233,7 @@ interface TreeCursorOfType { currentNode: T; } -type TreeCursorRecord = { - [K in TypeString]: TreeCursorOfType>; -}; +type TreeCursorRecord = { [K in TypeString]: TreeCursorOfType> }; /** * A tree cursor whose `nodeType` correlates with `currentNode`. @@ -278,8 +260,8 @@ type TreeCursorRecord = { export type TypedTreeCursor = TreeCursorRecord[keyof TreeCursorRecord]; export interface ErrorNode extends NamedNodeBase { - type: SyntaxType.ERROR; - hasError: true; + type: SyntaxType.ERROR; + hasError: true; } export const enum SyntaxType { @@ -427,14 +409,14 @@ export const enum SyntaxType { True = "true", TypeIdentifier = "type_identifier", UnderscorePattern = "underscore_pattern", - VoidType = "void_type" + VoidType = "void_type", } export type UnnamedType = | "!" | "!=" - | '"' - | '"""' + | "\"" + | "\"\"\"" | "%" | "%=" | "&" @@ -544,7 +526,8 @@ export type UnnamedType = | "|=" | "||" | "}" - | "~"; + | "~" + ; export type TypeString = SyntaxType | UnnamedType; @@ -683,8 +666,8 @@ export type SyntaxNode = | YieldStatementNode | UnnamedNode<"!"> | UnnamedNode<"!="> - | UnnamedNode<'"'> - | UnnamedNode<'"""'> + | UnnamedNode<"\""> + | UnnamedNode<"\"\"\""> | UnnamedNode<"%"> | UnnamedNode<"%="> | UnnamedNode<"&"> @@ -816,7 +799,8 @@ export type SyntaxNode = | UnnamedNode<"||"> | UnnamedNode<"}"> | UnnamedNode<"~"> - | ErrorNode; + | ErrorNode + ; export type LiteralNode = | BinaryIntegerLiteralNode @@ -829,7 +813,8 @@ export type LiteralNode = | NullLiteralNode | OctalIntegerLiteralNode | StringLiteralNode - | TrueNode; + | TrueNode + ; export type SimpleTypeNode = | BooleanTypeNode @@ -838,11 +823,18 @@ export type SimpleTypeNode = | IntegralTypeNode | ScopedTypeIdentifierNode | TypeIdentifierNode - | VoidTypeNode; + | VoidTypeNode + ; -export type TypeNode = UnannotatedTypeNode | AnnotatedTypeNode; +export type TypeNode = + | UnannotatedTypeNode + | AnnotatedTypeNode + ; -export type UnannotatedTypeNode = SimpleTypeNode | ArrayTypeNode; +export type UnannotatedTypeNode = + | SimpleTypeNode + | ArrayTypeNode + ; export type DeclarationNode = | AnnotationTypeDeclarationNode @@ -852,7 +844,8 @@ export type DeclarationNode = | InterfaceDeclarationNode | ModuleDeclarationNode | PackageDeclarationNode - | RecordDeclarationNode; + | RecordDeclarationNode + ; export type ExpressionNode = | AssignmentExpressionNode @@ -864,14 +857,16 @@ export type ExpressionNode = | SwitchExpressionNode | TernaryExpressionNode | UnaryExpressionNode - | UpdateExpressionNode; + | UpdateExpressionNode + ; export type ModuleDirectiveNode = | ExportsModuleDirectiveNode | OpensModuleDirectiveNode | ProvidesModuleDirectiveNode | RequiresModuleDirectiveNode - | UsesModuleDirectiveNode; + | UsesModuleDirectiveNode + ; export type PrimaryExpressionNode = | LiteralNode @@ -885,7 +880,8 @@ export type PrimaryExpressionNode = | ObjectCreationExpressionNode | ParenthesizedExpressionNode | TemplateExpressionNode - | ThisNode; + | ThisNode + ; export type StatementNode = | UnnamedNode<";"> @@ -908,7 +904,8 @@ export type StatementNode = | TryStatementNode | TryWithResourcesStatementNode | WhileStatementNode - | YieldStatementNode; + | YieldStatementNode + ; export interface AnnotatedTypeNode extends NamedNodeBase { type: SyntaxType.AnnotatedType; @@ -939,11 +936,7 @@ export interface AnnotationTypeElementDeclarationNode extends NamedNodeBase { dimensionsNode?: DimensionsNode; nameNode: IdentifierNode; typeNode: UnannotatedTypeNode; - valueNode?: - | AnnotationNode - | ElementValueArrayInitializerNode - | ExpressionNode - | MarkerAnnotationNode; + valueNode?: AnnotationNode | ElementValueArrayInitializerNode | ExpressionNode | MarkerAnnotationNode; } export interface ArgumentListNode extends NamedNodeBase { @@ -980,19 +973,7 @@ export interface AssertStatementNode extends NamedNodeBase { export interface AssignmentExpressionNode extends NamedNodeBase { type: SyntaxType.AssignmentExpression; leftNode: ArrayAccessNode | FieldAccessNode | IdentifierNode; - operatorNode: - | UnnamedNode<"%="> - | UnnamedNode<"&="> - | UnnamedNode<"*="> - | UnnamedNode<"+="> - | UnnamedNode<"-="> - | UnnamedNode<"/="> - | UnnamedNode<"<<="> - | UnnamedNode<"="> - | UnnamedNode<">>="> - | UnnamedNode<">>>="> - | UnnamedNode<"^="> - | UnnamedNode<"|=">; + operatorNode: UnnamedNode<"%="> | UnnamedNode<"&="> | UnnamedNode<"*="> | UnnamedNode<"+="> | UnnamedNode<"-="> | UnnamedNode<"/="> | UnnamedNode<"<<="> | UnnamedNode<"="> | UnnamedNode<">>="> | UnnamedNode<">>>="> | UnnamedNode<"^="> | UnnamedNode<"|=">; rightNode: ExpressionNode; } @@ -1003,26 +984,7 @@ export interface AsteriskNode extends NamedNodeBase { export interface BinaryExpressionNode extends NamedNodeBase { type: SyntaxType.BinaryExpression; leftNode: ExpressionNode; - operatorNode: - | UnnamedNode<"!="> - | UnnamedNode<"%"> - | UnnamedNode<"&"> - | UnnamedNode<"&&"> - | UnnamedNode<"*"> - | UnnamedNode<"+"> - | UnnamedNode<"-"> - | UnnamedNode<"/"> - | UnnamedNode<"<"> - | UnnamedNode<"<<"> - | UnnamedNode<"<="> - | UnnamedNode<"=="> - | UnnamedNode<">"> - | UnnamedNode<">="> - | UnnamedNode<">>"> - | UnnamedNode<">>>"> - | UnnamedNode<"^"> - | UnnamedNode<"|"> - | UnnamedNode<"||">; + operatorNode: UnnamedNode<"!="> | UnnamedNode<"%"> | UnnamedNode<"&"> | UnnamedNode<"&&"> | UnnamedNode<"*"> | UnnamedNode<"+"> | UnnamedNode<"-"> | UnnamedNode<"/"> | UnnamedNode<"<"> | UnnamedNode<"<<"> | UnnamedNode<"<="> | UnnamedNode<"=="> | UnnamedNode<">"> | UnnamedNode<">="> | UnnamedNode<">>"> | UnnamedNode<">>>"> | UnnamedNode<"^"> | UnnamedNode<"|"> | UnnamedNode<"||">; rightNode: ExpressionNode; } @@ -1122,11 +1084,7 @@ export interface ElementValueArrayInitializerNode extends NamedNodeBase { export interface ElementValuePairNode extends NamedNodeBase { type: SyntaxType.ElementValuePair; keyNode: IdentifierNode; - valueNode: - | AnnotationNode - | ElementValueArrayInitializerNode - | ExpressionNode - | MarkerAnnotationNode; + valueNode: AnnotationNode | ElementValueArrayInitializerNode | ExpressionNode | MarkerAnnotationNode; } export interface EnhancedForStatementNode extends NamedNodeBase { @@ -1275,10 +1233,7 @@ export interface LabeledStatementNode extends NamedNodeBase { export interface LambdaExpressionNode extends NamedNodeBase { type: SyntaxType.LambdaExpression; bodyNode: BlockNode | ExpressionNode; - parametersNode: - | FormalParametersNode - | IdentifierNode - | InferredParametersNode; + parametersNode: FormalParametersNode | IdentifierNode | InferredParametersNode; } export interface LocalVariableDeclarationNode extends NamedNodeBase { @@ -1549,11 +1504,7 @@ export interface TypePatternNode extends NamedNodeBase { export interface UnaryExpressionNode extends NamedNodeBase { type: SyntaxType.UnaryExpression; operandNode: ExpressionNode; - operatorNode: - | UnnamedNode<"!"> - | UnnamedNode<"+"> - | UnnamedNode<"-"> - | UnnamedNode<"~">; + operatorNode: UnnamedNode<"!"> | UnnamedNode<"+"> | UnnamedNode<"-"> | UnnamedNode<"~">; } export interface UpdateExpressionNode extends NamedNodeBase { @@ -1673,3 +1624,4 @@ export interface UnderscorePatternNode extends NamedNodeBase { export interface VoidTypeNode extends NamedNodeBase { type: SyntaxType.VoidType; } + diff --git a/packages/prettier-plugin-java/src/tree-sitter-java_orchard.wasm b/src/tree-sitter-java_orchard.wasm similarity index 100% rename from packages/prettier-plugin-java/src/tree-sitter-java_orchard.wasm rename to src/tree-sitter-java_orchard.wasm diff --git a/packages/prettier-plugin-java/test-samples/.eslintrc.json b/test-samples/.eslintrc.json similarity index 100% rename from packages/prettier-plugin-java/test-samples/.eslintrc.json rename to test-samples/.eslintrc.json diff --git a/packages/prettier-plugin-java/test/repository-test/core-test.ts b/test/repository-test/core-test.ts similarity index 100% rename from packages/prettier-plugin-java/test/repository-test/core-test.ts rename to test/repository-test/core-test.ts diff --git a/packages/prettier-plugin-java/test/repository-test/jhipster-1-test.ts b/test/repository-test/jhipster-1-test.ts similarity index 100% rename from packages/prettier-plugin-java/test/repository-test/jhipster-1-test.ts rename to test/repository-test/jhipster-1-test.ts diff --git a/packages/prettier-plugin-java/test/repository-test/jhipster-2-test.ts b/test/repository-test/jhipster-2-test.ts similarity index 100% rename from packages/prettier-plugin-java/test/repository-test/jhipster-2-test.ts rename to test/repository-test/jhipster-2-test.ts diff --git a/packages/prettier-plugin-java/test/test-utils.ts b/test/test-utils.ts similarity index 100% rename from packages/prettier-plugin-java/test/test-utils.ts rename to test/test-utils.ts diff --git a/packages/prettier-plugin-java/test/unit-test/annotation_interface_declaration/_input.java b/test/unit-test/annotation_interface_declaration/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/annotation_interface_declaration/_input.java rename to test/unit-test/annotation_interface_declaration/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/annotation_interface_declaration/_output.java b/test/unit-test/annotation_interface_declaration/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/annotation_interface_declaration/_output.java rename to test/unit-test/annotation_interface_declaration/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/annotation_interface_declaration/annotation_interface_declaration-spec.ts b/test/unit-test/annotation_interface_declaration/annotation_interface_declaration-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/annotation_interface_declaration/annotation_interface_declaration-spec.ts rename to test/unit-test/annotation_interface_declaration/annotation_interface_declaration-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/args/_input.java b/test/unit-test/args/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/args/_input.java rename to test/unit-test/args/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/args/_output.java b/test/unit-test/args/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/args/_output.java rename to test/unit-test/args/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/args/args-spec.ts b/test/unit-test/args/args-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/args/args-spec.ts rename to test/unit-test/args/args-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/arrays/_input.java b/test/unit-test/arrays/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/arrays/_input.java rename to test/unit-test/arrays/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/arrays/_output.java b/test/unit-test/arrays/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/arrays/_output.java rename to test/unit-test/arrays/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/arrays/arrays-spec.ts b/test/unit-test/arrays/arrays-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/arrays/arrays-spec.ts rename to test/unit-test/arrays/arrays-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/assert/_input.java b/test/unit-test/assert/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/assert/_input.java rename to test/unit-test/assert/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/assert/_output.java b/test/unit-test/assert/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/assert/_output.java rename to test/unit-test/assert/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/assert/assert-spec.ts b/test/unit-test/assert/assert-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/assert/assert-spec.ts rename to test/unit-test/assert/assert-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/binary_expressions/binary_expressions-spec.ts b/test/unit-test/binary_expressions/binary_expressions-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/binary_expressions/binary_expressions-spec.ts rename to test/unit-test/binary_expressions/binary_expressions-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/.prettierrc.json b/test/unit-test/binary_expressions/operator-position-end/.prettierrc.json similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/.prettierrc.json rename to test/unit-test/binary_expressions/operator-position-end/.prettierrc.json diff --git a/packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/_input.java b/test/unit-test/binary_expressions/operator-position-end/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/_input.java rename to test/unit-test/binary_expressions/operator-position-end/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/_output.java b/test/unit-test/binary_expressions/operator-position-end/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-end/_output.java rename to test/unit-test/binary_expressions/operator-position-end/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/.prettierrc.json b/test/unit-test/binary_expressions/operator-position-start/.prettierrc.json similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/.prettierrc.json rename to test/unit-test/binary_expressions/operator-position-start/.prettierrc.json diff --git a/packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/_input.java b/test/unit-test/binary_expressions/operator-position-start/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/_input.java rename to test/unit-test/binary_expressions/operator-position-start/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/_output.java b/test/unit-test/binary_expressions/operator-position-start/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/binary_expressions/operator-position-start/_output.java rename to test/unit-test/binary_expressions/operator-position-start/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/blank_lines/_input.java b/test/unit-test/blank_lines/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/blank_lines/_input.java rename to test/unit-test/blank_lines/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/blank_lines/_output.java b/test/unit-test/blank_lines/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/blank_lines/_output.java rename to test/unit-test/blank_lines/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/blank_lines/blank_lines-spec.ts b/test/unit-test/blank_lines/blank_lines-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/blank_lines/blank_lines-spec.ts rename to test/unit-test/blank_lines/blank_lines-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java b/test/unit-test/bug-fixes/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/bug-fixes/_input.java rename to test/unit-test/bug-fixes/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java b/test/unit-test/bug-fixes/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/bug-fixes/_output.java rename to test/unit-test/bug-fixes/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.ts b/test/unit-test/bug-fixes/bug-fixes-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/bug-fixes/bug-fixes-spec.ts rename to test/unit-test/bug-fixes/bug-fixes-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/cast/_input.java b/test/unit-test/cast/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/cast/_input.java rename to test/unit-test/cast/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/cast/_output.java b/test/unit-test/cast/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/cast/_output.java rename to test/unit-test/cast/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/cast/cast-spec.ts b/test/unit-test/cast/cast-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/cast/cast-spec.ts rename to test/unit-test/cast/cast-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/char_literal/_input.java b/test/unit-test/char_literal/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/char_literal/_input.java rename to test/unit-test/char_literal/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/char_literal/_output.java b/test/unit-test/char_literal/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/char_literal/_output.java rename to test/unit-test/char_literal/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/char_literal/char_literal-spec.ts b/test/unit-test/char_literal/char_literal-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/char_literal/char_literal-spec.ts rename to test/unit-test/char_literal/char_literal-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/classes/_input.java b/test/unit-test/classes/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/classes/_input.java rename to test/unit-test/classes/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/classes/_output.java b/test/unit-test/classes/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/classes/_output.java rename to test/unit-test/classes/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/classes/multiple_classes-spec.ts b/test/unit-test/classes/multiple_classes-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/classes/multiple_classes-spec.ts rename to test/unit-test/classes/multiple_classes-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/comments/bug-fixes/_input.java b/test/unit-test/comments/bug-fixes/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/bug-fixes/_input.java rename to test/unit-test/comments/bug-fixes/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/bug-fixes/_output.java b/test/unit-test/comments/bug-fixes/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/bug-fixes/_output.java rename to test/unit-test/comments/bug-fixes/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/class/_input.java b/test/unit-test/comments/class/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/class/_input.java rename to test/unit-test/comments/class/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/class/_output.java b/test/unit-test/comments/class/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/class/_output.java rename to test/unit-test/comments/class/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/complex/_input.java b/test/unit-test/comments/comments-blocks-and-statements/complex/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/complex/_input.java rename to test/unit-test/comments/comments-blocks-and-statements/complex/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/complex/_output.java b/test/unit-test/comments/comments-blocks-and-statements/complex/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/complex/_output.java rename to test/unit-test/comments/comments-blocks-and-statements/complex/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/end-of-block/_input.java b/test/unit-test/comments/comments-blocks-and-statements/end-of-block/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/end-of-block/_input.java rename to test/unit-test/comments/comments-blocks-and-statements/end-of-block/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/end-of-block/_output.java b/test/unit-test/comments/comments-blocks-and-statements/end-of-block/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/end-of-block/_output.java rename to test/unit-test/comments/comments-blocks-and-statements/end-of-block/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/if-statement/_input.java b/test/unit-test/comments/comments-blocks-and-statements/if-statement/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/if-statement/_input.java rename to test/unit-test/comments/comments-blocks-and-statements/if-statement/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/if-statement/_output.java b/test/unit-test/comments/comments-blocks-and-statements/if-statement/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/if-statement/_output.java rename to test/unit-test/comments/comments-blocks-and-statements/if-statement/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/labeled-statement/_input.java b/test/unit-test/comments/comments-blocks-and-statements/labeled-statement/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/labeled-statement/_input.java rename to test/unit-test/comments/comments-blocks-and-statements/labeled-statement/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/labeled-statement/_output.java b/test/unit-test/comments/comments-blocks-and-statements/labeled-statement/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-blocks-and-statements/labeled-statement/_output.java rename to test/unit-test/comments/comments-blocks-and-statements/labeled-statement/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-only/_input.java b/test/unit-test/comments/comments-only/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-only/_input.java rename to test/unit-test/comments/comments-only/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-only/_output.java b/test/unit-test/comments/comments-only/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-only/_output.java rename to test/unit-test/comments/comments-only/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/comments-spec.ts b/test/unit-test/comments/comments-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/comments-spec.ts rename to test/unit-test/comments/comments-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/comments/edge/_input.java b/test/unit-test/comments/edge/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/edge/_input.java rename to test/unit-test/comments/edge/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/edge/_output.java b/test/unit-test/comments/edge/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/edge/_output.java rename to test/unit-test/comments/edge/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/expression/_input.java b/test/unit-test/comments/expression/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/expression/_input.java rename to test/unit-test/comments/expression/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/expression/_output.java b/test/unit-test/comments/expression/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/expression/_output.java rename to test/unit-test/comments/expression/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/interface/_input.java b/test/unit-test/comments/interface/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/interface/_input.java rename to test/unit-test/comments/interface/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/interface/_output.java b/test/unit-test/comments/interface/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/interface/_output.java rename to test/unit-test/comments/interface/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/package/_input.java b/test/unit-test/comments/package/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/package/_input.java rename to test/unit-test/comments/package/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/comments/package/_output.java b/test/unit-test/comments/package/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/comments/package/_output.java rename to test/unit-test/comments/package/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/complex_generic_class/_input.java b/test/unit-test/complex_generic_class/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/complex_generic_class/_input.java rename to test/unit-test/complex_generic_class/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/complex_generic_class/_output.java b/test/unit-test/complex_generic_class/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/complex_generic_class/_output.java rename to test/unit-test/complex_generic_class/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/complex_generic_class/complex_generic_class-spec.ts b/test/unit-test/complex_generic_class/complex_generic_class-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/complex_generic_class/complex_generic_class-spec.ts rename to test/unit-test/complex_generic_class/complex_generic_class-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/conditional-expression/conditional-expression.spec.ts b/test/unit-test/conditional-expression/conditional-expression.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/conditional-expression/conditional-expression.spec.ts rename to test/unit-test/conditional-expression/conditional-expression.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/conditional-expression/spaces/.prettierrc.json b/test/unit-test/conditional-expression/spaces/.prettierrc.json similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/conditional-expression/spaces/.prettierrc.json rename to test/unit-test/conditional-expression/spaces/.prettierrc.json diff --git a/packages/prettier-plugin-java/test/unit-test/conditional-expression/spaces/_input.java b/test/unit-test/conditional-expression/spaces/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/conditional-expression/spaces/_input.java rename to test/unit-test/conditional-expression/spaces/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/conditional-expression/spaces/_output.java b/test/unit-test/conditional-expression/spaces/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/conditional-expression/spaces/_output.java rename to test/unit-test/conditional-expression/spaces/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/conditional-expression/tabs/.prettierrc.json b/test/unit-test/conditional-expression/tabs/.prettierrc.json similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/conditional-expression/tabs/.prettierrc.json rename to test/unit-test/conditional-expression/tabs/.prettierrc.json diff --git a/packages/prettier-plugin-java/test/unit-test/conditional-expression/tabs/_input.java b/test/unit-test/conditional-expression/tabs/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/conditional-expression/tabs/_input.java rename to test/unit-test/conditional-expression/tabs/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/conditional-expression/tabs/_output.java b/test/unit-test/conditional-expression/tabs/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/conditional-expression/tabs/_output.java rename to test/unit-test/conditional-expression/tabs/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/constructors/_input.java b/test/unit-test/constructors/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/constructors/_input.java rename to test/unit-test/constructors/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/constructors/_output.java b/test/unit-test/constructors/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/constructors/_output.java rename to test/unit-test/constructors/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/constructors/constructors-spec.ts b/test/unit-test/constructors/constructors-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/constructors/constructors-spec.ts rename to test/unit-test/constructors/constructors-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/empty_statement/_input.java b/test/unit-test/empty_statement/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/empty_statement/_input.java rename to test/unit-test/empty_statement/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/empty_statement/_output.java b/test/unit-test/empty_statement/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/empty_statement/_output.java rename to test/unit-test/empty_statement/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/empty_statement/empty_statement-spec.ts b/test/unit-test/empty_statement/empty_statement-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/empty_statement/empty_statement-spec.ts rename to test/unit-test/empty_statement/empty_statement-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/enum/_input.java b/test/unit-test/enum/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/enum/_input.java rename to test/unit-test/enum/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/enum/_output.java b/test/unit-test/enum/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/enum/_output.java rename to test/unit-test/enum/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/enum/enum-spec.ts b/test/unit-test/enum/enum-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/enum/enum-spec.ts rename to test/unit-test/enum/enum-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/expressions/_input.java b/test/unit-test/expressions/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/expressions/_input.java rename to test/unit-test/expressions/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/expressions/_output.java b/test/unit-test/expressions/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/expressions/_output.java rename to test/unit-test/expressions/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/expressions/expressions-spec.ts b/test/unit-test/expressions/expressions-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/expressions/expressions-spec.ts rename to test/unit-test/expressions/expressions-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/extends_abstract_class/_input.java b/test/unit-test/extends_abstract_class/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/extends_abstract_class/_input.java rename to test/unit-test/extends_abstract_class/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/extends_abstract_class/_output.java b/test/unit-test/extends_abstract_class/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/extends_abstract_class/_output.java rename to test/unit-test/extends_abstract_class/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/extends_abstract_class/extends_abstract_class-spec.ts b/test/unit-test/extends_abstract_class/extends_abstract_class-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/extends_abstract_class/extends_abstract_class-spec.ts rename to test/unit-test/extends_abstract_class/extends_abstract_class-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/extends_abstract_class_and_implements_interfaces/_input.java b/test/unit-test/extends_abstract_class_and_implements_interfaces/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/extends_abstract_class_and_implements_interfaces/_input.java rename to test/unit-test/extends_abstract_class_and_implements_interfaces/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/extends_abstract_class_and_implements_interfaces/_output.java b/test/unit-test/extends_abstract_class_and_implements_interfaces/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/extends_abstract_class_and_implements_interfaces/_output.java rename to test/unit-test/extends_abstract_class_and_implements_interfaces/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/extends_abstract_class_and_implements_interfaces/extends_abstract_class_and_implements_interfaces-spec.ts b/test/unit-test/extends_abstract_class_and_implements_interfaces/extends_abstract_class_and_implements_interfaces-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/extends_abstract_class_and_implements_interfaces/extends_abstract_class_and_implements_interfaces-spec.ts rename to test/unit-test/extends_abstract_class_and_implements_interfaces/extends_abstract_class_and_implements_interfaces-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/for/_input.java b/test/unit-test/for/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/for/_input.java rename to test/unit-test/for/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/for/_output.java b/test/unit-test/for/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/for/_output.java rename to test/unit-test/for/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/for/for-spec.ts b/test/unit-test/for/for-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/for/for-spec.ts rename to test/unit-test/for/for-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/begin_with_on/_input.java b/test/unit-test/formatter-on-off/begin_with_on/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/begin_with_on/_input.java rename to test/unit-test/formatter-on-off/begin_with_on/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/begin_with_on/_output.java b/test/unit-test/formatter-on-off/begin_with_on/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/begin_with_on/_output.java rename to test/unit-test/formatter-on-off/begin_with_on/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/class/_input.java b/test/unit-test/formatter-on-off/class/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/class/_input.java rename to test/unit-test/formatter-on-off/class/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/class/_output.java b/test/unit-test/formatter-on-off/class/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/class/_output.java rename to test/unit-test/formatter-on-off/class/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/end_with_off/_input.java b/test/unit-test/formatter-on-off/end_with_off/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/end_with_off/_input.java rename to test/unit-test/formatter-on-off/end_with_off/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/end_with_off/_output.java b/test/unit-test/formatter-on-off/end_with_off/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/end_with_off/_output.java rename to test/unit-test/formatter-on-off/end_with_off/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/inside_block/_input.java b/test/unit-test/formatter-on-off/inside_block/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/inside_block/_input.java rename to test/unit-test/formatter-on-off/inside_block/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/inside_block/_output.java b/test/unit-test/formatter-on-off/inside_block/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/inside_block/_output.java rename to test/unit-test/formatter-on-off/inside_block/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/method/_input.java b/test/unit-test/formatter-on-off/method/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/method/_input.java rename to test/unit-test/formatter-on-off/method/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/method/_output.java b/test/unit-test/formatter-on-off/method/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/method/_output.java rename to test/unit-test/formatter-on-off/method/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/multiple/_input.java b/test/unit-test/formatter-on-off/multiple/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/multiple/_input.java rename to test/unit-test/formatter-on-off/multiple/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/formatter-on-off/multiple/_output.java b/test/unit-test/formatter-on-off/multiple/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/formatter-on-off/multiple/_output.java rename to test/unit-test/formatter-on-off/multiple/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/generic_class/_input.java b/test/unit-test/generic_class/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/generic_class/_input.java rename to test/unit-test/generic_class/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/generic_class/_output.java b/test/unit-test/generic_class/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/generic_class/_output.java rename to test/unit-test/generic_class/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/generic_class/generic_class-spec.ts b/test/unit-test/generic_class/generic_class-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/generic_class/generic_class-spec.ts rename to test/unit-test/generic_class/generic_class-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/generic_questionmark/_input.java b/test/unit-test/generic_questionmark/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/generic_questionmark/_input.java rename to test/unit-test/generic_questionmark/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/generic_questionmark/_output.java b/test/unit-test/generic_questionmark/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/generic_questionmark/_output.java rename to test/unit-test/generic_questionmark/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/generic_questionmark/generic_questionmark-spec.ts b/test/unit-test/generic_questionmark/generic_questionmark-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/generic_questionmark/generic_questionmark-spec.ts rename to test/unit-test/generic_questionmark/generic_questionmark-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/hello-world/_input.java b/test/unit-test/hello-world/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/hello-world/_input.java rename to test/unit-test/hello-world/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/hello-world/_output.java b/test/unit-test/hello-world/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/hello-world/_output.java rename to test/unit-test/hello-world/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/hello-world/hello-word-spec.ts b/test/unit-test/hello-world/hello-word-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/hello-world/hello-word-spec.ts rename to test/unit-test/hello-world/hello-word-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/if/_input.java b/test/unit-test/if/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/if/_input.java rename to test/unit-test/if/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/if/_output.java b/test/unit-test/if/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/if/_output.java rename to test/unit-test/if/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/if/if-spec.ts b/test/unit-test/if/if-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/if/if-spec.ts rename to test/unit-test/if/if-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/indent/_input.java b/test/unit-test/indent/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/indent/_input.java rename to test/unit-test/indent/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/indent/_output.java b/test/unit-test/indent/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/indent/_output.java rename to test/unit-test/indent/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/indent/indent-spec.ts b/test/unit-test/indent/indent-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/indent/indent-spec.ts rename to test/unit-test/indent/indent-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/instantiation/_input.java b/test/unit-test/instantiation/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/instantiation/_input.java rename to test/unit-test/instantiation/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/instantiation/_output.java b/test/unit-test/instantiation/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/instantiation/_output.java rename to test/unit-test/instantiation/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/instantiation/instantiation-spec.ts b/test/unit-test/instantiation/instantiation-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/instantiation/instantiation-spec.ts rename to test/unit-test/instantiation/instantiation-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/interface/_input.java b/test/unit-test/interface/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/interface/_input.java rename to test/unit-test/interface/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/interface/_output.java b/test/unit-test/interface/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/interface/_output.java rename to test/unit-test/interface/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/interface/interface-spec.ts b/test/unit-test/interface/interface-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/interface/interface-spec.ts rename to test/unit-test/interface/interface-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/lambda/_input.java b/test/unit-test/lambda/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/lambda/_input.java rename to test/unit-test/lambda/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/lambda/_output.java b/test/unit-test/lambda/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/lambda/_output.java rename to test/unit-test/lambda/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/lambda/lambda-spec.ts b/test/unit-test/lambda/lambda-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/lambda/lambda-spec.ts rename to test/unit-test/lambda/lambda-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/marker_annotations/_input.java b/test/unit-test/marker_annotations/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/marker_annotations/_input.java rename to test/unit-test/marker_annotations/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/marker_annotations/_output.java b/test/unit-test/marker_annotations/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/marker_annotations/_output.java rename to test/unit-test/marker_annotations/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/marker_annotations/marker_annotations-spec.ts b/test/unit-test/marker_annotations/marker_annotations-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/marker_annotations/marker_annotations-spec.ts rename to test/unit-test/marker_annotations/marker_annotations-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/member_chain/_input.java b/test/unit-test/member_chain/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/member_chain/_input.java rename to test/unit-test/member_chain/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/member_chain/_output.java b/test/unit-test/member_chain/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/member_chain/_output.java rename to test/unit-test/member_chain/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/member_chain/member_chain-spec.ts b/test/unit-test/member_chain/member_chain-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/member_chain/member_chain-spec.ts rename to test/unit-test/member_chain/member_chain-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/method_reference/_input.java b/test/unit-test/method_reference/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/method_reference/_input.java rename to test/unit-test/method_reference/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/method_reference/_output.java b/test/unit-test/method_reference/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/method_reference/_output.java rename to test/unit-test/method_reference/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/method_reference/method_reference-spec.ts b/test/unit-test/method_reference/method_reference-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/method_reference/method_reference-spec.ts rename to test/unit-test/method_reference/method_reference-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/modifiers/_input.java b/test/unit-test/modifiers/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/modifiers/_input.java rename to test/unit-test/modifiers/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/modifiers/_output.java b/test/unit-test/modifiers/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/modifiers/_output.java rename to test/unit-test/modifiers/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/modifiers/modifiers-spec.ts b/test/unit-test/modifiers/modifiers-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/modifiers/modifiers-spec.ts rename to test/unit-test/modifiers/modifiers-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/modules/_input.java b/test/unit-test/modules/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/modules/_input.java rename to test/unit-test/modules/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/modules/_output.java b/test/unit-test/modules/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/modules/_output.java rename to test/unit-test/modules/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/modules/modules-spec.ts b/test/unit-test/modules/modules-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/modules/modules-spec.ts rename to test/unit-test/modules/modules-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithMixedCaseImports/_input.java b/test/unit-test/package_and_imports/classWithMixedCaseImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithMixedCaseImports/_input.java rename to test/unit-test/package_and_imports/classWithMixedCaseImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithMixedCaseImports/_output.java b/test/unit-test/package_and_imports/classWithMixedCaseImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithMixedCaseImports/_output.java rename to test/unit-test/package_and_imports/classWithMixedCaseImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithMixedImports/_input.java b/test/unit-test/package_and_imports/classWithMixedImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithMixedImports/_input.java rename to test/unit-test/package_and_imports/classWithMixedImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithMixedImports/_output.java b/test/unit-test/package_and_imports/classWithMixedImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithMixedImports/_output.java rename to test/unit-test/package_and_imports/classWithMixedImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithNoImports/_input.java b/test/unit-test/package_and_imports/classWithNoImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithNoImports/_input.java rename to test/unit-test/package_and_imports/classWithNoImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithNoImports/_output.java b/test/unit-test/package_and_imports/classWithNoImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithNoImports/_output.java rename to test/unit-test/package_and_imports/classWithNoImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithOnlyNonStaticImports/_input.java b/test/unit-test/package_and_imports/classWithOnlyNonStaticImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithOnlyNonStaticImports/_input.java rename to test/unit-test/package_and_imports/classWithOnlyNonStaticImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithOnlyNonStaticImports/_output.java b/test/unit-test/package_and_imports/classWithOnlyNonStaticImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithOnlyNonStaticImports/_output.java rename to test/unit-test/package_and_imports/classWithOnlyNonStaticImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithOnlyStaticImports/_input.java b/test/unit-test/package_and_imports/classWithOnlyStaticImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithOnlyStaticImports/_input.java rename to test/unit-test/package_and_imports/classWithOnlyStaticImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithOnlyStaticImports/_output.java b/test/unit-test/package_and_imports/classWithOnlyStaticImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/classWithOnlyStaticImports/_output.java rename to test/unit-test/package_and_imports/classWithOnlyStaticImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithMixedImports/_input.java b/test/unit-test/package_and_imports/moduleWithMixedImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithMixedImports/_input.java rename to test/unit-test/package_and_imports/moduleWithMixedImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithMixedImports/_output.java b/test/unit-test/package_and_imports/moduleWithMixedImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithMixedImports/_output.java rename to test/unit-test/package_and_imports/moduleWithMixedImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithNoImports/_input.java b/test/unit-test/package_and_imports/moduleWithNoImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithNoImports/_input.java rename to test/unit-test/package_and_imports/moduleWithNoImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithNoImports/_output.java b/test/unit-test/package_and_imports/moduleWithNoImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithNoImports/_output.java rename to test/unit-test/package_and_imports/moduleWithNoImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithOnlyNonStaticImports/_input.java b/test/unit-test/package_and_imports/moduleWithOnlyNonStaticImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithOnlyNonStaticImports/_input.java rename to test/unit-test/package_and_imports/moduleWithOnlyNonStaticImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithOnlyNonStaticImports/_output.java b/test/unit-test/package_and_imports/moduleWithOnlyNonStaticImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithOnlyNonStaticImports/_output.java rename to test/unit-test/package_and_imports/moduleWithOnlyNonStaticImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithOnlyStaticImports/_input.java b/test/unit-test/package_and_imports/moduleWithOnlyStaticImports/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithOnlyStaticImports/_input.java rename to test/unit-test/package_and_imports/moduleWithOnlyStaticImports/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithOnlyStaticImports/_output.java b/test/unit-test/package_and_imports/moduleWithOnlyStaticImports/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/moduleWithOnlyStaticImports/_output.java rename to test/unit-test/package_and_imports/moduleWithOnlyStaticImports/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/package_and_imports/package_and_imports-spec.ts b/test/unit-test/package_and_imports/package_and_imports-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/package_and_imports/package_and_imports-spec.ts rename to test/unit-test/package_and_imports/package_and_imports-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/pattern-matching/_input.java b/test/unit-test/pattern-matching/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/pattern-matching/_input.java rename to test/unit-test/pattern-matching/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/pattern-matching/_output.java b/test/unit-test/pattern-matching/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/pattern-matching/_output.java rename to test/unit-test/pattern-matching/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/pattern-matching/pattern-matching-spec.ts b/test/unit-test/pattern-matching/pattern-matching-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/pattern-matching/pattern-matching-spec.ts rename to test/unit-test/pattern-matching/pattern-matching-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/block/_input.java b/test/unit-test/prettier-ignore/block/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/block/_input.java rename to test/unit-test/prettier-ignore/block/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/block/_output.java b/test/unit-test/prettier-ignore/block/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/block/_output.java rename to test/unit-test/prettier-ignore/block/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/classDeclaration/_input.java b/test/unit-test/prettier-ignore/classDeclaration/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/classDeclaration/_input.java rename to test/unit-test/prettier-ignore/classDeclaration/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/classDeclaration/_output.java b/test/unit-test/prettier-ignore/classDeclaration/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/classDeclaration/_output.java rename to test/unit-test/prettier-ignore/classDeclaration/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/method/_input.java b/test/unit-test/prettier-ignore/method/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/method/_input.java rename to test/unit-test/prettier-ignore/method/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/method/_output.java b/test/unit-test/prettier-ignore/method/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/method/_output.java rename to test/unit-test/prettier-ignore/method/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/multiple-ignore/_input.java b/test/unit-test/prettier-ignore/multiple-ignore/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/multiple-ignore/_input.java rename to test/unit-test/prettier-ignore/multiple-ignore/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/multiple-ignore/_output.java b/test/unit-test/prettier-ignore/multiple-ignore/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/multiple-ignore/_output.java rename to test/unit-test/prettier-ignore/multiple-ignore/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/prettier-ignore/prettier-ignore-spec.ts b/test/unit-test/prettier-ignore/prettier-ignore-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/prettier-ignore/prettier-ignore-spec.ts rename to test/unit-test/prettier-ignore/prettier-ignore-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/records/_input.java b/test/unit-test/records/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/records/_input.java rename to test/unit-test/records/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/records/_output.java b/test/unit-test/records/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/records/_output.java rename to test/unit-test/records/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/records/records-spec.ts b/test/unit-test/records/records-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/records/records-spec.ts rename to test/unit-test/records/records-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/format-pragma/.prettierrc.json b/test/unit-test/require-pragma/format-pragma/.prettierrc.json similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/format-pragma/.prettierrc.json rename to test/unit-test/require-pragma/format-pragma/.prettierrc.json diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/format-pragma/_input.java b/test/unit-test/require-pragma/format-pragma/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/format-pragma/_input.java rename to test/unit-test/require-pragma/format-pragma/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/format-pragma/_output.java b/test/unit-test/require-pragma/format-pragma/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/format-pragma/_output.java rename to test/unit-test/require-pragma/format-pragma/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/invalid-pragma/.prettierrc.json b/test/unit-test/require-pragma/invalid-pragma/.prettierrc.json similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/invalid-pragma/.prettierrc.json rename to test/unit-test/require-pragma/invalid-pragma/.prettierrc.json diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/invalid-pragma/_input.java b/test/unit-test/require-pragma/invalid-pragma/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/invalid-pragma/_input.java rename to test/unit-test/require-pragma/invalid-pragma/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/invalid-pragma/_output.java b/test/unit-test/require-pragma/invalid-pragma/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/invalid-pragma/_output.java rename to test/unit-test/require-pragma/invalid-pragma/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/prettier-pragma/.prettierrc.json b/test/unit-test/require-pragma/prettier-pragma/.prettierrc.json similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/prettier-pragma/.prettierrc.json rename to test/unit-test/require-pragma/prettier-pragma/.prettierrc.json diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/prettier-pragma/_input.java b/test/unit-test/require-pragma/prettier-pragma/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/prettier-pragma/_input.java rename to test/unit-test/require-pragma/prettier-pragma/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/prettier-pragma/_output.java b/test/unit-test/require-pragma/prettier-pragma/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/prettier-pragma/_output.java rename to test/unit-test/require-pragma/prettier-pragma/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/require-pragma/require-pragma-spec.ts b/test/unit-test/require-pragma/require-pragma-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/require-pragma/require-pragma-spec.ts rename to test/unit-test/require-pragma/require-pragma-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/return/_input.java b/test/unit-test/return/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/return/_input.java rename to test/unit-test/return/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/return/_output.java b/test/unit-test/return/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/return/_output.java rename to test/unit-test/return/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/return/return-spec.ts b/test/unit-test/return/return-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/return/return-spec.ts rename to test/unit-test/return/return-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/sealed/_input.java b/test/unit-test/sealed/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/sealed/_input.java rename to test/unit-test/sealed/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/sealed/_output.java b/test/unit-test/sealed/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/sealed/_output.java rename to test/unit-test/sealed/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/sealed/sealed-spec.ts b/test/unit-test/sealed/sealed-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/sealed/sealed-spec.ts rename to test/unit-test/sealed/sealed-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/arrays/array-initializer.spec.ts b/test/unit-test/snippets/arrays/array-initializer.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/arrays/array-initializer.spec.ts rename to test/unit-test/snippets/arrays/array-initializer.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/arrays/variable-initializer-list.spec.ts b/test/unit-test/snippets/arrays/variable-initializer-list.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/arrays/variable-initializer-list.spec.ts rename to test/unit-test/snippets/arrays/variable-initializer-list.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/blocks-and-statements/switch.spec.ts b/test/unit-test/snippets/blocks-and-statements/switch.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/blocks-and-statements/switch.spec.ts rename to test/unit-test/snippets/blocks-and-statements/switch.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/classes/class-body.spec.ts b/test/unit-test/snippets/classes/class-body.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/classes/class-body.spec.ts rename to test/unit-test/snippets/classes/class-body.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/classes/enum-body.spec.ts b/test/unit-test/snippets/classes/enum-body.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/classes/enum-body.spec.ts rename to test/unit-test/snippets/classes/enum-body.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/classes/variableDeclarator/test.spec.ts b/test/unit-test/snippets/classes/variableDeclarator/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/classes/variableDeclarator/test.spec.ts rename to test/unit-test/snippets/classes/variableDeclarator/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/interfaces/element-value-array-initializer.spec.ts b/test/unit-test/snippets/interfaces/element-value-array-initializer.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/interfaces/element-value-array-initializer.spec.ts rename to test/unit-test/snippets/interfaces/element-value-array-initializer.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/names/ambiguousName/test.spec.ts b/test/unit-test/snippets/names/ambiguousName/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/names/ambiguousName/test.spec.ts rename to test/unit-test/snippets/names/ambiguousName/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/names/expressionName/test.spec.ts b/test/unit-test/snippets/names/expressionName/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/names/expressionName/test.spec.ts rename to test/unit-test/snippets/names/expressionName/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/names/methodName/test.spec.ts b/test/unit-test/snippets/names/methodName/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/names/methodName/test.spec.ts rename to test/unit-test/snippets/names/methodName/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/names/packageOrTypeName/test.spec.ts b/test/unit-test/snippets/names/packageOrTypeName/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/names/packageOrTypeName/test.spec.ts rename to test/unit-test/snippets/names/packageOrTypeName/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/floatingPointType/test.spec.ts b/test/unit-test/snippets/types-values-and-variables/floatingPointType/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/floatingPointType/test.spec.ts rename to test/unit-test/snippets/types-values-and-variables/floatingPointType/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/integralType/test.spec.ts b/test/unit-test/snippets/types-values-and-variables/integralType/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/integralType/test.spec.ts rename to test/unit-test/snippets/types-values-and-variables/integralType/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/numericType/test.spec.ts b/test/unit-test/snippets/types-values-and-variables/numericType/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/numericType/test.spec.ts rename to test/unit-test/snippets/types-values-and-variables/numericType/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/wildcard/test.spec.ts b/test/unit-test/snippets/types-values-and-variables/wildcard/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/wildcard/test.spec.ts rename to test/unit-test/snippets/types-values-and-variables/wildcard/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/wildcardBounds/test.spec.ts b/test/unit-test/snippets/types-values-and-variables/wildcardBounds/test.spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/snippets/types-values-and-variables/wildcardBounds/test.spec.ts rename to test/unit-test/snippets/types-values-and-variables/wildcardBounds/test.spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/switch/_input.java b/test/unit-test/switch/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/switch/_input.java rename to test/unit-test/switch/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/switch/_output.java b/test/unit-test/switch/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/switch/_output.java rename to test/unit-test/switch/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/switch/switch-spec.ts b/test/unit-test/switch/switch-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/switch/switch-spec.ts rename to test/unit-test/switch/switch-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/synchronized/_input.java b/test/unit-test/synchronized/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/synchronized/_input.java rename to test/unit-test/synchronized/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/synchronized/_output.java b/test/unit-test/synchronized/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/synchronized/_output.java rename to test/unit-test/synchronized/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/synchronized/synchronized-spec.ts b/test/unit-test/synchronized/synchronized-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/synchronized/synchronized-spec.ts rename to test/unit-test/synchronized/synchronized-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/template-expression/_input.java b/test/unit-test/template-expression/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/template-expression/_input.java rename to test/unit-test/template-expression/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/template-expression/_output.java b/test/unit-test/template-expression/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/template-expression/_output.java rename to test/unit-test/template-expression/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/template-expression/template-expression-spec.ts b/test/unit-test/template-expression/template-expression-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/template-expression/template-expression-spec.ts rename to test/unit-test/template-expression/template-expression-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/text-blocks/_input.java b/test/unit-test/text-blocks/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/text-blocks/_input.java rename to test/unit-test/text-blocks/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/text-blocks/_output.java b/test/unit-test/text-blocks/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/text-blocks/_output.java rename to test/unit-test/text-blocks/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/text-blocks/text-block-spec.ts b/test/unit-test/text-blocks/text-block-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/text-blocks/text-block-spec.ts rename to test/unit-test/text-blocks/text-block-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/throws/_input.java b/test/unit-test/throws/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/throws/_input.java rename to test/unit-test/throws/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/throws/_output.java b/test/unit-test/throws/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/throws/_output.java rename to test/unit-test/throws/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/throws/throws-spec.ts b/test/unit-test/throws/throws-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/throws/throws-spec.ts rename to test/unit-test/throws/throws-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/try_catch/_input.java b/test/unit-test/try_catch/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/try_catch/_input.java rename to test/unit-test/try_catch/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/try_catch/_output.java b/test/unit-test/try_catch/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/try_catch/_output.java rename to test/unit-test/try_catch/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/try_catch/try_catch-spec.ts b/test/unit-test/try_catch/try_catch-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/try_catch/try_catch-spec.ts rename to test/unit-test/try_catch/try_catch-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/types/_input.java b/test/unit-test/types/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/types/_input.java rename to test/unit-test/types/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/types/_output.java b/test/unit-test/types/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/types/_output.java rename to test/unit-test/types/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/types/types-spec.ts b/test/unit-test/types/types-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/types/types-spec.ts rename to test/unit-test/types/types-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/unnamed-class-compilation-unit/_input.java b/test/unit-test/unnamed-class-compilation-unit/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/unnamed-class-compilation-unit/_input.java rename to test/unit-test/unnamed-class-compilation-unit/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/unnamed-class-compilation-unit/_output.java b/test/unit-test/unnamed-class-compilation-unit/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/unnamed-class-compilation-unit/_output.java rename to test/unit-test/unnamed-class-compilation-unit/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/unnamed-class-compilation-unit/unnamed-class-compilation-unit-spec.ts b/test/unit-test/unnamed-class-compilation-unit/unnamed-class-compilation-unit-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/unnamed-class-compilation-unit/unnamed-class-compilation-unit-spec.ts rename to test/unit-test/unnamed-class-compilation-unit/unnamed-class-compilation-unit-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/unnamed-variables-and-patterns/_input.java b/test/unit-test/unnamed-variables-and-patterns/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/unnamed-variables-and-patterns/_input.java rename to test/unit-test/unnamed-variables-and-patterns/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/unnamed-variables-and-patterns/_output.java b/test/unit-test/unnamed-variables-and-patterns/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/unnamed-variables-and-patterns/_output.java rename to test/unit-test/unnamed-variables-and-patterns/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/unnamed-variables-and-patterns/unnamed-variables-and-patterns-spec.ts b/test/unit-test/unnamed-variables-and-patterns/unnamed-variables-and-patterns-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/unnamed-variables-and-patterns/unnamed-variables-and-patterns-spec.ts rename to test/unit-test/unnamed-variables-and-patterns/unnamed-variables-and-patterns-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/variables/_input.java b/test/unit-test/variables/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/variables/_input.java rename to test/unit-test/variables/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/variables/_output.java b/test/unit-test/variables/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/variables/_output.java rename to test/unit-test/variables/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/variables/variables-spec.ts b/test/unit-test/variables/variables-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/variables/variables-spec.ts rename to test/unit-test/variables/variables-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/while/_input.java b/test/unit-test/while/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/while/_input.java rename to test/unit-test/while/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/while/_output.java b/test/unit-test/while/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/while/_output.java rename to test/unit-test/while/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/while/while-spec.ts b/test/unit-test/while/while-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/while/while-spec.ts rename to test/unit-test/while/while-spec.ts diff --git a/packages/prettier-plugin-java/test/unit-test/yield-statement/_input.java b/test/unit-test/yield-statement/_input.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/yield-statement/_input.java rename to test/unit-test/yield-statement/_input.java diff --git a/packages/prettier-plugin-java/test/unit-test/yield-statement/_output.java b/test/unit-test/yield-statement/_output.java similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/yield-statement/_output.java rename to test/unit-test/yield-statement/_output.java diff --git a/packages/prettier-plugin-java/test/unit-test/yield-statement/yield-statement-spec.ts b/test/unit-test/yield-statement/yield-statement-spec.ts similarity index 100% rename from packages/prettier-plugin-java/test/unit-test/yield-statement/yield-statement-spec.ts rename to test/unit-test/yield-statement/yield-statement-spec.ts diff --git a/packages/prettier-plugin-java/tsconfig.json b/tsconfig.json similarity index 100% rename from packages/prettier-plugin-java/tsconfig.json rename to tsconfig.json diff --git a/website/docusaurus.config.ts b/website/docusaurus.config.ts index 70935ac3f..2e25e2e39 100644 --- a/website/docusaurus.config.ts +++ b/website/docusaurus.config.ts @@ -1,10 +1,7 @@ import type { Options, ThemeConfig } from "@docusaurus/preset-classic"; import type { Config } from "@docusaurus/types"; import { themes } from "prism-react-renderer"; -import { - homepage, - repository -} from "../packages/prettier-plugin-java/package.json"; +import { homepage, repository } from "../package.json"; const { origin: url, pathname: baseUrl } = new URL(homepage); const [, organizationName, projectName] = new URL(repository).pathname.split( diff --git a/website/package.json b/website/package.json index e63994e04..4b829471c 100644 --- a/website/package.json +++ b/website/package.json @@ -21,7 +21,7 @@ "@monaco-editor/react": "^4", "lz-string": "^1", "prettier": "^3", - "prettier-plugin-java": "file:../packages/prettier-plugin-java/dist", + "prettier-plugin-java": "file:../dist", "prism-react-renderer": "^2", "react": "^19", "react-dom": "^19" diff --git a/website/yarn.lock b/website/yarn.lock index 95cbef91a..9373062db 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -7108,7 +7108,7 @@ postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.33, postcss@^8.5.4: picocolors "^1.1.1" source-map-js "^1.2.1" -"prettier-plugin-java@file:../packages/prettier-plugin-java/dist": +"prettier-plugin-java@file:../dist": version "0.0.0" prettier@^3: diff --git a/yarn.lock b/yarn.lock index 489e3872f..93f27b349 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,14 +2,14 @@ # yarn lockfile v1 -"@asgerf/dts-tree-sitter@0.21.0": +"@asgerf/dts-tree-sitter@^0.21.0": version "0.21.0" resolved "https://registry.yarnpkg.com/@asgerf/dts-tree-sitter/-/dts-tree-sitter-0.21.0.tgz#d95820e2ae50408bc97e7fd94048916aaf4fe53d" integrity sha512-habiFcvSC1BjO818ETw0DTrlwrTsf2rKJLm+qzUAr+NcY4HLNkJKgAveru+Gk7p8GseBrH5wcZHfFyW1jgxT0A== dependencies: tree-sitter "^0.21.1" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13": +"@babel/code-frame@^7.0.0": version "7.29.0" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.0.tgz#7cd7a59f15b3cc0dcd803038f7792712a7d0b15c" integrity sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw== @@ -52,70 +52,57 @@ dependencies: tslib "^2.4.0" -"@eslint-community/eslint-utils@^4.2.0": +"@eslint-community/eslint-utils@^4.8.0", "@eslint-community/eslint-utils@^4.9.1": version "4.9.1" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz#4e90af67bc51ddee6cdef5284edf572ec376b595" integrity sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ== dependencies: eslint-visitor-keys "^3.4.3" -"@eslint-community/regexpp@^4.12.1": +"@eslint-community/regexpp@^4.12.2": version "4.12.2" resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b" integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew== -"@eslint/config-array@^0.18.0": - version "0.18.0" - resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d" - integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw== +"@eslint/config-array@^0.23.3": + version "0.23.3" + resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.23.3.tgz#3f4a93dd546169c09130cbd10f2415b13a20a219" + integrity sha512-j+eEWmB6YYLwcNOdlwQ6L2OsptI/LO6lNBuLIqe5R7RetD658HLoF+Mn7LzYmAWWNNzdC6cqP+L6r8ujeYXWLw== dependencies: - "@eslint/object-schema" "^2.1.4" + "@eslint/object-schema" "^3.0.3" debug "^4.3.1" - minimatch "^3.1.2" + minimatch "^10.2.4" -"@eslint/core@^0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.13.0.tgz#bf02f209846d3bf996f9e8009db62df2739b458c" - integrity sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw== +"@eslint/config-helpers@^0.5.2": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@eslint/config-helpers/-/config-helpers-0.5.3.tgz#721fe6bbb90d74b0c80d6ff2428e5bbcb002becb" + integrity sha512-lzGN0onllOZCGroKJmRwY6QcEHxbjBw1gwB8SgRSqK8YbbtEXMvKynsXc3553ckIEBxsbMBU7oOZXKIPGZNeZw== dependencies: - "@types/json-schema" "^7.0.15" - -"@eslint/core@^0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.7.0.tgz#a1bb4b6a4e742a5ff1894b7ee76fbf884ec72bd3" - integrity sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw== + "@eslint/core" "^1.1.1" -"@eslint/eslintrc@^3.1.0": - version "3.3.4" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.3.4.tgz#e402b1920f7c1f5a15342caa432b1348cacbb641" - integrity sha512-4h4MVF8pmBsncB60r0wSJiIeUKTSD4m7FmTFThG8RHlsg9ajqckLm9OraguFGZE4vVdpiI1Q4+hFnisopmG6gQ== +"@eslint/core@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@eslint/core/-/core-1.1.1.tgz#450f3d2be2d463ccd51119544092256b4e88df32" + integrity sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ== dependencies: - ajv "^6.14.0" - debug "^4.3.2" - espree "^10.0.1" - globals "^14.0.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.1" - minimatch "^3.1.3" - strip-json-comments "^3.1.1" + "@types/json-schema" "^7.0.15" -"@eslint/js@9.14.0": - version "9.14.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.14.0.tgz#2347a871042ebd11a00fd8c2d3d56a265ee6857e" - integrity sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg== +"@eslint/js@^10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-10.0.1.tgz#1e8a876f50117af8ab67e47d5ad94d38d6622583" + integrity sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA== -"@eslint/object-schema@^2.1.4": - version "2.1.7" - resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.7.tgz#6e2126a1347e86a4dedf8706ec67ff8e107ebbad" - integrity sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA== +"@eslint/object-schema@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-3.0.3.tgz#5bf671e52e382e4adc47a9906f2699374637db6b" + integrity sha512-iM869Pugn9Nsxbh/YHRqYiqd23AmIbxJOcpUMOuWCVNdoQJ5ZtwL6h3t0bcZzJUlC3Dq9jCFCESBZnX0GTv7iQ== -"@eslint/plugin-kit@^0.2.0": - version "0.2.8" - resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz#47488d8f8171b5d4613e833313f3ce708e3525f8" - integrity sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA== +"@eslint/plugin-kit@^0.6.1": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.6.1.tgz#eb9e6689b56ce8bc1855bb33090e63f3fc115e8e" + integrity sha512-iH1B076HoAshH1mLpHMgwdGeTs0CYwL0SPMkGuSebZrwBp16v415e9NZXg2jtrqPVQjf6IANe2Vtlr5KswtcZQ== dependencies: - "@eslint/core" "^0.13.0" + "@eslint/core" "^1.1.1" levn "^0.4.1" "@humanfs/core@^0.19.1": @@ -136,7 +123,7 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== -"@humanwhocodes/retry@^0.4.0": +"@humanwhocodes/retry@^0.4.0", "@humanwhocodes/retry@^0.4.2": version "0.4.3" resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.3.tgz#c2b9d2e374ee62c586d3adbea87199b1d7a7a6ba" integrity sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ== @@ -171,13 +158,6 @@ resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b" integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ== -"@jest/expect-utils@^29.7.0": - version "29.7.0" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6" - integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA== - dependencies: - jest-get-type "^29.6.3" - "@jest/schemas@^29.6.3": version "29.6.3" resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03" @@ -185,18 +165,6 @@ dependencies: "@sinclair/typebox" "^0.27.8" -"@jest/types@^29.6.3": - version "29.6.3" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59" - integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw== - dependencies: - "@jest/schemas" "^29.6.3" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - "@jridgewell/resolve-uri@^3.0.3": version "3.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" @@ -215,17 +183,17 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@lerna/create@8.1.9": - version "8.1.9" - resolved "https://registry.yarnpkg.com/@lerna/create/-/create-8.1.9.tgz#6ab7b8514a9a200a4bacb7fa6cf6f01d82d3a154" - integrity sha512-DPnl5lPX4v49eVxEbJnAizrpMdMTBz1qykZrAbBul9rfgk531v8oAt+Pm6O/rpAleRombNM7FJb5rYGzBJatOQ== +"@lerna/create@8.2.4": + version "8.2.4" + resolved "https://registry.yarnpkg.com/@lerna/create/-/create-8.2.4.tgz#59a050f58681e9236db38cc5bcc6986ae79d1389" + integrity sha512-A8AlzetnS2WIuhijdAzKUyFpR5YbLLfV3luQ4lzBgIBgRfuoBDZeF+RSZPhra+7A6/zTUlrbhKZIOi/MNhqgvQ== dependencies: "@npmcli/arborist" "7.5.4" "@npmcli/package-json" "5.2.0" "@npmcli/run-script" "8.1.0" "@nx/devkit" ">=17.1.2 < 21" "@octokit/plugin-enterprise-rest" "6.0.1" - "@octokit/rest" "19.0.11" + "@octokit/rest" "20.1.2" aproba "2.0.0" byte-size "8.1.1" chalk "4.1.0" @@ -243,7 +211,6 @@ get-stream "6.0.0" git-url-parse "14.0.0" glob-parent "6.0.2" - globby "11.1.0" graceful-fs "4.2.11" has-unicode "2.0.1" ini "^1.3.8" @@ -254,7 +221,6 @@ js-yaml "4.1.0" libnpmpublish "9.0.9" load-json-file "6.2.0" - lodash "^4.17.21" make-dir "4.0.0" minimatch "3.0.5" multimatch "5.0.0" @@ -278,10 +244,10 @@ slash "^3.0.0" ssri "^10.0.6" string-width "^4.2.3" - strip-ansi "^6.0.1" - strong-log-transformer "2.1.0" tar "6.2.1" temp-dir "1.0.0" + through "2.3.8" + tinyglobby "0.2.12" upath "2.0.1" uuid "^10.0.0" validate-npm-package-license "^3.0.4" @@ -301,27 +267,6 @@ "@emnapi/runtime" "^1.1.0" "@tybys/wasm-util" "^0.9.0" -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - "@npmcli/agent@^2.0.0": version "2.2.2" resolved "https://registry.yarnpkg.com/@npmcli/agent/-/agent-2.2.2.tgz#967604918e62f620a648c7975461c9c9e74fc5d5" @@ -556,121 +501,105 @@ resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.8.4.tgz#4f11cc0ce9ef6ace20764b1a2897e929f1c17844" integrity sha512-JxuuZc4h8EBqoYAiRHwskimpTJx70yn4lhIRFBoW5ICkxXW1Rw0yip/1UVsWRHXg/x9BxmH7VVazdfaQWmGu6A== -"@octokit/auth-token@^3.0.0": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-3.0.4.tgz#70e941ba742bdd2b49bdb7393e821dea8520a3db" - integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ== - -"@octokit/core@^4.2.1": - version "4.2.4" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.4.tgz#d8769ec2b43ff37cc3ea89ec4681a20ba58ef907" - integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ== - dependencies: - "@octokit/auth-token" "^3.0.0" - "@octokit/graphql" "^5.0.0" - "@octokit/request" "^6.0.0" - "@octokit/request-error" "^3.0.0" - "@octokit/types" "^9.0.0" +"@octokit/auth-token@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-4.0.0.tgz#40d203ea827b9f17f42a29c6afb93b7745ef80c7" + integrity sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA== + +"@octokit/core@^5.0.2": + version "5.2.2" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-5.2.2.tgz#252805732de9b4e8e4f658d34b80c4c9b2534761" + integrity sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg== + dependencies: + "@octokit/auth-token" "^4.0.0" + "@octokit/graphql" "^7.1.0" + "@octokit/request" "^8.4.1" + "@octokit/request-error" "^5.1.1" + "@octokit/types" "^13.0.0" before-after-hook "^2.2.0" universal-user-agent "^6.0.0" -"@octokit/endpoint@^7.0.0": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-7.0.6.tgz#791f65d3937555141fb6c08f91d618a7d645f1e2" - integrity sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg== +"@octokit/endpoint@^9.0.6": + version "9.0.6" + resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-9.0.6.tgz#114d912108fe692d8b139cfe7fc0846dfd11b6c0" + integrity sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw== dependencies: - "@octokit/types" "^9.0.0" - is-plain-object "^5.0.0" + "@octokit/types" "^13.1.0" universal-user-agent "^6.0.0" -"@octokit/graphql@^5.0.0": - version "5.0.6" - resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-5.0.6.tgz#9eac411ac4353ccc5d3fca7d76736e6888c5d248" - integrity sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw== +"@octokit/graphql@^7.1.0": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-7.1.1.tgz#79d9f3d0c96a8fd13d64186fe5c33606d48b79cc" + integrity sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g== dependencies: - "@octokit/request" "^6.0.0" - "@octokit/types" "^9.0.0" + "@octokit/request" "^8.4.1" + "@octokit/types" "^13.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^18.0.0": - version "18.1.1" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.1.1.tgz#09bdfdabfd8e16d16324326da5148010d765f009" - integrity sha512-VRaeH8nCDtF5aXWnjPuEMIYf1itK/s3JYyJcWFJT8X9pSNnBtriDf7wlEWsGuhPLl4QIH4xM8fqTXDwJ3Mu6sw== +"@octokit/openapi-types@^24.2.0": + version "24.2.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-24.2.0.tgz#3d55c32eac0d38da1a7083a9c3b0cca77924f7d3" + integrity sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg== "@octokit/plugin-enterprise-rest@6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437" integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw== -"@octokit/plugin-paginate-rest@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz#f86456a7a1fe9e58fec6385a85cf1b34072341f8" - integrity sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ== +"@octokit/plugin-paginate-rest@11.4.4-cjs.2": + version "11.4.4-cjs.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.4.4-cjs.2.tgz#979a10d577bce7a393e8e65953887e42b0a05000" + integrity sha512-2dK6z8fhs8lla5PaOTgqfCGBxgAv/le+EhPs27KklPhm1bKObpu6lXzwfUEQ16ajXzqNrKMujsFyo9K2eaoISw== dependencies: - "@octokit/tsconfig" "^1.0.2" - "@octokit/types" "^9.2.3" + "@octokit/types" "^13.7.0" -"@octokit/plugin-request-log@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85" - integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA== +"@octokit/plugin-request-log@^4.0.0": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-4.0.1.tgz#98a3ca96e0b107380664708111864cb96551f958" + integrity sha512-GihNqNpGHorUrO7Qa9JbAl0dbLnqJVrV8OXe2Zm5/Y4wFkZQDfTreBzVmiRfJVfE4mClXdihHnbpyyO9FSX4HA== -"@octokit/plugin-rest-endpoint-methods@^7.1.2": - version "7.2.3" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz#37a84b171a6cb6658816c82c4082ac3512021797" - integrity sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA== +"@octokit/plugin-rest-endpoint-methods@13.3.2-cjs.1": + version "13.3.2-cjs.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.3.2-cjs.1.tgz#d0a142ff41d8f7892b6ccef45979049f51ecaa8d" + integrity sha512-VUjIjOOvF2oELQmiFpWA1aOPdawpyaCUqcEBc/UOUnj3Xp6DJGrJ1+bjUIIDzdHjnFNO6q57ODMfdEZnoBkCwQ== dependencies: - "@octokit/types" "^10.0.0" + "@octokit/types" "^13.8.0" -"@octokit/request-error@^3.0.0": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-3.0.3.tgz#ef3dd08b8e964e53e55d471acfe00baa892b9c69" - integrity sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ== +"@octokit/request-error@^5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-5.1.1.tgz#b9218f9c1166e68bb4d0c89b638edc62c9334805" + integrity sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g== dependencies: - "@octokit/types" "^9.0.0" + "@octokit/types" "^13.1.0" deprecation "^2.0.0" once "^1.4.0" -"@octokit/request@^6.0.0": - version "6.2.8" - resolved "https://registry.yarnpkg.com/@octokit/request/-/request-6.2.8.tgz#aaf480b32ab2b210e9dadd8271d187c93171d8eb" - integrity sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw== +"@octokit/request@^8.4.1": + version "8.4.1" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-8.4.1.tgz#715a015ccf993087977ea4365c44791fc4572486" + integrity sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw== dependencies: - "@octokit/endpoint" "^7.0.0" - "@octokit/request-error" "^3.0.0" - "@octokit/types" "^9.0.0" - is-plain-object "^5.0.0" - node-fetch "^2.6.7" + "@octokit/endpoint" "^9.0.6" + "@octokit/request-error" "^5.1.1" + "@octokit/types" "^13.1.0" universal-user-agent "^6.0.0" -"@octokit/rest@19.0.11": - version "19.0.11" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.11.tgz#2ae01634fed4bd1fca5b642767205ed3fd36177c" - integrity sha512-m2a9VhaP5/tUw8FwfnW2ICXlXpLPIqxtg3XcAiGMLj/Xhw3RSBfZ8le/466ktO1Gcjr8oXudGnHhxV1TXJgFxw== - dependencies: - "@octokit/core" "^4.2.1" - "@octokit/plugin-paginate-rest" "^6.1.2" - "@octokit/plugin-request-log" "^1.0.4" - "@octokit/plugin-rest-endpoint-methods" "^7.1.2" - -"@octokit/tsconfig@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@octokit/tsconfig/-/tsconfig-1.0.2.tgz#59b024d6f3c0ed82f00d08ead5b3750469125af7" - integrity sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA== - -"@octokit/types@^10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-10.0.0.tgz#7ee19c464ea4ada306c43f1a45d444000f419a4a" - integrity sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg== +"@octokit/rest@20.1.2": + version "20.1.2" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-20.1.2.tgz#1d74d0c72ade0d64f7c5416448d5c885f5e3ccc4" + integrity sha512-GmYiltypkHHtihFwPRxlaorG5R9VAHuk/vbszVoRTGXnAsY60wYLkh/E2XiFmdZmqrisw+9FaazS1i5SbdWYgA== dependencies: - "@octokit/openapi-types" "^18.0.0" + "@octokit/core" "^5.0.2" + "@octokit/plugin-paginate-rest" "11.4.4-cjs.2" + "@octokit/plugin-request-log" "^4.0.0" + "@octokit/plugin-rest-endpoint-methods" "13.3.2-cjs.1" -"@octokit/types@^9.0.0", "@octokit/types@^9.2.3": - version "9.3.2" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.3.2.tgz#3f5f89903b69f6a2d196d78ec35f888c0013cac5" - integrity sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA== +"@octokit/types@^13.0.0", "@octokit/types@^13.1.0", "@octokit/types@^13.7.0", "@octokit/types@^13.8.0": + version "13.10.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-13.10.0.tgz#3e7c6b19c0236c270656e4ea666148c2b51fd1a3" + integrity sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA== dependencies: - "@octokit/openapi-types" "^18.0.0" + "@octokit/openapi-types" "^24.2.0" "@pkgjs/parseargs@^0.11.0": version "0.11.0" @@ -728,33 +657,6 @@ resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.10.tgz#beefe675f1853f73676aecc915b2bd2ac98c4fc6" integrity sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA== -"@sinonjs/commons@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd" - integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ== - dependencies: - type-detect "4.0.8" - -"@sinonjs/fake-timers@^13.0.1", "@sinonjs/fake-timers@^13.0.2": - version "13.0.5" - resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz#36b9dbc21ad5546486ea9173d6bea063eb1717d5" - integrity sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw== - dependencies: - "@sinonjs/commons" "^3.0.1" - -"@sinonjs/samsam@^8.0.1": - version "8.0.3" - resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-8.0.3.tgz#eb6ffaef421e1e27783cc9b52567de20cb28072d" - integrity sha512-hw6HbX+GyVZzmaYNh82Ecj1vdGZrqVIn/keDTg63IgAwiQPO+xCz99uG6Woqgb4tM0mUiFENKZ4cqd7IX94AXQ== - dependencies: - "@sinonjs/commons" "^3.0.1" - type-detect "^4.1.0" - -"@sinonjs/text-encoding@^0.7.3": - version "0.7.3" - resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz#282046f03e886e352b2d5f5da5eb755e01457f3f" - integrity sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA== - "@tsconfig/node10@^1.0.7": version "1.0.12" resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.12.tgz#be57ceac1e4692b41be9de6be8c32a106636dba4" @@ -795,29 +697,35 @@ dependencies: tslib "^2.4.0" -"@types/chai@5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.0.1.tgz#2c3705555cf11f5f59c836a84c44afcfe4e5689d" - integrity sha512-5T8ajsg3M/FOncpLYW7sdOcD6yf4+722sze/tc4KQV0P8Z2rAr3SAuHCIkYmYpt8VbcQlnz8SxlOlPQYefe4cA== +"@types/chai@^5.0.1": + version "5.2.3" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-5.2.3.tgz#8e9cd9e1c3581fa6b341a5aed5588eb285be0b4a" + integrity sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA== dependencies: "@types/deep-eql" "*" + assertion-error "^2.0.1" "@types/deep-eql@*": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/deep-eql/-/deep-eql-4.0.2.tgz#334311971d3a07121e7eb91b684a605e7eea9cbd" integrity sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw== -"@types/emscripten@1.41.5": +"@types/emscripten@^1.41.5": version "1.41.5" resolved "https://registry.yarnpkg.com/@types/emscripten/-/emscripten-1.41.5.tgz#5670e4b52b098691cb844b84ee48c9176699b68d" integrity sha512-cMQm7pxu6BxtHyqJ7mQZ2kXWV5SLmugybFdHCBbJ5eHzOo6VhBckEgAT3//rP5FwPHNPeEiq4SmQ5ucBwsOo4Q== -"@types/estree@^1.0.6": +"@types/esrecurse@^4.3.1": + version "4.3.1" + resolved "https://registry.yarnpkg.com/@types/esrecurse/-/esrecurse-4.3.1.tgz#6f636af962fbe6191b830bd676ba5986926bccec" + integrity sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw== + +"@types/estree@^1.0.6", "@types/estree@^1.0.8": version "1.0.8" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e" integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w== -"@types/fs-extra@11.0.4": +"@types/fs-extra@^11.0.4": version "11.0.4" resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-11.0.4.tgz#e16a863bb8843fba8c5004362b5a73e17becca45" integrity sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ== @@ -825,33 +733,6 @@ "@types/jsonfile" "*" "@types/node" "*" -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7" - integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w== - -"@types/istanbul-lib-report@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf" - integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54" - integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/jest@29.5.14": - version "29.5.14" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.14.tgz#2b910912fa1d6856cadcd0c1f95af7df1d6049e5" - integrity sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ== - dependencies: - expect "^29.0.0" - pretty-format "^29.0.0" - "@types/json-schema@^7.0.15": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" @@ -864,7 +745,7 @@ dependencies: "@types/node" "*" -"@types/klaw-sync@6.0.5": +"@types/klaw-sync@^6.0.5": version "6.0.5" resolved "https://registry.yarnpkg.com/@types/klaw-sync/-/klaw-sync-6.0.5.tgz#0a87fa0762673a1a1d2e7b08a51d5d65f0c842cd" integrity sha512-xlavCRyu5ibDjsOc7PSgeUbwOBZdnJsND8gFUVfBilplbBIWhLZVjwtqbZq0327ny3jNt7oviEh5NS9a4LudeQ== @@ -881,6 +762,11 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e" integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== +"@types/mocha@^10.0.10": + version "10.0.10" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.10.tgz#91f62905e8d23cbd66225312f239454a23bebfa0" + integrity sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q== + "@types/node@*": version "25.3.3" resolved "https://registry.yarnpkg.com/@types/node/-/node-25.3.3.tgz#605862544ee7ffd7a936bcbf0135a14012f1e549" @@ -888,10 +774,10 @@ dependencies: undici-types "~7.18.0" -"@types/node@18.19.64": - version "18.19.64" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.64.tgz#122897fb79f2a9ec9c979bded01c11461b2b1478" - integrity sha512-955mDqvO2vFf/oL7V3WiUtiz+BugyX8uVbaT2H8oj3+8dRyH2FLiNdowe7eNqRM7IOIZvzDH76EoAT+gwm6aIQ== +"@types/node@^18.19.64": + version "18.19.130" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.130.tgz#da4c6324793a79defb7a62cba3947ec5add00d59" + integrity sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg== dependencies: undici-types "~5.26.4" @@ -900,34 +786,101 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901" integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA== -"@types/sinon@17.0.3": - version "17.0.3" - resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-17.0.3.tgz#9aa7e62f0a323b9ead177ed23a36ea757141a5fa" - integrity sha512-j3uovdn8ewky9kRBG19bOwaZbexJu/XjtkHyjvUgt4xfPFz18dcORIMqnYh66Fx3Powhcr85NT5+er3+oViapw== - dependencies: - "@types/sinonjs__fake-timers" "*" - -"@types/sinonjs__fake-timers@*": - version "15.0.1" - resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-15.0.1.tgz#49f731d9453f52d64dd79f5a5626c1cf1b81bea4" - integrity sha512-Ko2tjWJq8oozHzHV+reuvS5KYIRAokHnGbDwGh/J64LntgpbuylF74ipEL24HCyRjf9FOlBiBHWBR1RlVKsI1w== - -"@types/stack-utils@^2.0.0": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8" - integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw== - -"@types/yargs-parser@*": - version "21.0.3" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" - integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== - -"@types/yargs@^17.0.8": - version "17.0.35" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.35.tgz#07013e46aa4d7d7d50a49e15604c1c5340d4eb24" - integrity sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg== - dependencies: - "@types/yargs-parser" "*" +"@typescript-eslint/eslint-plugin@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.57.0.tgz#6e4085604ab63f55b3dcc61ce2c16965b2c36374" + integrity sha512-qeu4rTHR3/IaFORbD16gmjq9+rEs9fGKdX0kF6BKSfi+gCuG3RCKLlSBYzn/bGsY9Tj7KE/DAQStbp8AHJGHEQ== + dependencies: + "@eslint-community/regexpp" "^4.12.2" + "@typescript-eslint/scope-manager" "8.57.0" + "@typescript-eslint/type-utils" "8.57.0" + "@typescript-eslint/utils" "8.57.0" + "@typescript-eslint/visitor-keys" "8.57.0" + ignore "^7.0.5" + natural-compare "^1.4.0" + ts-api-utils "^2.4.0" + +"@typescript-eslint/parser@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.57.0.tgz#444c57a943e8b04f255cda18a94c8e023b46b08c" + integrity sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g== + dependencies: + "@typescript-eslint/scope-manager" "8.57.0" + "@typescript-eslint/types" "8.57.0" + "@typescript-eslint/typescript-estree" "8.57.0" + "@typescript-eslint/visitor-keys" "8.57.0" + debug "^4.4.3" + +"@typescript-eslint/project-service@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.57.0.tgz#2014ed527bcd0eff8aecb7e44879ae3150604ab3" + integrity sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w== + dependencies: + "@typescript-eslint/tsconfig-utils" "^8.57.0" + "@typescript-eslint/types" "^8.57.0" + debug "^4.4.3" + +"@typescript-eslint/scope-manager@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.57.0.tgz#7d2a2aeaaef2ae70891b21939fadb4cb0b19f840" + integrity sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw== + dependencies: + "@typescript-eslint/types" "8.57.0" + "@typescript-eslint/visitor-keys" "8.57.0" + +"@typescript-eslint/tsconfig-utils@8.57.0", "@typescript-eslint/tsconfig-utils@^8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.0.tgz#cf2f2822af3887d25dd325b6bea6c3f60a83a0b4" + integrity sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA== + +"@typescript-eslint/type-utils@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.57.0.tgz#2877af4c2e8f0998b93a07dad1c34ce1bb669448" + integrity sha512-yjgh7gmDcJ1+TcEg8x3uWQmn8ifvSupnPfjP21twPKrDP/pTHlEQgmKcitzF/rzPSmv7QjJ90vRpN4U+zoUjwQ== + dependencies: + "@typescript-eslint/types" "8.57.0" + "@typescript-eslint/typescript-estree" "8.57.0" + "@typescript-eslint/utils" "8.57.0" + debug "^4.4.3" + ts-api-utils "^2.4.0" + +"@typescript-eslint/types@8.57.0", "@typescript-eslint/types@^8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.57.0.tgz#4fa5385ffd1cd161fa5b9dce93e0493d491b8dc6" + integrity sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg== + +"@typescript-eslint/typescript-estree@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.0.tgz#e0e4a89bfebb207de314826df876e2dabc7dea04" + integrity sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q== + dependencies: + "@typescript-eslint/project-service" "8.57.0" + "@typescript-eslint/tsconfig-utils" "8.57.0" + "@typescript-eslint/types" "8.57.0" + "@typescript-eslint/visitor-keys" "8.57.0" + debug "^4.4.3" + minimatch "^10.2.2" + semver "^7.7.3" + tinyglobby "^0.2.15" + ts-api-utils "^2.4.0" + +"@typescript-eslint/utils@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.57.0.tgz#c7193385b44529b788210d20c94c11de79ad3498" + integrity sha512-5iIHvpD3CZe06riAsbNxxreP+MuYgVUsV0n4bwLH//VJmgtt54sQeY2GszntJ4BjYCpMzrfVh2SBnUQTtys2lQ== + dependencies: + "@eslint-community/eslint-utils" "^4.9.1" + "@typescript-eslint/scope-manager" "8.57.0" + "@typescript-eslint/types" "8.57.0" + "@typescript-eslint/typescript-estree" "8.57.0" + +"@typescript-eslint/visitor-keys@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.0.tgz#23aea662279bb66209700854453807a119350f85" + integrity sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg== + dependencies: + "@typescript-eslint/types" "8.57.0" + eslint-visitor-keys "^5.0.0" "@yarnpkg/lockfile@^1.1.0": version "1.1.0" @@ -974,7 +927,7 @@ acorn-walk@^8.1.1: dependencies: acorn "^8.11.0" -acorn@^8.11.0, acorn@^8.15.0, acorn@^8.4.1: +acorn@^8.11.0, acorn@^8.16.0, acorn@^8.4.1: version "8.16.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.16.0.tgz#4ce79c89be40afe7afe8f3adb902a1f1ce9ac08a" integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw== @@ -997,7 +950,7 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv@^6.12.4, ajv@^6.14.0: +ajv@^6.14.0: version "6.14.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.14.0.tgz#fd067713e228210636ebb08c60bd3765d6dbe73a" integrity sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw== @@ -1137,6 +1090,11 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +balanced-match@^4.0.2: + version "4.0.4" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.4.tgz#bfb10662feed8196a2c62e7c68e17720c274179a" + integrity sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA== + base64-js@^1.3.1: version "1.5.1" resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" @@ -1186,6 +1144,13 @@ brace-expansion@^2.0.1, brace-expansion@^2.0.2: dependencies: balanced-match "^1.0.0" +brace-expansion@^5.0.2: + version "5.0.4" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.4.tgz#614daaecd0a688f660bbbc909a8748c3d80d4336" + integrity sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg== + dependencies: + balanced-match "^4.0.2" + braces@^3.0.3, braces@~3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" @@ -1266,10 +1231,10 @@ camelcase@^6.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -chai@5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/chai/-/chai-5.1.2.tgz#3afbc340b994ae3610ca519a6c70ace77ad4378d" - integrity sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw== +chai@^5.1.2: + version "5.3.3" + resolved "https://registry.yarnpkg.com/chai/-/chai-5.3.3.tgz#dd3da955e270916a4bd3f625f4b919996ada7e06" + integrity sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw== dependencies: assertion-error "^2.0.1" check-error "^2.1.1" @@ -1293,10 +1258,10 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" - integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== +chalk@^5.4.1: + version "5.6.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.6.2.tgz#b1238b6e23ea337af71c7f8a295db5af0c158aea" + integrity sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA== chardet@^2.1.1: version "2.1.1" @@ -1454,10 +1419,10 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@~12.1.0: - version "12.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3" - integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA== +commander@^13.1.0: + version "13.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-13.1.0.tgz#776167db68c78f38dcce1f9b8d7b8b9a488abf46" + integrity sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw== common-ancestor-path@^1.0.1: version "1.0.1" @@ -1585,7 +1550,7 @@ create-require@^1.1.0: resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== -cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.6: +cross-spawn@^7.0.3, cross-spawn@^7.0.6: version "7.0.6" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== @@ -1609,20 +1574,13 @@ dateformat@^3.0.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug@4, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5: +debug@4, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.4.0, debug@^4.4.3: version "4.4.3" resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a" integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA== dependencies: ms "^2.1.3" -debug@~4.3.6: - version "4.3.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52" - integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ== - dependencies: - ms "^2.1.3" - decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8" @@ -1698,18 +1656,6 @@ diff@^5.2.0: resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.2.tgz#0a4742797281d09cfa699b79ea32d27723623bad" integrity sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A== -diff@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-7.0.0.tgz#3fb34d387cd76d803f6eebea67b921dab0182a9a" - integrity sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw== - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - dot-prop@^5.1.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -1743,11 +1689,6 @@ dunder-proto@^1.0.1: es-errors "^1.3.0" gopd "^1.2.0" -duplexer@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" - integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== - eastasianwidth@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" @@ -1860,31 +1801,18 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-config-google@0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a" - integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw== - -eslint-config-prettier@9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f" - integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw== - -eslint-scope@^8.2.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.4.0.tgz#88e646a207fad61436ffa39eb505147200655c82" - integrity sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg== +eslint-scope@^9.1.2: + version "9.1.2" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-9.1.2.tgz#b9de6ace2fab1cff24d2e58d85b74c8fcea39802" + integrity sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ== dependencies: + "@types/esrecurse" "^4.3.1" + "@types/estree" "^1.0.8" esrecurse "^4.3.0" estraverse "^5.2.0" @@ -1893,37 +1821,34 @@ eslint-visitor-keys@^3.4.3: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint-visitor-keys@^4.2.0, eslint-visitor-keys@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1" - integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ== - -eslint@9.14.0: - version "9.14.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.14.0.tgz#534180a97c00af08bcf2b60b0ebf0c4d6c1b2c95" - integrity sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g== - dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@eslint-community/regexpp" "^4.12.1" - "@eslint/config-array" "^0.18.0" - "@eslint/core" "^0.7.0" - "@eslint/eslintrc" "^3.1.0" - "@eslint/js" "9.14.0" - "@eslint/plugin-kit" "^0.2.0" +eslint-visitor-keys@^5.0.0, eslint-visitor-keys@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz#9e3c9489697824d2d4ce3a8ad12628f91e9f59be" + integrity sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA== + +eslint@^10.0.3: + version "10.0.3" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-10.0.3.tgz#360a7de7f2706eb8a32caa17ca983f0089efe694" + integrity sha512-COV33RzXZkqhG9P2rZCFl9ZmJ7WL+gQSCRzE7RhkbclbQPtLAWReL7ysA0Sh4c8Im2U9ynybdR56PV0XcKvqaQ== + dependencies: + "@eslint-community/eslint-utils" "^4.8.0" + "@eslint-community/regexpp" "^4.12.2" + "@eslint/config-array" "^0.23.3" + "@eslint/config-helpers" "^0.5.2" + "@eslint/core" "^1.1.1" + "@eslint/plugin-kit" "^0.6.1" "@humanfs/node" "^0.16.6" "@humanwhocodes/module-importer" "^1.0.1" - "@humanwhocodes/retry" "^0.4.0" + "@humanwhocodes/retry" "^0.4.2" "@types/estree" "^1.0.6" - "@types/json-schema" "^7.0.15" - ajv "^6.12.4" - chalk "^4.0.0" - cross-spawn "^7.0.2" + ajv "^6.14.0" + cross-spawn "^7.0.6" debug "^4.3.2" escape-string-regexp "^4.0.0" - eslint-scope "^8.2.0" - eslint-visitor-keys "^4.2.0" - espree "^10.3.0" - esquery "^1.5.0" + eslint-scope "^9.1.2" + eslint-visitor-keys "^5.0.1" + espree "^11.1.1" + esquery "^1.7.0" esutils "^2.0.2" fast-deep-equal "^3.1.3" file-entry-cache "^8.0.0" @@ -1933,27 +1858,25 @@ eslint@9.14.0: imurmurhash "^0.1.4" is-glob "^4.0.0" json-stable-stringify-without-jsonify "^1.0.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" + minimatch "^10.2.4" natural-compare "^1.4.0" optionator "^0.9.3" - text-table "^0.2.0" -espree@^10.0.1, espree@^10.3.0: - version "10.4.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837" - integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ== +espree@^11.1.1: + version "11.2.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-11.2.0.tgz#01d5e47dc332aaba3059008362454a8cc34ccaa5" + integrity sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw== dependencies: - acorn "^8.15.0" + acorn "^8.16.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^4.2.1" + eslint-visitor-keys "^5.0.1" esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.5.0: +esquery@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d" integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g== @@ -2002,7 +1925,7 @@ execa@5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -execa@~8.0.1: +execa@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c" integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg== @@ -2017,17 +1940,6 @@ execa@~8.0.1: signal-exit "^4.1.0" strip-final-newline "^3.0.0" -expect@^29.0.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc" - integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw== - dependencies: - "@jest/expect-utils" "^29.7.0" - jest-get-type "^29.6.3" - jest-matcher-utils "^29.7.0" - jest-message-util "^29.7.0" - jest-util "^29.7.0" - exponential-backoff@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.3.tgz#51cf92c1c0493c766053f9d3abee4434c244d2f6" @@ -2038,17 +1950,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.9: - version "3.3.3" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818" - integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.8" - fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -2059,12 +1960,10 @@ fast-levenshtein@^2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== -fastq@^1.6.0: - version "1.20.1" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.20.1.tgz#ca750a10dc925bc8b18839fd203e3ef4b3ced675" - integrity sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw== - dependencies: - reusify "^1.0.4" +fdir@^6.4.3, fdir@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350" + integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg== figures@3.2.0, figures@^3.0.0: version "3.2.0" @@ -2171,15 +2070,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@11.2.0: - version "11.2.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b" - integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@^11.2.0: version "11.3.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.3.3.tgz#a27da23b72524e81ac6c3815cc0179b8c74c59ee" @@ -2336,7 +2226,7 @@ glob-parent@6.0.2, glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob-parent@^5.1.2, glob-parent@~5.1.2: +glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -2376,29 +2266,17 @@ glob@^9.2.0: minipass "^4.2.4" path-scurry "^1.6.1" -globals@^14.0.0: - version "14.0.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e" - integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ== - -globby@11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" +globals@^17.4.0: + version "17.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-17.4.0.tgz#33d7d297ed1536b388a0e2f4bcd0ff19c8ff91b5" + integrity sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw== gopd@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== -graceful-fs@4.2.11, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@4.2.11, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -2504,10 +2382,10 @@ human-signals@^5.0.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28" integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ== -husky@9.1.6: - version "9.1.6" - resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.6.tgz#e23aa996b6203ab33534bdc82306b0cf2cb07d6c" - integrity sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A== +husky@^9.1.6: + version "9.1.7" + resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.7.tgz#d46a38035d101b46a70456a850ff4201344c0b2d" + integrity sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA== iconv-lite@^0.6.2: version "0.6.3" @@ -2540,7 +2418,12 @@ ignore@^5.0.4, ignore@^5.2.0: resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== -import-fresh@^3.2.1, import-fresh@^3.3.0: +ignore@^7.0.5: + version "7.0.5" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.5.tgz#4cb5f6cd7d4c7ab0365738c7aea888baa6d7efd9" + integrity sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg== + +import-fresh@^3.3.0: version "3.3.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf" integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ== @@ -2725,11 +2608,6 @@ is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-ssh@^1.4.0: version "1.4.1" resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.4.1.tgz#76de1cdbe8f92a8b905d1a172b6bc09704c20396" @@ -2809,7 +2687,7 @@ jake@^10.8.5: filelist "^1.0.4" picocolors "^1.1.1" -"jest-diff@>=29.4.3 < 30", jest-diff@^29.4.1, jest-diff@^29.7.0: +"jest-diff@>=29.4.3 < 30", jest-diff@^29.4.1: version "29.7.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a" integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw== @@ -2824,43 +2702,6 @@ jest-get-type@^29.6.3: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1" integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw== -jest-matcher-utils@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12" - integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g== - dependencies: - chalk "^4.0.0" - jest-diff "^29.7.0" - jest-get-type "^29.6.3" - pretty-format "^29.7.0" - -jest-message-util@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3" - integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^29.6.3" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^29.7.0" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-util@^29.7.0: - version "29.7.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc" - integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA== - dependencies: - "@jest/types" "^29.6.3" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -2881,7 +2722,7 @@ js-yaml@^3.10.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^4.1.0, js-yaml@^4.1.1: +js-yaml@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b" integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA== @@ -2962,11 +2803,6 @@ just-diff@^6.0.0: resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-6.0.2.tgz#03b65908543ac0521caf6d8eb85035f7d27ea285" integrity sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA== -just-extend@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-6.2.0.tgz#b816abfb3d67ee860482e7401564672558163947" - integrity sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw== - keyv@^4.5.4: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" @@ -2979,25 +2815,25 @@ kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -klaw-sync@6.0.0: +klaw-sync@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c" integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ== dependencies: graceful-fs "^4.1.11" -lerna@8.1.9: - version "8.1.9" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-8.1.9.tgz#1233c3cfacca3b85b23c292235e246d79de3de32" - integrity sha512-ZRFlRUBB2obm+GkbTR7EbgTMuAdni6iwtTQTMy7LIrQ4UInG44LyfRepljtgUxh4HA0ltzsvWfPkd5J1DKGCeQ== +lerna@^8.1.9: + version "8.2.4" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-8.2.4.tgz#cb902f7772bf159b3612d7f63631e58302cb6fa5" + integrity sha512-0gaVWDIVT7fLfprfwpYcQajb7dBJv3EGavjG7zvJ+TmGx3/wovl5GklnSwM2/WeE0Z2wrIz7ndWhBcDUHVjOcQ== dependencies: - "@lerna/create" "8.1.9" + "@lerna/create" "8.2.4" "@npmcli/arborist" "7.5.4" "@npmcli/package-json" "5.2.0" "@npmcli/run-script" "8.1.0" "@nx/devkit" ">=17.1.2 < 21" "@octokit/plugin-enterprise-rest" "6.0.1" - "@octokit/rest" "19.0.11" + "@octokit/rest" "20.1.2" aproba "2.0.0" byte-size "8.1.1" chalk "4.1.0" @@ -3018,7 +2854,6 @@ lerna@8.1.9: get-stream "6.0.0" git-url-parse "14.0.0" glob-parent "6.0.2" - globby "11.1.0" graceful-fs "4.2.11" has-unicode "2.0.1" import-local "3.1.0" @@ -3032,7 +2867,6 @@ lerna@8.1.9: libnpmaccess "8.0.6" libnpmpublish "9.0.9" load-json-file "6.2.0" - lodash "^4.17.21" make-dir "4.0.0" minimatch "3.0.5" multimatch "5.0.0" @@ -3058,10 +2892,10 @@ lerna@8.1.9: slash "3.0.0" ssri "^10.0.6" string-width "^4.2.3" - strip-ansi "^6.0.1" - strong-log-transformer "2.1.0" tar "6.2.1" temp-dir "1.0.0" + through "2.3.8" + tinyglobby "0.2.12" typescript ">=3 < 6" upath "2.0.1" uuid "^10.0.0" @@ -3103,7 +2937,7 @@ libnpmpublish@9.0.9: sigstore "^2.2.0" ssri "^10.0.6" -lilconfig@~3.1.2: +lilconfig@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.3.tgz#a1bcfd6257f9585bf5ae14ceeebb7b559025e4c4" integrity sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw== @@ -3118,26 +2952,26 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== -lint-staged@15.2.10: - version "15.2.10" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.2.10.tgz#92ac222f802ba911897dcf23671da5bb80643cd2" - integrity sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg== - dependencies: - chalk "~5.3.0" - commander "~12.1.0" - debug "~4.3.6" - execa "~8.0.1" - lilconfig "~3.1.2" - listr2 "~8.2.4" - micromatch "~4.0.8" - pidtree "~0.6.0" - string-argv "~0.3.2" - yaml "~2.5.0" - -listr2@~8.2.4: - version "8.2.5" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.2.5.tgz#5c9db996e1afeb05db0448196d3d5f64fec2593d" - integrity sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ== +lint-staged@^15.2.10: + version "15.5.2" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-15.5.2.tgz#beff028fd0681f7db26ffbb67050a21ed4d059a3" + integrity sha512-YUSOLq9VeRNAo/CTaVmhGDKG+LBtA8KF1X4K5+ykMSwWST1vDxJRB2kv2COgLb1fvpCo+A/y9A0G0znNVmdx4w== + dependencies: + chalk "^5.4.1" + commander "^13.1.0" + debug "^4.4.0" + execa "^8.0.1" + lilconfig "^3.1.3" + listr2 "^8.2.5" + micromatch "^4.0.8" + pidtree "^0.6.0" + string-argv "^0.3.2" + yaml "^2.7.0" + +listr2@^8.2.5: + version "8.3.3" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-8.3.3.tgz#815fc8f738260ff220981bf9e866b3e11e8121bf" + integrity sha512-LWzX2KsqcB1wqQ4AHgYb4RsDXauQiqhjLk+6hjbaeHG4zpjjVAB6wC/gz6X0l+Du1cN3pUB5ZlrvTbhGSNnUQQ== dependencies: cli-truncate "^4.0.0" colorette "^2.0.20" @@ -3193,11 +3027,6 @@ lodash.ismatch@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37" integrity sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g== -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - lodash@^4.17.21: version "4.17.23" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a" @@ -3314,12 +3143,7 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -micromatch@^4.0.4, micromatch@^4.0.8, micromatch@~4.0.8: +micromatch@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202" integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA== @@ -3373,7 +3197,14 @@ minimatch@9.0.3: dependencies: brace-expansion "^2.0.1" -minimatch@^3.0.4, minimatch@^3.1.2, minimatch@^3.1.3: +minimatch@^10.2.2, minimatch@^10.2.4: + version "10.2.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.4.tgz#465b3accbd0218b8281f5301e27cedc697f96fde" + integrity sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg== + dependencies: + brace-expansion "^5.0.2" + +minimatch@^3.0.4: version "3.1.5" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e" integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w== @@ -3410,7 +3241,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.5, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -3494,7 +3325,7 @@ mkdirp@^1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@10.8.2: +mocha@^10.8.2: version "10.8.2" resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.8.2.tgz#8d8342d016ed411b12a429eb731b825f961afb96" integrity sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg== @@ -3566,17 +3397,6 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -nise@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/nise/-/nise-6.1.1.tgz#78ea93cc49be122e44cb7c8fdf597b0e8778b64a" - integrity sha512-aMSAzLVY7LyeM60gvBS423nBmIPP+Wy7St7hsb+8/fc1HmeoHJfLO8CKse4u3BtOZvQLJghYPI2i/1WZrEj5/g== - dependencies: - "@sinonjs/commons" "^3.0.1" - "@sinonjs/fake-timers" "^13.0.1" - "@sinonjs/text-encoding" "^0.7.3" - just-extend "^6.2.0" - path-to-regexp "^8.1.0" - node-addon-api@^8.0.0, node-addon-api@^8.3.1: version "8.6.0" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.6.0.tgz#b22497201b465cd0a92ef2c01074ee5068c79a6d" @@ -3589,13 +3409,6 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" -node-fetch@^2.6.7: - version "2.7.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" - integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== - dependencies: - whatwg-url "^5.0.0" - node-gyp-build@^4.8.0, node-gyp-build@^4.8.4: version "4.8.4" resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8" @@ -4086,11 +3899,6 @@ path-scurry@^1.11.1, path-scurry@^1.6.1: lru-cache "^10.2.0" minipass "^5.0.0 || ^6.0.2 || ^7.0.0" -path-to-regexp@^8.1.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz#aa818a6981f99321003a08987d3cec9c3474cd1f" - integrity sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA== - path-type@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" @@ -4098,11 +3906,6 @@ path-type@^3.0.0: dependencies: pify "^3.0.0" -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - pathval@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.1.tgz#8855c5a2899af072d6ac05d11e46045ad0dc605d" @@ -4113,12 +3916,17 @@ picocolors@^1.1.1: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b" integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pidtree@~0.6.0: +picomatch@^4.0.2, picomatch@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.3.tgz#796c76136d1eead715db1e7bad785dedd695a042" + integrity sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q== + +pidtree@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c" integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g== @@ -4168,7 +3976,7 @@ prettier@^3.0.0: resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.8.1.tgz#edf48977cf991558f4fcbd8a3ba6015ba2a3a173" integrity sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg== -pretty-format@^29.0.0, pretty-format@^29.7.0: +pretty-format@^29.7.0: version "29.7.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812" integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ== @@ -4237,11 +4045,6 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - quick-lru@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" @@ -4409,11 +4212,6 @@ retry@^0.12.0: resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== -reusify@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f" - integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw== - rfdc@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca" @@ -4431,13 +4229,6 @@ run-async@^2.4.0: resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - rxjs@^7.5.5: version "7.8.2" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.2.tgz#955bc473ed8af11a002a2be52071bf475638607b" @@ -4465,7 +4256,7 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3: +semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.7.3: version "7.7.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a" integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA== @@ -4523,18 +4314,6 @@ sigstore@^2.2.0: "@sigstore/tuf" "^2.3.4" "@sigstore/verify" "^1.2.1" -sinon@19.0.2: - version "19.0.2" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-19.0.2.tgz#944cf771d22236aa84fc1ab70ce5bffc3a215dad" - integrity sha512-euuToqM+PjO4UgXeLETsfQiuoyPXlqFezr6YZDFwHR3t4qaX0fZUe1MfPMznTL5f8BWrVS89KduLdMUsxFCO6g== - dependencies: - "@sinonjs/commons" "^3.0.1" - "@sinonjs/fake-timers" "^13.0.2" - "@sinonjs/samsam" "^8.0.1" - diff "^7.0.0" - nise "^6.1.1" - supports-color "^7.2.0" - slash@3.0.0, slash@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" @@ -4642,14 +4421,7 @@ ssri@^10.0.0, ssri@^10.0.6: dependencies: minipass "^7.0.3" -stack-utils@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" - integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== - dependencies: - escape-string-regexp "^2.0.0" - -string-argv@~0.3.2: +string-argv@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6" integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q== @@ -4757,16 +4529,7 @@ strip-json-comments@^3.1.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strong-log-transformer@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" - integrity sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA== - dependencies: - duplexer "^0.1.1" - minimist "^1.2.0" - through "^2.3.4" - -supports-color@^7.1.0, supports-color@^7.2.0: +supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== @@ -4818,11 +4581,6 @@ text-extensions@^1.0.0: resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26" integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" @@ -4831,11 +4589,27 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6: +through@2, through@2.3.8, "through@>=2.2.7 <3", through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== +tinyglobby@0.2.12: + version "0.2.12" + resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.12.tgz#ac941a42e0c5773bd0b5d08f32de82e74a1a61b5" + integrity sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww== + dependencies: + fdir "^6.4.3" + picomatch "^4.0.2" + +tinyglobby@^0.2.15: + version "0.2.15" + resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2" + integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ== + dependencies: + fdir "^6.5.0" + picomatch "^4.0.3" + tmp@~0.2.1: version "0.2.5" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8" @@ -4879,7 +4653,12 @@ trim-newlines@^3.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== -ts-node@10.9.2: +ts-api-utils@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.4.0.tgz#2690579f96d2790253bdcf1ca35d569ad78f9ad8" + integrity sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA== + +ts-node@^10.9.2: version "10.9.2" resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f" integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ== @@ -4928,16 +4707,6 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" -type-detect@4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-detect@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.1.0.tgz#deb2453e8f08dcae7ae98c626b13dddb0155906c" - integrity sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw== - type-fest@^0.18.0: version "0.18.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" @@ -4968,12 +4737,17 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@5.6.3: - version "5.6.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" - integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== +typescript-eslint@^8.57.0: + version "8.57.0" + resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.57.0.tgz#82764795d316ed1c72a489727c43c3a87373f100" + integrity sha512-W8GcigEMEeB07xEZol8oJ26rigm3+bfPHxHvwbYUlu1fUDsGuQ7Hiskx5xGW/xM4USc9Ephe3jtv7ZYPQntHeA== + dependencies: + "@typescript-eslint/eslint-plugin" "8.57.0" + "@typescript-eslint/parser" "8.57.0" + "@typescript-eslint/typescript-estree" "8.57.0" + "@typescript-eslint/utils" "8.57.0" -"typescript@>=3 < 6": +"typescript@>=3 < 6", typescript@^5.6.3: version "5.9.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== @@ -5226,16 +5000,11 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== -yaml@^2.6.0: +yaml@^2.6.0, yaml@^2.7.0: version "2.8.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.2.tgz#5694f25eca0ce9c3e7a9d9e00ce0ddabbd9e35c5" integrity sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A== -yaml@~2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.1.tgz#c9772aacf62cb7494a95b0c4f1fb065b563db130" - integrity sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q== - yargs-parser@21.1.1, yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"